diffstat of debian/ for dpatch_2.0.10 dpatch_2.0.10.emdebian3 changelog | 19 + changelog~ | 499 +++++++++++++++++++++++++++++++ control | 2 control~ | 24 + patches/dir.emdebian.patch | 531 +++++++++++++++++++++++++++++++++ patches/use_awk_instead_of_nawk.patch | 8 patches/use_awk_instead_of_nawk.patch~ | 8 rules | 16 8 files changed, 1105 insertions(+), 2 deletions(-) diff -Nru dpatch-2.0.10/debian/changelog dpatch-2.0.10.emdebian3/debian/changelog --- dpatch-2.0.10/debian/changelog 2004-10-07 08:19:18.000000000 +0000 +++ dpatch-2.0.10.emdebian3/debian/changelog 2006-10-20 18:02:10.000000000 +0000 @@ -1,3 +1,22 @@ +dpatch (2.0.10.emdebian3) unstable; urgency=low + + * tools/shpp.awk: use awk instead of nawk + + -- Ed Bartosh Fri, 20 Oct 2006 21:01:06 +0300 + +dpatch (2.0.10.emdebian2) unstable; urgency=low + + * awk added to the build-deps + + -- Ed Bartosh Sat, 21 Oct 2006 03:08:20 +0300 + +dpatch (2.0.10.emdebian1) unstable; urgency=low + + * emdebian: use DEBIAN_DIR environment variable for debian dir, + or debian/ by default + + -- Yauheni Kaliuta Mon, 10 Apr 2006 20:30:21 +0300 + dpatch (2.0.10) unstable; urgency=high * Gergely Nagy: diff -Nru dpatch-2.0.10/debian/changelog~ dpatch-2.0.10.emdebian3/debian/changelog~ --- dpatch-2.0.10/debian/changelog~ 1970-01-01 00:00:00.000000000 +0000 +++ dpatch-2.0.10.emdebian3/debian/changelog~ 2006-10-20 18:01:30.000000000 +0000 @@ -0,0 +1,499 @@ +dpatch (2.0.10.emdebian3) unstable; urgency=low + + * use awk instead of nawk + + -- Ed Bartosh Fri, 20 Oct 2006 21:01:06 +0300 + +dpatch (2.0.10.emdebian2) unstable; urgency=low + + * awk added to the build-deps + + -- Ed Bartosh Sat, 21 Oct 2006 03:08:20 +0300 + +dpatch (2.0.10.emdebian1) unstable; urgency=low + + * emdebian: use DEBIAN_DIR environment variable for debian dir, + or debian/ by default + + -- Yauheni Kaliuta Mon, 10 Apr 2006 20:30:21 +0300 + +dpatch (2.0.10) unstable; urgency=high + + * Gergely Nagy: + + Install NEWS.Debian; thanks, Peter Eisentraut. (Closes: #275163). + + Urgency set to high, so we can get in sarge, maybe. + + -- Gergely Nagy Thu, 7 Oct 2004 10:04:05 +0200 + +dpatch (2.0.9) unstable; urgency=low + + * Nico Golde: + + Fixed dpatch-convert-diffgz.1, patch from Helge + Kreutzmann. (Closes: #242893) + + Fixed dpatch deapply documentation, patch from Shaul Karl. + (Closes: #255476) + * Gergely Nagy + + Fixed dpatch-edit-patch local information leak, patch from Darren + Salt. (Closes: #240709) + + Modified the default templates to call patch with -g0. Requested by + John V. Belmonte. (Closes: #259662) + + Extracted commonly used dpatch scriptlet code, providing two new + ways to make a dpatch scriptlet shorter and lighter. See + NEWS.Debian for details. Thanks to Tobias Grimm, Thomas Günther for + their ideas. (Closes: #259356) + + Made dpatch-edit-patch call dpatch deapply-all directly, upon + cleaning. Request from Bastian Kleineidam. (Closes: #260666) + + -- Gergely Nagy Tue, 17 Aug 2004 16:35:53 +0200 + +dpatch (2.0.8) unstable; urgency=low + + * Fix typo in dpatch-edit-patch from previous upload + + -- David B. Harris Tue, 16 Mar 2004 23:17:13 -0500 + +dpatch (2.0.7) unstable; urgency=medium + + * dpatch/dpatch_lowlevel.shpp: + + Don't create stampfile if the patch failed to apply, create + stampfile.failed instead + + When applying a patch failes, record its md5sum in stampfile.failed + + When unapplying patches, if .failed exists and the md5sum matches still + matches, ignore failure (a half-applied patch will be successfully + reverted if the patch hasn't changed) + * dpep/dpatch-edit-patch: Don't mistakenly apply patch in source tree (which + it will if you're editing the first patch in 00list). (Closes: #235596) + * debian/control: Change my Uploaders: email address from my private one to + dbharris@debian.org + + -- David B. Harris Mon, 1 Mar 2004 13:13:26 -0500 + +dpatch (2.0.6) unstable; urgency=high + + * Gergely Nagy: + - dpep/dpatch-edit-patch: When editing a pre-existing patch, force + dpatch to skip creating stamp files (as they'd show up in the diff, + which is a Bad Thing). + - dpatch/dpatch_patchset.shpp: Fixed a serious file name comparsion + bug (noticed by David B Harris). + * David B Harris: + - dpep/dpatch-edit-patch: Use 'debian/rules clean unpatch' to clean the + source tree before replication - this allows for one to ship a + regular-style source package (with all the patches applied to the tree) + even if dpatch is used. Thanks, Bill Allombert. (Closes: #195823) + - Use 'grep -F' instead of 'egrep -F'. The latter is seriously broken. + + -- Gergely Nagy Mon, 23 Feb 2004 21:26:34 +0100 + +dpatch (2.0.5) unstable; urgency=medium + + * David B Harris: + - Mention in the manpage that if a maintainer wants to preprocess their + 00list with cpp, they need to add it to Build-Depends or + Build-Depends-Indep, as it isn't a dpatch dependency. + - dpatch/dpatch_lowlevel.shpp: Make sure stampfile is put in place even if + patching fails - without this, a half-applied dpatch wouldn't be + un-half-applied via 'debian/rules unpatch'. Future attempts to + 'debian/rules patch', even with a fixed dpatch, would fail. + - dpatch/dpatch_template.shpp: Add @DPATCH@ tag to generated template + - dpep/dpatch-edit-patch: Fix bug where if the interactive subshell exited + with *anything* other than 0, the script would abort (and not clean up, + at that). The intention is to only abort if the shell exits with code + 230 (ie: the developer explicitly goes 'exit 230'). + - dpep/dpatch-edit-patch{,.functions}: Port to using new /usr/bin/dpatch + calls instead of reimplementing the (old) dpatch.make. Also support an + executable 00template (which is supposed to dump the dpatch header to + STDOUT) via DPEP_OPTION_EXEC_TEMPLATE=1 in 00options. Not yet + documented. + + -- David B Harris Tue, 17 Feb 2004 04:24:14 -0500 + +dpatch (2.0.4) unstable; urgency=low + + * Gergely Nagy: + - Handle empty 00list files correctly, patch from Daniel Kobras. + (Closes: #228556) + - Fixed dpatch-convert-diffgz, which was broken some time ago. + * David B. Harris: + - Use `head -n 1' instead of `head -1', patch from Robert Luberda. + (Closes: #229941) + - Added support for debian/patches/00options (see man page for + details). + + -- Gergely Nagy Sun, 15 Feb 2004 12:55:34 +0100 + +dpatch (2.0.3) unstable; urgency=medium + + * Gergely Nagy: + - Do not ship NEWS.Debian. (Noticed by Jordi Mallach and Joey Hess) + (Closes: #227991) + - Updated README to note that there are cases when patch-stamp should + be a prerequisite of something else than build-stamp. + (Closes: #197956) + - Implemented configuration file support (no documentation yet, + sorry). + + -- Gergely Nagy Sun, 18 Jan 2004 14:49:00 +0100 + +dpatch (2.0.2) unstable; urgency=low + + * Gergely Nagy: + - dpatch --workdir does not cd to the destination directory + anymore. Add a --chdir option to restore the old behaviour. + - README made clear about patch order. Thanks to Steve Greenland for + noticing. (Closes: #223876) + - Written a short dpatch(7). + - Fixed bashisms, thanks to Ian Dichkovsky. (Closes: #224879) + - Made dpatch patch-template work with a diff on its STDIN. + + -- Gergely Nagy Sat, 10 Jan 2004 13:28:20 +0100 + +dpatch (2.0.1) experimental; urgency=low + + * Gergely Nagy: + - Fixed example installation, noticed by Geert Stappers. + (Closes: #217136) + - Include README.arch in the binary package. Patch from Geert + Stappers. (Closes: #221976) + - Mention README.arch in the README. Patch from Geert Stappers. + (Closes: #221979) + - Update README.arch, so it has commands for tla 1.0 too. Omission + noticed by Geert Stappers. (Closes: #221980) + - Restore dpatch1 compatibility. Noticed and solution provided by + Geert Stappers. (Closes: #222006) + - Implemented "dpatch log" and added a "--verbose" option to the apply + and deapply sub-commands. Requested by Geert Stappers. + (Closes: #222103) + + -- Gergely Nagy Sat, 6 Dec 2003 20:51:59 +0100 + +dpatch (2.0.0) experimental; urgency=low + + * Gergely Nagy: + - Rewritten dpatch to be a stand-alone script, with a compatibility + dpatch.make wrapper. + - As a side effect, this fixes the following bugs: + + #203999: dpatch: Extension check in unpatch is leaking. + + #217040: leaks private information from development environment + + #209107: dpatch: reserving some of the patch $1 namespace for + package use. + + #209109: dpatch: like to expliticly patch a random src tree copy. + + #217045: should revert half-failed patches + (Use dpatch --force for this functionality) + - Reorganised the examples, and added a new one: + + #217136: dpatch example : config.{guess,sub}. Thanks to Ralf + Treinen. + + -- Gergely Nagy Sun, 16 Nov 2003 15:28:31 +0100 + +dpatch (1.24) unstable; urgency=medium + + * David B Harris: + - Revert broken @DPATCH@ preservation behaviour, which was introduced by + a submitted patch some time ago. Thanks to Eduard Bloch for pointing + it out. (Closes: #203968) + + -- David B Harris Sun, 3 Aug 2003 06:42:42 -0400 + +dpatch (1.23) unstable; urgency=low + + * Henrique de Moraes Holschuh: + - dpatch.make (PATCHLIST): Only expand this once. + (UNPATCHLIST): Likewise. + (DEB_BUILD_ARCH): New variable. + (DPATCH_ARCH): Use ${DEB_BUILD_ARCH}, to be far more friendly to + existing practice. + - README: Added a note about dpatch.make's usage of ${PACKAGE}, and a + warning about some dpatch-* tools not respecting ${PATCHLIST}. + * Gergely Nagy: + - dpatch.make (PATCHLIST): Removed the sorting stuff. + - dpatch-list-patch: Likewise. + * The removal of the sorting stuff, and Henrique's changes: + Closes #203353. + + -- Gergely Nagy Thu, 31 Jul 2003 12:33:04 +0200 + +dpatch (1.22) unstable; urgency=low + + * Brown paper bag release: + - 'dpatch.make:45: *** unterminated call to function `shell': missing `)' + fixed, caused all builds with 1.21 to break. Let us never upload on + Friday the 13th again. + + -- David B Harris Sat, 14 Jun 2003 04:01:28 -0400 + +dpatch (1.21) unstable; urgency=low + + * Gergely Nagy: + - dpatch.make (PATCHLIST_ALL): Do not hide stderr. + (PATCHLIST_ARCH): Likewise. + Patch from Joshua Kwan and Era Eriksson. (Closes: #195626) + * David B Harris: + - dpatch-edit-patch.functions (dpep_template_hardcoded): + Don't append .dpatch to patch filename, dpep-edit-patch does that for + us. Thanks James Troup, Closes: #196329 + - dpatch-edit-patch: Fix bad sed call (Closes: #196893) + + -- Gergely Nagy Fri, 13 Jun 2003 22:52:52 +0200 + +dpatch (1.20) unstable; urgency=low + + * David B. Harris: + - dpatch-edit-patch, dpatch-edit-patch.functions, dpatch-edit-patch.1: + + The meaning of CLI option -k (keep temporary working directory) was + reversed. Thanks to Era Eriksson for the patch :) (Closes: #193392) + + Another patch from Era - thanks again! This one allows + debian/patches/00template to be executable. See the manpage for more + details. (Closes: #193481) + * Gergely Nagy: + - debian/control (Standards-Version): Bumped to 3.5.10.0. + - dpatch.make (PATCHLIST_ALL): Redirect stderr to /dev/null. + (PATCHLIST_ARCH): Likewise. + Noticed by James Troup. (Closes: #195104) + - debian/rules (binary-indep): Mark all files in ${DPATCH}/etc as + conffiles. + - dpatch-list-patch: Use "$( (" instead of "$((". The latter is + treated as an aritmetic expression by dash, thus parsing fails. With + a space between the two parens, it is correctly recognised as a + nested command substitution thingy. + - dpatch-convert-diffgz: Addedd support for epochs. Patch from Junichi + Uekawa. (Closes: #195443) + + -- David B Harris Mon, 26 May 2003 03:00:28 -0400 + +dpatch (1.19) unstable; urgency=low + + * Gergely Nagy: + - dpatch-edit-patch.1: Corrected a typo. Noticed by Stephen Quinney + (Closes: #190557) + - dpatch-list-patch (dplp_print_info): New function. This handles + adding the .dpatch suffix when necessary. Use this to print + information about a dpatch. + + Also, if there is no debian/patches/00list, use some clever GNU make + trickery to extract ${PATCHLIST} out of debian/rules (probably needs + polishing though) + - dpatch-convert-diffgz: Remove the .dpatch suffix from + DPCD_PATCHNAME, if any. + - dpatch.make (patch): Check if $$patch exists, and only append a + .dpatch prefix if it doesn't. + (unpatch): Likewise. + (PATCHLIST_ALL): Allow `#' comments in the patch list (ie, filter + them out) + (PATCHLIST_ARCH): Likewise. Patch from Bastian Kleineidam. + (Closes: #192509) + - The last two entries, as well as the next two, Closes: #191277 + - README: Updated according to recent changes. + * David B Harris: + - dpatch-edit-patch: Loosen the format of debian/patches/00list. Now + somebody can supply the .dpatch extension therein, should they choose to + do so. + - dpatch-list-patch: Add comment-line support for dpatch-list-patch. + (closes the other half of #192509) + - Include a bash context-sensitive completion definition file, + /etc/bash_completion.d/dpatch_edit_patch, kindly written by Bastian + Kleineidam and cleaned up by myself. (Closes: #191453) + + -- Gergely Nagy Fri, 9 May 2003 00:51:20 +0200 + +dpatch (1.18) unstable; urgency=low + + * David B Harris: + - README: Clarify format of debian/patches/00list (Closes: #190343) + * Gergely Nagy: + - dpatch-edit-patch.1: Minor markup fixes and enhancements. + + -- Gergely Nagy Wed, 23 Apr 2003 17:24:57 +0200 + +dpatch (1.17) unstable; urgency=low + + * David B. Harris: + - dpatch-edit-patch(1) rewrite. Please read `man dpatch-edit-patch', and/or + /usr/share/doc/dpatch/README, it has changed a great deal. Basically, now + you just 'dpatch-edit-patch dpathname', where dpatchname is exactly as it + would be listed in 00list. dpep will spawn a subshell. Edit your files. + Exit the subshell. The dpatch will be created or updated, as is required. + (Closes: #187959) + - Rewrite manpage for dpatch-edit-patch. Thanks to Andreas Metzler for the + current groff formatting. (Closes: #188486) + - Clarify examples and README with respect to phony targets and what that + means. + * Joerg Jaspert: + - Added David B. Harris to Uploaders Field. + + -- Joerg Jaspert Fri, 11 Apr 2003 16:36:43 +0200 + +dpatch (1.16) unstable; urgency=low + + * Gergely Nagy: + - The `Figure out something to put here, and delete this' release. + - dpatch.make (patch): (patch-stamp): Create a subdirectory under + debian/patched, if necessary. Patch from David B Harris. + (unpatch): Remove patch-stampT too. Suggestion from Joshua Kwan. + (Closes: #186522) + * Joerg Jaspert: + - Added a paragraph about usage of .PHONY or stamp-files to the + README and changed one example rules file so we show both ways + of playing with it. This (closes: #187293) + + -- Joerg Jaspert Sun, 6 Apr 2003 01:19:23 +0200 + +dpatch (1.15) unstable; urgency=low + + * The `Feh, you missed me!' release. + * dpatch-edit-patch.1: Fixed a typo I introduced when importing Andreas' + work. Noticed by him. + * debian/control (Standards-Version): Bumped to 3.5.9.0. + (Description): Rearranged a bit, to look more structured. + * dpatch-edit-patch: Bail out if ${DPEP_TMPDIR} does not exist. This way + we can safely use mkdir to create ${DPEP_OUTDIR}, and then check its + exit status. Fix suggested by David B Harris. (Closes: #182640) + + -- Gergely Nagy Sun, 16 Mar 2003 23:58:24 +0100 + +dpatch (1.14) unstable; urgency=low + + * The `dpatch-edit-patch is not broken, but shoot me anyway' release. + * dpatch-convert-diffgz: Made it actually work. (Patch courtesy of + Manuel Estrada Sainz) (Closes: #183976) + * dpatch-edit-patch.1 (EXAMPLES): New section, heavily based on the work + of Andreas Metzler. + * The above change and parts of 1.13 together closes: #182644. + + -- Gergely Nagy Mon, 10 Mar 2003 15:44:15 +0100 + +dpatch (1.13) unstable; urgency=low + + * The `dpatch-edit-patch is broken' release. + * dpatch-edit-patch: Bail out if the temporary directory already + exists. (Closes: #182640) + * dpatch-edit-patch: Describe in more detail what it does, for easier + problem tracking. (Closes: #182641) + * dpatch-edit-patch: Changed default description to something less lame + and productive. + * dpatch-edit-patch: Fixed a typo. + * dpatch-edit-patch: Added ${DPEP_PKGNAME} to some more places, so it + will actually work. + * dpatch-edit-patch.1 (NOTES): New section, mentioning how the author + information is determined. + * The above ones fix the multi-problem bugreport from James Troup, + except the EXAMPLES section in dpatch-edit-patch.1. + * dpatch.make (unpatch): Remove debian/patched too. (Noticed by Steve + Kowalik) + * dpatch.make: Use make syntax, not shell, when determining DPATCH_ARCH. + Thanks to Martin Loschwitz. (Closes: #183828) + + -- Gergely Nagy Thu, 27 Feb 2003 14:36:23 +0100 + +dpatch (1.12) unstable; urgency=low + + * dpatch-list-patch now really does what i announced in 1.10. Silly me. + (closes: #182590) + * Mention the needed Build-Depends in Readme. (closes: #182598) + + -- Joerg Jaspert Wed, 26 Feb 2003 22:00:14 +0100 + +dpatch (1.11) unstable; urgency=low + + * dpatch.make (patch): Accept single-char comments too. (Noticed by + Steve Kowalik) + + -- Gergely Nagy Tue, 25 Feb 2003 14:28:40 +0100 + +dpatch (1.10) unstable; urgency=low + + * dpatch-list-patch now recognizes Comments that start with # DP: + or ## DP: + + -- Joerg Jaspert Tue, 25 Feb 2003 11:31:33 +0100 + +dpatch (1.9) unstable; urgency=low + + * Now dpatch-edit-patch adds the source-package name to tmpdirs it + creates. That way they dont conflict if you edit similar patchnumbers + in different packages. (closes: #182134) + + -- Joerg Jaspert Tue, 25 Feb 2003 00:09:58 +0100 + +dpatch (1.8) unstable; urgency=low + + * Modified README to reflect latest changes to dpatch and its tools. + If you are a better documentation writer: Please take a look at + this file and make it readable. Thx. :) + * Modified dpatch-list-patches to list patches that apply everywhere + (eg. that are in 00list) and patches that apply only on specific + Architectures (eg. listed in 00list.*) with different headers. + * Modified Description to tell users that its easy to have + architecture specific patches now. :) + + -- Joerg Jaspert Mon, 24 Feb 2003 23:35:01 +0100 + +dpatch (1.7) unstable; urgency=low + + * Modularized the patch list. It is now constructed from + debian/patches/00list and 00list.${ARCH} (where ${ARCH} is the + architecture we're building for). Also, one can override the PATCHLIST + variable, and that will Just Work. So you can use dpatch without + 00list too! :) + * Applied meta-data preserving patch to dpatch-edit-patch, thanks to + Eduard Bloch. (Closes: #182140) + * Added dpatch-convert-diffgz from Junichi Uekawa (with minor + modifications). (Closes: #176831) + * debian/control (Recommends): Recommend dpkg-dev, fakeroot and + patchutils, since we are using them in some of the scripts. + + -- Gergely Nagy Mon, 24 Feb 2003 18:17:10 +0100 + +dpatch (1.6) unstable; urgency=low + + * Applied tree-root finder patch by Junichi Uekawa. + (Closes: #176507) + * Added a modified version of dpatch-list-patch by Junichi. + (Closes: #176633) + * Also corrected some minor shortcomings in the dpatch-edit-patch + manual, and wrote one for d-l-p. + + -- Gergely Nagy Sun, 19 Jan 2003 00:53:07 +0100 + +dpatch (1.5) unstable; urgency=low + + * Description and readme improvements, thx to era eriksson. (closes: #175000) + + -- Joerg Jaspert Thu, 2 Jan 2003 11:56:04 +0100 + +dpatch (1.4) unstable; urgency=low + + * Reverted dry-run test: Errors are handled by dpatch target in makefiles. + * Use -p1 instead of -p0 in dpatch-edit-patch generated patch files. + * There was the include for /usr/share/dpatch/dpatch.make missingin sample.rules2 + + -- Joerg Jaspert Tue, 31 Dec 2002 21:08:43 +0100 + +dpatch (1.3) unstable; urgency=low + + * Patch from Eduard Bloch: + - better pattern to fish the EMAIL address + - fixed some bashisms + - --dry-run test before patching to prevent trouble when only parts of the + patch fail + + -- Joerg Jaspert Sat, 28 Dec 2002 15:15:59 +0100 + +dpatch (1.2) unstable; urgency=low + + * Updated description. + * Updated README. + + -- Joerg Jaspert Sat, 28 Dec 2002 02:23:40 +0100 + +dpatch (1.1) unstable; urgency=low + + * Added option to set description and name of the patch file. + + -- Joerg Jaspert Sat, 28 Dec 2002 01:18:50 +0100 + +dpatch (1.0) unstable; urgency=low + + * Initial Release. + + -- Joerg Jaspert Sat, 21 Dec 2002 00:59:29 +0100 diff -Nru dpatch-2.0.10/debian/control dpatch-2.0.10.emdebian3/debian/control --- dpatch-2.0.10/debian/control 2004-10-07 08:19:18.000000000 +0000 +++ dpatch-2.0.10.emdebian3/debian/control 2006-10-21 00:10:56.000000000 +0000 @@ -2,11 +2,13 @@ Section: devel Priority: optional Maintainer: Joerg Jaspert +Build-Depends: mawk (>=1.3.3) | awk Uploaders: Gergely Nagy , David B. Harris Standards-Version: 3.6.1 Package: dpatch Architecture: all +Depends: debian-dir Recommends: dpkg-dev, fakeroot, patchutils Description: patch maintenance system for Debian source packages dpatch is an easy to use patch system for debian packages, somewhat diff -Nru dpatch-2.0.10/debian/control~ dpatch-2.0.10.emdebian3/debian/control~ --- dpatch-2.0.10/debian/control~ 1970-01-01 00:00:00.000000000 +0000 +++ dpatch-2.0.10.emdebian3/debian/control~ 2006-10-21 00:09:46.000000000 +0000 @@ -0,0 +1,24 @@ +Source: dpatch +Section: devel +Priority: optional +Maintainer: Joerg Jaspert +Build-Depends: mawk | awk +Uploaders: Gergely Nagy , David B. Harris +Standards-Version: 3.6.1 + +Package: dpatch +Architecture: all +Depends: debian-dir +Recommends: dpkg-dev, fakeroot, patchutils +Description: patch maintenance system for Debian source packages + dpatch is an easy to use patch system for debian packages, somewhat + similar to the dbs package, but much simpler to use. + . + It lets you store patches and other simple customization templates in + debian/patches and otherwise does not require much reorganization of + your source tree. To get the patches applied at build time you simply + need to include a makefile snippet and then depend on the + patch/unpatch target in the build or clean stage of debian/rules - or + you can use the dpatch patching script directly. + . + It can easily apply patches only on specific architectures if needed. diff -Nru dpatch-2.0.10/debian/patches/dir.emdebian.patch dpatch-2.0.10.emdebian3/debian/patches/dir.emdebian.patch --- dpatch-2.0.10/debian/patches/dir.emdebian.patch 1970-01-01 00:00:00.000000000 +0000 +++ dpatch-2.0.10.emdebian3/debian/patches/dir.emdebian.patch 2006-10-21 00:09:46.000000000 +0000 @@ -0,0 +1,531 @@ +diff -urN -x '*.svn*' dpatch.sav/compat/dpatch.make dpatch/compat/dpatch.make +--- dpatch.sav/compat/dpatch.make 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/compat/dpatch.make 2006-04-10 20:03:28.000000000 +0300 +@@ -1,9 +1,11 @@ + # -*- Makefile -*-, you silly Emacs! + # vim: set ft=make: + ++DEBIAN_DIR ?= debian ++ + DPATCH_PACKAGE ?= ${DEB_SOURCE_PACKAGE} + DPATCH_PACKAGE ?= ${PACKAGE} +-DPATCH_STAMPDIR ?= debian/patched ++DPATCH_STAMPDIR ?= $(DEBIAN_DIR)/patched + DPATCH_STAMPFN ?= patch-stamp + + ifdef PATCHLIST +@@ -13,7 +15,7 @@ + DPATCH_ALL := -all + endif + +-ifneq (${DPATCH_STAMPDIR},debian/patched) ++ifneq (${DPATCH_STAMPDIR},$(DEBIAN_DIR)/patched) + _STAMPDIR := --stampdir=${DPATCH_STAMPDIR} + endif + +diff -urN -x '*.svn*' dpatch.sav/dpatch/dpatch_args.shpp dpatch/dpatch/dpatch_args.shpp +--- dpatch.sav/dpatch/dpatch_args.shpp 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpatch/dpatch_args.shpp 2006-04-10 20:09:33.000000000 +0300 +@@ -3,6 +3,8 @@ + ## Argument handling helper functions for dpatch. + ## + ++DEBIAN_DIR=${DEBIAN_DIR:-debian} ++ + # dpatch_args_check + dpatch_args_check () + { +diff -urN -x '*.svn*' dpatch.sav/dpatch/dpatch.lib.shpp dpatch/dpatch/dpatch.lib.shpp +--- dpatch.sav/dpatch/dpatch.lib.shpp 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpatch/dpatch.lib.shpp 2006-04-10 20:08:31.000000000 +0300 +@@ -2,6 +2,8 @@ + + set -e + ++DEBIAN_DIR=${DEBIAN_DIR:-debian} ++ + dpatch_lib_patch () + { + if test "x${DPATCH_LIB_NO_DEFAULT}" = "x"; then +@@ -39,7 +41,7 @@ + exit 1 + fi + +-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts ++[ -f ${DEBIAN_DIR}/patches/00patch-opts ] && . ${DEBIAN_DIR}/patches/00patch-opts + patch_opts="${patch_opts:--g0 -f --no-backup-if-mismatch} ${workdir:+-d ${workdir}}" + + case "${action}" in +diff -urN -x '*.svn*' dpatch.sav/dpatch/dpatch_lowlevel.shpp dpatch/dpatch/dpatch_lowlevel.shpp +--- dpatch.sav/dpatch/dpatch_lowlevel.shpp 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpatch/dpatch_lowlevel.shpp 2006-04-10 20:13:49.000000000 +0300 +@@ -3,6 +3,8 @@ + ## Low level patch handling interface for dpatch. + ## + ++DEBIAN_DIR=${DEBIAN_DIR:-debian} ++ + # dpatch_patch_apply + dpatch_patch_apply () + { +@@ -12,7 +14,7 @@ + pwd=$(pwd) + args=$1 + patchname=$2 +- stampdir=${DPATCH_WORKDIR}/debian/patched ++ stampdir=${DPATCH_WORKDIR}/${DEBIAN_DIR}/patched + if [ ${DPATCH_WORKDIR} != "./" ]; then + wd=${DPATCH_WORKDIR} + fi +@@ -60,8 +62,8 @@ + test "x${patchdir}" = "x${patchname}" || \ + install -d ${stampdir}/${patchdir} + stamp=${stampdir}/${patchname%%.dpatch}.dpatch +- test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch +- patch=${pwd}/debian/patches/${patchname}${ext} ++ test -e ${pwd}/${DEBIAN_DIR}/patches/${patchname} || ext=.dpatch ++ patch=${pwd}/${DEBIAN_DIR}/patches/${patchname}${ext} + + if [ ! -f ${patch} ]; then + if [ -z "${o_q}" ]; then +@@ -139,7 +141,7 @@ + pwd=$(pwd) + args=$1 + patchname=$2 +- stampdir=${DPATCH_WORKDIR}/debian/patched ++ stampdir=${DPATCH_WORKDIR}/${DEBIAN_DIR}/patched + if [ ${DPATCH_WORKDIR} != "./" ]; then + wd=${DPATCH_WORKDIR} + fi +@@ -180,8 +182,8 @@ + done + + stamp=${stampdir}/${patchname%%.dpatch}.dpatch +- test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch +- patch=${pwd}/debian/patches/${patchname}${ext} ++ test -e ${pwd}/${DEBIAN_DIR}/patches/${patchname} || ext=.dpatch ++ patch=${pwd}/${DEBIAN_DIR}/patches/${patchname}${ext} + + if [ ! -f ${patch} ]; then + if [ -z "${o_q}" ]; then +@@ -233,7 +235,7 @@ + echo + echo " patch md5sum has changed since failed apply, aborting" + echo " please clean this up manually, by reverting the changes" +- echo " and removing debian/patched/${stamp}.failed" ++ echo " and removing ${DEBIAN_DIR}/patched/${stamp}.failed" + return 1 + fi + if [ ! -z "${o_v}" ]; then +@@ -275,7 +277,7 @@ + pwd=$(pwd) + args=$1 + patchname=$2 +- stampdir=${DPATCH_WORKDIR}/debian/patched ++ stampdir=${DPATCH_WORKDIR}/${DEBIAN_DIR}/patched + + set -- ${args} + while [ $# -ne 0 ]; do +@@ -308,8 +310,8 @@ + done + + stamp=${stampdir}/${patchname%%.dpatch}.dpatch +- test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch +- patch=${pwd}/debian/patches/${patchname}${ext} ++ test -e ${pwd}/${DEBIAN_DIR}/patches/${patchname} || ext=.dpatch ++ patch=${pwd}/${DEBIAN_DIR}/patches/${patchname}${ext} + + if [ ! -f ${patch} ]; then + if [ -z "${o_q}" ]; then +@@ -341,7 +343,7 @@ + pwd=$(pwd) + args=$1 + patchname=$2 +- stampdir=${DPATCH_WORKDIR}/debian/patched ++ stampdir=${DPATCH_WORKDIR}/${DEBIAN_DIR}/patched + + set -- ${args} + while [ $# -ne 0 ]; do +@@ -374,8 +376,8 @@ + done + + stamp=${stampdir}/${patchname%%.dpatch}.dpatch +- test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch +- patch=${pwd}/debian/patches/${patchname}${ext} ++ test -e ${pwd}/${DEBIAN_DIR}/patches/${patchname} || ext=.dpatch ++ patch=${pwd}/${DEBIAN_DIR}/patches/${patchname}${ext} + + if [ ! -f ${patch} ]; then + if [ -z "${o_q}" ]; then +@@ -433,8 +435,8 @@ + return 1 + fi + +- test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch +- patch=${pwd}/debian/patches/${patchname}${ext} ++ test -e ${pwd}/${DEBIAN_DIR}/patches/${patchname} || ext=.dpatch ++ patch=${pwd}/${DEBIAN_DIR}/patches/${patchname}${ext} + + if [ ! -f ${patch} ]; then + if [ -z "${o_q}" ]; then +@@ -495,8 +497,8 @@ + shift || true + done + +- test -e debian/patches/${patch} || ext=.dpatch +- patch=debian/patches/${patch}${ext} ++ test -e ${DEBIAN_DIR}/patches/${patch} || ext=.dpatch ++ patch=${DEBIAN_DIR}/patches/${patch}${ext} + + if [ ! -f ${patch} ]; then + if [ -z "${o_q}" ]; then +diff -urN -x '*.svn*' dpatch.sav/dpatch/dpatch_patchset.shpp dpatch/dpatch/dpatch_patchset.shpp +--- dpatch.sav/dpatch/dpatch_patchset.shpp 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpatch/dpatch_patchset.shpp 2006-04-10 20:13:39.000000000 +0300 +@@ -3,6 +3,8 @@ + ## Patchset handling functions for dpatch. + ## + ++DEBIAN_DIR=${DEBIAN_DIR:-debian} ++ + # dpatch_pathset_do [] + dpatch_patchset_do () + { +@@ -37,22 +39,22 @@ + patch="" + else + if [ "${DPATCH_OPTION_CPP}" = "0" ]; then +- if test -f debian/patches/00list; then +- patchlist_all="$(grep -v ^\# debian/patches/00list || :)" ++ if test -f ${DEBIAN_DIR}/patches/00list; then ++ patchlist_all="$(grep -v ^\# ${DEBIAN_DIR}/patches/00list || :)" + fi +- if test -f debian/patches/00list.${DEB_BUILD_ARCH}; then +- patchlist_arch="$(grep -v ^\# debian/patches/00list.${DEB_BUILD_ARCH} || :)" ++ if test -f ${DEBIAN_DIR}/patches/00list.${DEB_BUILD_ARCH}; then ++ patchlist_arch="$(grep -v ^\# ${DEBIAN_DIR}/patches/00list.${DEB_BUILD_ARCH} || :)" + fi + else +- if [ -f debian/patches/00list ]; then ++ if [ -f ${DEBIAN_DIR}/patches/00list ]; then + patchlist_all="$(cpp -P -DDEB_BUILD_ARCH_${DEB_BUILD_ARCH}=1 \ + -DDEB_BUILD_ARCH=\"${DEB_BUILD_ARCH}\" \ +- debian/patches/00list || :)" ++ ${DEBIAN_DIR}/patches/00list || :)" + fi +- if [ -f debian/patches/00list.${DEB_BUILD_ARCH} ]; then ++ if [ -f ${DEBIAN_DIR}/patches/00list.${DEB_BUILD_ARCH} ]; then + patchlist_arch="$(cpp -P -DDEB_BUILD_ARCH_${DEB_BUILD_ARCH}=1 \ + -DDEB_BUILD_ARCH=\"${DEB_BUILD_ARCH}\" \ +- debian/patches/00list.${DEB_BUILD_ARCH} || :)" ++ ${DEBIAN_DIR}/patches/00list.${DEB_BUILD_ARCH} || :)" + fi + fi + patchlist="${patchlist_all} ${patchlist_arch}" +diff -urN -x '*.svn*' dpatch.sav/dpatch/dpatch.shpp dpatch/dpatch/dpatch.shpp +--- dpatch.sav/dpatch/dpatch.shpp 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpatch/dpatch.shpp 2006-04-10 20:14:37.000000000 +0300 +@@ -10,6 +10,7 @@ + DPATCH_OPTION_CPP=0 + DPATCH_OPTION_CHDIR=0 + DPATCH_WORKDIR=./ ++DEBIAN_DIR=${DEBIAN_DIR:-debian} + + #:local-var SYSCONFDIR + +@@ -72,9 +73,9 @@ + shift || true + done + +-# Source debian/patches/00options here, as we need to know $DPATCH_WORKDIR first +-if [ -e "$DPATCH_WORKDIR/debian/patches/00options" ]; then +- . "$DPATCH_WORKDIR/debian/patches/00options" ++# Source ${DEBIAN_DIR}/patches/00options here, as we need to know $DPATCH_WORKDIR first ++if [ -e "$DPATCH_WORKDIR/${DEBIAN_DIR}/patches/00options" ]; then ++ . "$DPATCH_WORKDIR/${DEBIAN_DIR}/patches/00options" + fi + + # For each option we support both in the CLI and in 00options, the CLI should +diff -urN -x '*.svn*' dpatch.sav/dpatch/dpatch_template.shpp dpatch/dpatch/dpatch_template.shpp +--- dpatch.sav/dpatch/dpatch_template.shpp 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpatch/dpatch_template.shpp 2006-04-10 20:14:55.000000000 +0300 +@@ -3,6 +3,8 @@ + ## Template handling helper functions for dpatch + ## + ++DEBIAN_DIR=${DEBIAN_DIR:-debian} ++ + # dpatch_patch_template [] + dpatch_patch_template () + { +diff -urN -x '*.svn*' dpatch.sav/dpatch/Makefile dpatch/dpatch/Makefile +--- dpatch.sav/dpatch/Makefile 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpatch/Makefile 2006-04-10 20:06:27.000000000 +0300 +@@ -1,12 +1,13 @@ + top_srcdir := .. + + DPATCH_SRCS := $(shell sed -n s/^\#:include//p dpatch.shpp) ++DEBIAN_DIR ?= debian + + include ../config.mk + + all: dpatch dpatch-run dpatch.lib.sh + +-dpatch: dpatch.shpp ../debian/changelog ${DPATCH_SRCS} ++dpatch: dpatch.shpp ../$(DEBIAN_DIR)/changelog ${DPATCH_SRCS} + + DPATCH_REVISION="${DPATCH_REVISION}" \ + SYSCONFDIR="${sysconfdir}" ../tools/shpp.awk dpatch +diff -urN -x '*.svn*' dpatch.sav/dpep/dpatch-edit-patch dpatch/dpep/dpatch-edit-patch +--- dpatch.sav/dpep/dpatch-edit-patch 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpep/dpatch-edit-patch 2006-04-10 20:16:14.000000000 +0300 +@@ -2,6 +2,8 @@ + + set -e + ++DEBIAN_DIR=${DEBIAN_DIR:-debian} ++ + # Read in the user's configuration file, should it exist. + [[ -f ~/.dpatch.conf ]] && . ~/.dpatch.conf + +@@ -11,7 +13,7 @@ + # will blindly set it to the option given therein; CLI options trump all. + VERBOSITY=0 + DPEP_SOURCEDIR="${DPEP_SOURCEDIR:-${conf_sourcedir:-$(pwd)}}" +-DPEP_OUTDIR="${DPEP_OUTDIR:-${conf_outdir:-$DPEP_SOURCEDIR/debian/patches}}" ++DPEP_OUTDIR="${DPEP_OUTDIR:-${conf_outdir:-$DPEP_SOURCEDIR/${DEBIAN_DIR}/patches}}" + DPEP_TMPDIR="${DPEP_TMPDIR:-${conf_tmpdir:-${TMPDIR:-/tmp}}}" + DPEP_SHELL="${DPEP_SHELL:-${conf_shell:-${SHELL:-$(getent passwd $(id -un) | cut -f7- -d:)}}}" + DPEP_KEEPTEMP="${DPEP_KEEPTEMP:-${conf_keeptemp:-0}}" +@@ -53,7 +55,7 @@ + cd "$DPEP_SOURCEDIR" + + # $PWD: $DPEP_SOURCEDIR +-if [[ ! -e "debian/rules" ]]; then ++if [[ ! -e "${DEBIAN_DIR}/rules" ]]; then + # Check to make sure we're in the toplevel directory of a Debian package; + # if not, error out. + dpep_message error "\"$DPEP_SOURCEDIR\" is not the toplevel directory of a Debian package, aborting." +@@ -62,7 +64,7 @@ + + # Source 00options, currently known options are DPATCH_OPTION_CPP + # and DPEP_OPTION_EXEC_TEMPLATE +-[ -r "debian/patches/00options" ] && . debian/patches/00options ++[ -r "${DEBIAN_DIR}/patches/00options" ] && . ${DEBIAN_DIR}/patches/00options + + # Check to see whether or not $DPEP_PATCH ends with .dpatch + if [[ "${DPEP_PATCH}" = "${DPEP_PATCH%%.dpatch}" ]]; then +@@ -104,8 +106,8 @@ + # The user didn't supply a .dpatch extension, so we supply it. + DPEP_BASEPATCH="$DPEP_BASEPATCH.dpatch" + fi +- if [[ ! -e "debian/patches/$DPEP_BASEPATCH" ]]; then +- dpep_message error "Base-patch $(pwd)/debian/patches/$DPEP_BASEPATCH does not exist, aborting." ++ if [[ ! -e "${DEBIAN_DIR}/patches/$DPEP_BASEPATCH" ]]; then ++ dpep_message error "Base-patch $(pwd)/${DEBIAN_DIR}/patches/$DPEP_BASEPATCH does not exist, aborting." + fi + fi + fi +@@ -132,15 +134,15 @@ + # Copy, clean, and clone $DPEP_SOUREDIR + dpep_message norm "* Cleaning $DPEP_SOURCEDIR" + cd "$DPEP_SOURCEDIR" +-$DPEP_ROOTCMD debian/rules clean unpatch ++$DPEP_ROOTCMD ${DEBIAN_DIR}/rules clean unpatch + dpatch deapply-all + + if [[ ! -z "$DPEP_BASEPATCH" ]]; then + if ! dpatch list-all | grep -F "${DPEP_BASEPATCH%%.dpatch}" > /dev/null 2>&1; then + if [[ "$DPEP_EDITPATCH" = 1 ]]; then +- dpep_message warn "$DPEP_PATCH is not listed in debian/patches/00list, no other patches will be applied to the working directory." ++ dpep_message warn "$DPEP_PATCH is not listed in ${DEBIAN_DIR}/patches/00list, no other patches will be applied to the working directory." + else +- dpep_message error "Base-patch is not listed in debian/patches/00list, aborting." ++ dpep_message error "Base-patch is not listed in ${DEBIAN_DIR}/patches/00list, aborting." + exit 1 + fi + else +@@ -218,11 +220,11 @@ + NEWPATCH="$DPEP_OUTDIR/$DPEP_PATCH" + + [[ ! -d "$PATCHDIR" ]] && mkdir -p "$PATCHDIR" +- if [[ ! -e "debian/patches/00template" ]]; then +- dpep_message warn "debian/patches/00template not exist, using hardcoded default." ++ if [[ ! -e "${DEBIAN_DIR}/patches/00template" ]]; then ++ dpep_message warn "${DEBIAN_DIR}/patches/00template not exist, using hardcoded default." + dpep_template_hardcoded "$NEWPATCH" + else +- dpep_message norm "Using debian/patches/00template" ++ dpep_message norm "Using ${DEBIAN_DIR}/patches/00template" + dpep_template_apply "$NEWPATCH" "$DPEP_DESC" + fi + # Okay, headers and shell snippets all set up. Now copy the actual patch text. +@@ -239,14 +241,14 @@ + # They have our tag, so we can preserve their headers. + dpep_message norm "@DPATCH@ tag found, preserving dpatch header." + head -n "$DPEP_TAGLINENUM" "$OLDPATCH" > "$NEWPATCH" +- elif [[ -e "debian/patches/00template" ]]; then ++ elif [[ -e "${DEBIAN_DIR}/patches/00template" ]]; then + # Okay, they don't have a tag - damn them. But they at least have a + # template. +- dpep_message warn "@DPATCH@ tag not found, using debian/patches/00template" ++ dpep_message warn "@DPATCH@ tag not found, using ${DEBIAN_DIR}/patches/00template" + dpep_template_apply "$OLDPATCH" "$DPEP_DESC" + else + # They have neither a @DPATCH@ tag, *NOR* a template. Damn, they just suck. +- dpep_message warn "@DPATCH@ tag not found, debian/patches/00template not found. Using hardcoded default." ++ dpep_message warn "@DPATCH@ tag not found, ${DEBIAN_DIR}/patches/00template not found. Using hardcoded default." + dpep_template_hardcoded "$NEWPATCH" + fi + # Okay, the headers and shell snippets are in place. Move the diff there now. +diff -urN -x '*.svn*' dpatch.sav/dpep/dpatch_edit_patch.bash_completion.d dpatch/dpep/dpatch_edit_patch.bash_completion.d +--- dpatch.sav/dpep/dpatch_edit_patch.bash_completion.d 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpep/dpatch_edit_patch.bash_completion.d 2006-04-10 20:17:07.000000000 +0300 +@@ -15,6 +15,7 @@ + # Syntax: + # dpatch-edit-patch [options] command dpatchname [basepatch] + # ++DEBIAN_DIR=${DEBIAN_DIR:-debian} + + have dpatch-edit-patch && + _dpatch_edit_patch() +@@ -43,7 +44,7 @@ + [[ -f ~/.dpatch.conf ]] && . ~/.dpatch.conf + # default dirs + DPEP_SOURCEDIR=${DPEP_SOURCEDIR:-${conf_sourcedir:-$(pwd)}} +- DPEP_OUTDIR=${DPEP_OUTDIR:-${conf_outdir:-$DPEP_SOURCEDIR/debian/patches}} ++ DPEP_OUTDIR=${DPEP_OUTDIR:-${conf_outdir:-$DPEP_SOURCEDIR/${DEBIAN_DIR}/patches}} + # parse options + mode=all + for (( i=1; i < ${#COMP_WORDS[@]}; i++ )); do +@@ -149,8 +150,8 @@ + if [ "$mode" = "all" ]; then + COMPREPLY=( $( compgen -W "$options" -- "$cur" ) ) + fi +- # check for debian source dir +- if [ ! -e "$DPEP_SOURCEDIR/debian/rules" ]; then ++ # check for ${DEBIAN_DIR} source dir ++ if [ ! -e "$DPEP_SOURCEDIR/${DEBIAN_DIR}/rules" ]; then + return 0 + fi + # check for output dir +diff -urN -x '*.svn*' dpatch.sav/dpep/dpatch-edit-patch.functions dpatch/dpep/dpatch-edit-patch.functions +--- dpatch.sav/dpep/dpatch-edit-patch.functions 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/dpep/dpatch-edit-patch.functions 2006-04-10 20:17:30.000000000 +0300 +@@ -4,6 +4,7 @@ + # Currently include dpep_parse_longopt_value(), dpep_usage(), + # dpep_template_apply(), dpep_template_hardcoded(), and dpep_message() + ++DEBIAN_DIR=${DEBIAN_DIR:-debian} + DPEP_BASENAME="$(basename $0)" + + dpep_usage() { +@@ -18,7 +19,7 @@ + Commands: + patch This is the default if no other command is specified. + "patchname" is the patch you wish to create or edit, as +- listed in debian/patches/00list. If the patch doesn't ++ listed in ${DEBIAN_DIR}/patches/00list. If the patch doesn't + exist, it will be created - and a second argument is + allowed in this case, [basepatch]. It will be the last + patched applied (according to 00list) to the working +@@ -27,7 +28,7 @@ + Options: + -d|--description Description for the new patch, if applicable. + -o|--outdir Output directory for patches, defaults to +- \$(pwd)/debian/patches/ ++ \$(pwd)/${DEBIAN_DIR}/patches/ + -s|--sourcedir Source directory, defaults to \$(pwd) + -t|--tmpdir Temporary directory, defaults to \$TMPDIR or /tmp/ + -k|--keeptemp Keep working source tree after exit. +@@ -36,7 +37,7 @@ + Examples: + dpatch-edit-patch 20_upstream_fix2 19_upstream_fix1 + dpatch-edit-patch patch 20_upstream_fix2 +- dpatch-edit-patch --sourcedir ~/debian/dpatch-1.15 19 ++ dpatch-edit-patch --sourcedir ~/${DEBIAN_DIR}/dpatch-1.15 19 + + EOF + } +@@ -50,10 +51,10 @@ + + dpep_template_apply() { + if [ "$DPEP_OPTION_EXEC_TEMPLATE" = "1" ]; then +- chmod +x debian/patches/00template +- debian/patches/00template "$(basename "$1")" "$2" > "$1" ++ chmod +x ${DEBIAN_DIR}/patches/00template ++ ${DEBIAN_DIR}/patches/00template "$(basename "$1")" "$2" > "$1" + else +- cat debian/patches/00template > "$1" ++ cat ${DEBIAN_DIR}/patches/00template > "$1" + fi + } + +diff -urN -x '*.svn*' dpatch.sav/scripts/dpatch-convert-diffgz dpatch/scripts/dpatch-convert-diffgz +--- dpatch.sav/scripts/dpatch-convert-diffgz 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/scripts/dpatch-convert-diffgz 2006-04-10 20:19:09.000000000 +0300 +@@ -13,6 +13,7 @@ + # 15 Jan 2003, Junichi Uekawa + + set -e ++DEBIAN_DIR=${DEBIAN_DIR:-debian} + + if [ ! -e /usr/bin/filterdiff ]; then + echo "dpatch-convert-diffgz: filterdiff not found, aborting!" >&2 +@@ -20,13 +21,13 @@ + exit 1 + fi + +-while ! test -d ./debian -o "$(pwd)" = "/" ; do ++while ! test -d ./${DEBIAN_DIR} -o "$(pwd)" = "/" ; do + cd ..; + done + + DPCD_PATCHNO="$1" + DPCD_PATCHNAME="$(basename $2 .dpatch)" +-DPCD_PATCHDIR=debian/patches ++DPCD_PATCHDIR=${DEBIAN_DIR}/patches + + if [ -z "$2" ]; then + cat <> ${DPCD_PATCHDIR}/00list +-fakeroot debian/rules patch ++fakeroot ${DEBIAN_DIR}/rules patch + + # arch-tag: 5d7cf9b9-459c-4a5e-8a62-6bc1efa16e21 +diff -urN -x '*.svn*' dpatch.sav/scripts/dpatch-list-patch dpatch/scripts/dpatch-list-patch +--- dpatch.sav/scripts/dpatch-list-patch 2006-04-10 19:59:53.000000000 +0300 ++++ dpatch/scripts/dpatch-list-patch 2006-04-10 20:19:49.000000000 +0300 +@@ -4,8 +4,10 @@ + ## + ## Released under the terms of the GNU GPLv2. + +-## Move to likely debian dir +-while ! test -d ./debian -o "$(pwd)" = "/" ; do ++DEBIAN_DIR=${DEBIAN_DIR:-debian} ++ ++## Move to likely ${DEBIAN_DIR} dir ++while ! test -d ./${DEBIAN_DIR} -o "$(pwd)" = "/" ; do + cd ..; + done + diff -Nru dpatch-2.0.10/debian/patches/use_awk_instead_of_nawk.patch dpatch-2.0.10.emdebian3/debian/patches/use_awk_instead_of_nawk.patch --- dpatch-2.0.10/debian/patches/use_awk_instead_of_nawk.patch 1970-01-01 00:00:00.000000000 +0000 +++ dpatch-2.0.10.emdebian3/debian/patches/use_awk_instead_of_nawk.patch 2006-10-20 18:01:00.000000000 +0000 @@ -0,0 +1,8 @@ +--- dpatch/tools/shpp.awk~ 2006-10-21 03:09:45.000000000 +0300 ++++ dpatch/tools/shpp.awk 2006-10-20 20:57:51.000000000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/nawk -f ++#!/usr/bin/awk -f + # shpp.awk -- Simple preprocessor for shell scripts + # + # Copyright (C) 2003 Miles Bader diff -Nru dpatch-2.0.10/debian/patches/use_awk_instead_of_nawk.patch~ dpatch-2.0.10.emdebian3/debian/patches/use_awk_instead_of_nawk.patch~ --- dpatch-2.0.10/debian/patches/use_awk_instead_of_nawk.patch~ 1970-01-01 00:00:00.000000000 +0000 +++ dpatch-2.0.10.emdebian3/debian/patches/use_awk_instead_of_nawk.patch~ 2006-10-20 18:00:06.000000000 +0000 @@ -0,0 +1,8 @@ +--- tools/shpp.awk~ 2006-10-21 03:09:45.000000000 +0300 ++++ tools/shpp.awk 2006-10-20 20:57:51.000000000 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/nawk -f ++#!/usr/bin/awk -f + # shpp.awk -- Simple preprocessor for shell scripts + # + # Copyright (C) 2003 Miles Bader diff -Nru dpatch-2.0.10/debian/rules dpatch-2.0.10.emdebian3/debian/rules --- dpatch-2.0.10/debian/rules 2004-10-07 08:19:18.000000000 +0000 +++ dpatch-2.0.10.emdebian3/debian/rules 2006-10-21 00:09:46.000000000 +0000 @@ -9,14 +9,26 @@ DOCS = README README.History README.arch -build: +patch: debian/patch-stamp + +debian/patch-stamp: + cat debian/patches/*patch | patch -p1 + touch debian/patch-stamp + +unpatch: + if [ -f debian/patch-stamp ]; then \ + cat debian/patches/*patch | patch -p1 -R ;\ + rm -f debian/patch-stamp; \ + fi + +build: patch test -e debian/control ${MAKE} testroot: test -e debian/control && test xroot = x`whoami` -clean: testroot +clean: testroot unpatch ${MAKE} clean rm -rf debian/files* ${DPATCH}