Merge lp:~ubuntu-branches/ubuntu/lucid/quilt/lucid-201002122335 into lp:ubuntu/lucid/quilt

[James Westby]

[James Westby (james-w)]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/quilt now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/quilt/lucid-201002122335. A merge should be performed if necessary.

Unmerged revisions

13. By Steve Langasek on 2009-12-23

Merging shared upstream rev into target branch.

=== modified file 'Makefile.in'
--- Makefile.in	2009-12-11 15:00:38 +0000
+++ Makefile.in	2010-02-12 23:40:30 +0000
@@ -377,12 +377,25 @@
 			{ print FILENAME, ":", "quilt/"$$1}' $(TESTS); \
 	    $(AWK) 'sub(/.*\<quilt_command /, "") && ($$1 !~ /[^a-z]/)	\
 			{ print FILENAME, ":", "quilt/"$$1 }' quilt/*.in; \
-	) | sort -u | $(SED) -re 's:^test/(.*)\.test:test/.\1.ok:' \
-	    -e 's:quilt/graph:quilt/graph quilt/scripts/dependency-graph:' \
-	    -e 's:quilt/mail:quilt/mail quilt/scripts/edmail:' \
-	    -e 's:quilt/refresh:quilt/refresh quilt/scripts/remove-trailing-ws:' \
-	    -e 's:quilt/setup:quilt/setup quilt/scripts/inspect:' \
-	  > $@
+<<<<<<< TREE
+	) | sort -u | $(SED) -re 's:^test/(.*)\.test:test/.\1.ok:' \
+	    -e 's:quilt/graph:quilt/graph quilt/scripts/dependency-graph:' \
+	    -e 's:quilt/mail:quilt/mail quilt/scripts/edmail:' \
+	    -e 's:quilt/refresh:quilt/refresh quilt/scripts/remove-trailing-ws:' \
+	    -e 's:quilt/setup:quilt/setup quilt/scripts/inspect:' \
+	  > $@
+=======
+	) | sort -u | $(SED) -re 's:^test/(.*)\.test:test/.\1.ok:' \
+	    -e 's:quilt/graph:quilt/graph quilt/scripts/dependency-graph:' \
+	    -e 's:quilt/mail:quilt/mail quilt/scripts/edmail:' \
+	    -e 's:quilt/refresh:quilt/refresh quilt/scripts/remove-trailing-ws:' \
+	    -e 's:quilt/setup:quilt/setup quilt/scripts/inspect:' \
+	  > $@
+
+ifneq ($(shell . $(QUILTRC) ;  echo $$QUILT_PATCHES_PREFIX),)
+CHECK_ENV := P=patches/; _P=../patches/; export P _P
+endif
+>>>>>>> MERGE-SOURCE
 
 # Each tests dependencies are stored in test/.depend
 ifneq ($(findstring check-,$(MAKECMDGOALS)),)

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2009-12-11 15:00:38 +0000
+++ debian/README.Debian	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Using quilt with debhelper
 --------------------------
 If you use the dh command provided by debhelper 7, you can simply
@@ -36,3 +37,40 @@
     build: $(QUILT_STAMPFN)
 	    ...
 
+=======
+Using quilt with debhelper
+--------------------------
+If you use the dh command provided by debhelper 7, you can simply
+call it with "dh --with quilt" and dh_quilt_patch/dh_quilt_unpatch
+will be called at the right time.
+
+Otherwise you can manually call dh_quilt_patch / dh_quilt_unpatch
+at the right place, see their respective manpages for examples.
+
+Using quilt with CDBS
+---------------------
+
+You can include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+in debian/rules and be done with it.
+
+If you use DEB_SRCDIR you might want to set DEB_QUILT_TOPDIR to "."
+so that quilt patches are applied in the current directory and
+not in DEB_SRCDIR. This will ensure compatibility with the
+"3.0 (quilt)" source format.
+
+Using quilt in other packages
+-----------------------------
+
+You can include /usr/share/quilt/quilt.make in debian/rules and modify
+your rules to depend on the targets provided by this Makefile (unpatch and
+$(QUILT_STAMPFN)). Here's an example:
+
+    include /usr/share/quilt/quilt.make
+
+    clean: unpatch
+	    ...
+
+    build: $(QUILT_STAMPFN)
+	    ...
+
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/README.source'
--- debian/README.source	2009-10-29 17:56:18 +0000
+++ debian/README.source	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 This package uses quilt to manage all modifications to the upstream
 source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
@@ -56,3 +57,62 @@
 
 You may need to run quilt pop -a to unapply patches first before running
 this command.
+=======
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-14 22:23:25 +0000
+++ debian/changelog	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 quilt (0.48-4ubuntu1) lucid; urgency=low
 
   * Merge from Debian unstable (LP: #507662), remaining changes:
@@ -856,3 +857,816 @@
  -- Martin Quinson <[e-mail]>  Tue, 29 Oct 2002 09:29:20 +0100
 
 # -*- coding: utf-8 -*-
+=======
+quilt (0.48-1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing, remaining changes:
+    - debian/patches/check_series_is_no_dir: Check that series is not a
+      directory.
+
+ -- Steve Langasek <[e-mail]>  Thu, 10 Dec 2009 10:44:30 +0000
+
+quilt (0.48-1) unstable; urgency=low
+
+  [ Martin Quinson ]
+  * New upstream release.
+  * debian/patches/generic-awk: removed since merged upstream.
+  * debian/patches/*: updated so that they apply again on this release.
+
+  [ Raphaël Hertzog ]
+  * Remove Simon Hormans from Uploaders with his permission.
+  * debian/patches/fix-manpage-generation: fix Makefile so that
+    the manual page is correctly generated with dash too (LP: #402237)
+  * Improve dh_quilt_patch/unpatch by respecting the QUILT_PATCH_DIR
+    environment variable like /usr/share/quilt/quilt.make does.
+    Closes: #544668
+
+  [ Ryan Niebur ]
+  * Add myself to Uploaders
+  * fixes to the arch_all patch to pass test suite
+    - port upstream changes to the c version to the bash rewrite
+      of backup-files
+    - fix backup-files to process all files passed in on the
+      command line instead of just the last (a clear bug)
+  * refresh all patches with -p ab
+  * add procmail to build deps, needed by tests
+  * Debian Policy 3.8.3
+
+ -- Raphaël Hertzog <[e-mail]>  Wed, 02 Sep 2009 22:05:25 +0200
+
+quilt (0.46-8ubuntu1) karmic; urgency=low
+
+  * debian/patches/check_series_is_no_dir:
+    - Check that series is no directory. (LP: #428657)
+
+ -- Christoph Korn <[e-mail]>  Sun, 13 Sep 2009 01:26:44 +0200
+
+quilt (0.46-8) unstable; urgency=low
+
+  * Move to section “vcs” to match with ftpmasters' overrides.
+  * Hide from build output some comments inside quilt.make
+    that could lead to believe that an error appeared. Thanks to
+    Andrea Bolognani <[e-mail]>. Closes: #531192
+  * Rename debian/patches/fr.po into debian/patches/po-fix-msguniq
+    to avoid problems with scripts believing this is a po file.
+  * Add "quilt shell" sub-command to update the topmost patch without having
+    to quilt add files that are going to be modified. Thanks to Josselin
+    Mouette for the patch. Closes: #526141
+  * Update Standards-Version to 3.8.2: no change needed except switch to vcs
+    section. 
+  * Modify the quilt debhelper sequence to also register the dh_quilt_patch
+    command in the "patch" target. Thanks to Joey Hess for the debhelper
+    feature update and to Ryan Niebur for the bug report. Closes: #540124
+  * Modify my name in Uploaders to include the accent.
+
+ -- Raphaël Hertzog <[e-mail]>  Fri, 14 Aug 2009 14:06:49 +0200
+
+quilt (0.46-7) unstable; urgency=low
+
+  * Add new dh_quilt_patch and dh_quilt_unpatch commands to be used within
+    debhelper. Also add a debhelper addon so that the dh command can do patch
+    management with a simple "dh --with quilt $@" in the tiny rules file
+    provided by debhelper 7. Closes: #527255
+  * Build-Depends on perl for pod2man and man page generation of the new
+    dh_* commands.
+  * Add Enhances: debhelper in debian/control for the new dh_* commands.
+  * Update Standards-Version to 3.8.1: no change needed.
+  * Fix misc lintian warnings.
+  * Update the copyright file with the few copyright notices that are
+    embedded.
+  * Add a watch file.
+
+ -- Raphael Hertzog <[e-mail]>  Fri, 08 May 2009 12:23:52 +0200
+
+quilt (0.46-6) unstable; urgency=low
+
+  * Change back patchsys-quilt.mk to enter DEB_SRCDIR by default before
+    applying patches (8 packages FTBFS due to this change). But we can now
+    use DEB_QUILT_TOPDIR to override the default choice of DEB_SRCDIR.
+
+ -- Raphael Hertzog <[e-mail]>  Thu, 19 Jun 2008 21:40:27 +0200
+
+quilt (0.46-5) unstable; urgency=low
+
+  [ Martin Quinson ]
+  * Acknowledge NMU (thanks Raphael).
+    This also Closes: #454351 (doc in erroneous section Apps/Text)
+  * debian/control: add Vcs-git, Vcs-browser and homepage fields.
+  * Remove file patches/generic-awk from the debian diff 
+    (was a leftover of the creation of debian/patches/generic-awk)
+  * debian/rules: filter \sh{.*} constructs in the hevea output,
+    such that HTML documentation is more readable [Rafael Laboissiere]
+    Closes: #471453 (Make HTML documentation more readable)
+  * pass --with-sendmail to configure, not --with-mta, and remove the
+    /usr/share/quilt/compat/sendmail link.
+    Closes: #443419 (quilt mail command cannot find sendmail)
+  * Closes: #458285 (spelling error in /usr/share/quilt/quilt.make)
+  * patches/arch_all: in backup-files.in:link_or_copy_file()
+    redirect the errors comming from ls to /dev/null to reduce noise
+    when ln is not usable (for example on AFS). Should be harmless
+    since cp is used as backup when ln fails. [Russ Allbery]
+    Closes: #458158 (extra noise when cross-directory symlinks aren't supported)
+  * patches/unset_posix_strict_conformance_variables (new):
+    unset POSIXLY_CORRECT _POSIX2_VERSION POSIXLY_PEDANTIC from quilt
+    since they force patch to run in interactive manner (doh!)
+    Closes: #462578 (quilt: breaks when POSIXLY_CORRECT=1)
+  * Add a dpatch2quilt.sh script (to /usr/share/doc/quilt/examples) to
+    ease the conversion from dpatch to quilt
+    Closes: #464663 (sample script for dpatch -> quilt conversions)
+  * Pass --no-print-directory to make while generating the man page to
+    counter the fact that the top-level make (ie, debian/rules) pass
+    -w to all childs. Patch by Romain Francoise, thanks.
+    Closes: #436936 (build process has contaminated the manpage)
+
+  [ Raphael Hertzog ]
+  * Add myself to Uploaders.
+  * Update Standards-Version to 3.8.0:
+    - support patch/unpatch rules in patchsys-quilt.mk
+    - support patch/unpatch rules in debian/rules
+  * Switch to debhelper 5, adjust debian/compat and build-depends.
+  * Remove minimal version in the cdbs build-dependency, even oldstable
+    has a high-enough version.
+  * patchsys-quilt.mk: don't try to apply patches in $(DEB_SRCDIR) but in
+    current directory. This is best for compatibility with the upcoming "3.0
+    (quilt)" source package format and the two only packages which are
+    affected by this change have already been fixed (see #485142, #485163).
+    Closes: #485835
+
+ -- Martin Quinson <[e-mail]>  Sun, 15 Jun 2008 22:17:14 +0200
+
+quilt (0.46-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Changes in patchsys-quilt.mk:
+    * Convert to UTF-8.
+    * Always use QUILT_PATCHES=$(CURDIR)/debian/patches. And thus drop the
+      creation of the "patches" symlink as it will occasionnaly lead to
+      problems with some packages. Closes: #473381
+    * Fixes generated build-dependency on CDBS to not contain the "-1" that
+      leads to the lintian warning "build-depends-on-1-revision".
+      Closes: #482948
+  * Fixes "apply-patches" rule to not reapply patches when they have already
+    been applied by dpkg-source. Closes: #482750
+  * Integrate debian/README.source as suggested by Russ Allbery and install it
+    in /usr/share/doc/quilt/. Closes: #478421
+  * Several lintian fixes:
+    * clean-should-be-satisfied-by-build-depends: move debhelper and cdbs to
+      Build-Depends
+    * doc-base-file-uses-obsolete-national-encoding: switch
+      debian/quilt.doc-base to UTF-8.
+    * virtual-package-depends-without-real-package-depends and
+      needlessly-depends-on-awk: drop dependency and build-dependency on awk.
+    * spelling-error-in-description linux Linux: fix description accordingly.
+    * doc-base-unknown-section: switch doc-base section to "Programming".
+    * doc-base-abstract-might-contain-extra-leading-whitespaces: fix doc-base
+      description to be a proper paragraph that can be rewrapped.
+
+ -- Raphael Hertzog <[e-mail]>  Wed, 28 May 2008 13:57:30 +0200
+
+quilt (0.46-4) unstable; urgency=low
+
+  * Really remove the depend on gawk, sorry (only build-depend was
+    changed)
+  * Reindent quilt.make to remove spurious output.
+  * Thanks to Marco d'Itri for spotting these ones.
+
+ -- Martin Quinson <[e-mail]>  Tue, 07 Aug 2007 19:58:03 +0200
+
+quilt (0.46-3) unstable; urgency=low
+
+  * Depend on awk and not gawk (add patch generic-awk for this to work). 
+    Thanks to Wolfram Sang -- Closes #431926.
+  * Modify patch doc_improvement to fix a typo in manpage:
+    s/QUILT_NO_DIFF_TIMESTAMP/QUILT_NO_DIFF_TIMESTAMPS/
+    Thanks to Sukant Hajra -- Closes: #422000.
+  * Modify patch doc_improvement to fix a typo in main documentation:
+    s/ouput/output/   Thanks to Cyril Brulebois.
+  * Add a link /usr/sbin/sendmail -> /usr/share/quilt/compat/sendmail
+    since /usr/sbin is not supposed to be in users' path
+    Thanks to Mark Brown -- Closes: #410890.
+  * Add a call to create_db in snapshot command so that it works on
+    freshly untarred quiltified projects.
+    Thanks to Cyril Brulebois -- Closes: #403399.
+  * Really get rid of debug messages in the generated man page (I hope).
+    it didn't came from the debian/rules and neither from the package
+    Makefile, but from the makefile I use to rebuild the package here.
+    Closes: #402114.
+
+ -- Martin Quinson <[e-mail]>  Sun, 05 Aug 2007 14:36:21 +0200
+
+quilt (0.46-2) unstable; urgency=low
+
+  * Integrate the changes to the quilt package from Simon Horman.
+    Add Simon to the uploaders list. Changes to the different patches:
+
+    [arch_all] (modified)
+      - stop exporting QUILT_LIB in bin/quilt since there is no lib after the
+        arch_all modification
+      - remove the backup-files.c since we don't use it anymore
+
+    [mail-signature] (new)
+      new option --signature to the mail command to specify which signature
+      file to use (defaults to ~/.signature)
+
+    [no-signature-test] (new)
+      forbid the use of a .signature file in the tests (using the feature of
+      previous patch) to not fail when a ~/.signature is present
+
+    [mail-from-locale] (new)
+      Force locale to C when generating date for From header
+
+  * [debian/quilt.make]: various fixes
+    - Do not indent internal comments or make will display them, and
+      likewise for debian/patchsys-quilt.mk. (Closes: #418680)
+      By Peter Eisentraut.
+    - Add ".PHONY: patch unpatch" as it should be. (Closes: #405558)
+      By Steinar H. Gunderson.
+    - Place emacs mode on the first line. (Closes: #406249)
+      By Marco Túlio Gontijo e Silva.
+
+  * [debian/patchsys-quilt.mk] use $(CURDIR) instead of $(shell pwd)
+    By Loïc Minier. (Closes: #406183)
+
+  * [patches/doc_improvements] catch punctuation typos. (Closes: #402120)
+    By Bastian Kleineidam.
+
+  * [patches/makefile_gliches] Yet another try to remove debuging output
+    form the makefile. By Bastian Kleineidam. (Closes: #402114)
+
+  * Suggest the graphviz package since the graph command use it (at least
+    the 'dot' command of graphviz). (Closes: #407469).
+  * Change Build-deps into Build-dep-indep since we're now arch:all
+
+ -- Martin Quinson <[e-mail]>  Fri, 20 Apr 2007 13:31:29 +0200
+
+quilt (0.46-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Quinson <[e-mail]>  Thu, 19 Apr 2007 14:40:45 +0200
+
+quilt (0.45-6) unstable; urgency=low
+
+  * [debian/patches/override_mail_sender_in_testsuite]
+    Fix the patch to catch all occurences of 'quilt mail' since each of them
+    will cause a FTBFS on misconfigured hosts (thanks to Goswin Brederlow).
+    (Closes: #397285, #395482, #393985) I hope, at least.
+    
+  * [debian/patches/doc_improvement]
+    Fix some more typos in the manpages
+    (Closes: #386548, #395447)
+
+  * [debian/control]
+     Add procmail to suggest list to help users locating the 'formail' tool.
+     (Closes: #396093)
+
+ -- Martin Quinson <[e-mail]>  Thu, 23 Nov 2006 16:17:11 +0100
+
+quilt (0.45-5) unstable; urgency=low
+
+  * [debian/patches/override_mail_sender_in_testsuite]
+    override the mail sender in the testsuite so that it works even on
+    misconfigured chroots used to compile etch over and over
+    (Closes: #393985).
+
+ -- Martin Quinson <[e-mail]>  Thu, 19 Oct 2006 21:19:45 +0200
+
+quilt (0.45-4) unstable; urgency=low
+
+  * [debian/control]
+    Typo in package description (Closes: #386549):
+    "basic support those" -> "basic support for those" 
+  * [debian/patches/doc_improvement]
+    Typo in man page (Closes: #386549):
+    invoqued -> invoked
+  * [debian/patches/makefile_glitches] 
+     Remove buildd messages from the manpage (Closes: #381125)
+
+ -- Martin Quinson <[e-mail]>  Sun,  1 Oct 2006 22:31:29 +0200
+
+quilt (0.45-3) unstable; urgency=low
+
+  * Don't even try to build the package when /proc is not mounted since
+     the checks will fail after a long moment. #380598 is thus closed twice:
+     once upstream with the changes from 0.45-2 and in debian now.
+    Note that if nocheck is added to DEB_BUILD_OPTIONS, the package will be
+     built since there will be no test to fail. The only pb is that I can't
+     remember of how to add this option with dpkg-buildpackage ;)
+
+ -- Martin Quinson <[e-mail]>  Mon, 31 Jul 2006 18:24:58 +0200
+
+quilt (0.45-2) unstable; urgency=low
+
+  * New patch: patch-wrapper_do_depend_on_proc:
+    Let patch-wrapper die with an informative message when /proc is not
+    mounted (Closes: #380598)
+
+ -- Martin Quinson <[e-mail]>  Mon, 31 Jul 2006 13:23:12 +0200
+
+quilt (0.45-1) unstable; urgency=low
+
+  * New upstream release. 
+    - Various bug fixes and little improvements such as:
+      - quilt/edit.in: Fix for working in subdirectories. Closes: #366964.
+    - Update all patches
+  * Acknoledge the NMU. Thanks Vorlon. Closes: #364834.
+  * Move cdbs & debhelper from Build-Depends-Indep to Build-Depends since it
+    is what I understand from the Right Thing to do.
+  * Pass --quiltrc /dev/null to quilt in /usr/share/quilt/quilt.make for
+    those who don't use cdbs but still don't want to FTBFTS because of
+    personal settings in ~/.quiltrc. Closes: #370041.
+  * use debian/stamp-patched as stamp file in /usr/share/quilt/quilt.make,
+    and don't add debian/ artificially to the touch & rm commands. Hopefully
+    Closes: #367078.
+
+ -- Martin Quinson <[e-mail]>  Fri, 16 Jun 2006 11:34:08 +0200
+
+quilt (0.44-6.1) unstable; urgency=low
+
+  * Non-maintainer upload with permission of the maintainer.
+  * Fix handling of recursive directory removal in the backup-files
+    shell script to account for path elements being symlinks instead of 
+    directories.  Closes: #364834.
+
+ -- Steve Langasek <[e-mail]>  Fri, 26 May 2006 00:35:14 -0700
+
+quilt (0.44-6) unstable; urgency=low
+
+  * Split the debian patch in several ones. Use quilt *when available*
+    to deal with it. 
+    pbuilds well here. Let's see what the buildd think of it.
+    
+  * Avoid infinite loops in backup-files when patching inexistant files.
+    Thanks to Dan for reporting and sorting the problem out.
+    (Closes: #366424).
+  * New patch: test_broken_patches: 
+    Adds test/file-not-found.test pushing a patch touching a inexistant
+    file (yeah, that's the previous bug)
+
+ -- Martin Quinson <[e-mail]>  Tue,  9 May 2006 08:55:02 +0200
+
+quilt (0.44-5) unstable; urgency=low
+
+  * add '--quiltrc /dev/null' to quilt invocations in patchsys-quilt.mk.
+    (Closes: #362054)
+  * Make backup-files a shell script instead of a binary, so we can make
+    quilt arch: all [Steve Langasek, thanks so much] 
+    (Closes: #363659)
+  * Do run "make check" when building the package.
+
+ -- Martin Quinson <[e-mail]>  Wed, 12 Apr 2006 02:23:27 +0200
+
+quilt (0.44-4) unstable; urgency=low
+
+  * Build-depend on diffstat so that diffstat support gets compiled in
+    (Closes: #361191).
+  * Register quilt documentation with doc-base [Nicolas François]
+    (Closes: #344793).
+  * Ship sample quilt.quiltrc along with the documentation
+    (Closes: #356249).
+
+ -- Martin Quinson <[e-mail]>  Fri,  7 Apr 2006 22:52:23 +0200
+
+quilt (0.44-3) unstable; urgency=low
+
+  * Make sure that quilt returns 2 when there is nothing to do so that 
+    patchsys-quilt.mk works again. Upstream regression since 0.33.
+    (Closes: #358792).
+  * Make sure that quilt fails when trying to push a non existant patch (ie
+    if there is a typo in the serie file) unless -f is provided.
+    (Closes: #358875).
+  * Let /etc/mailname override the hostname in the mail command 
+    (Closes: #356348).
+
+ -- Martin Quinson <[e-mail]>  Wed, 22 Mar 2006 16:14:51 +0100
+
+quilt (0.44-2) unstable; urgency=low
+
+  * Re-upload as non-native package (stupid me).
+
+ -- Martin Quinson <[e-mail]>  Wed, 22 Mar 2006 09:40:41 +0100
+
+quilt (0.44-1) unstable; urgency=low
+
+  * New upstream release (tons of bug fixes, no new major feature).
+    - bin/guards.in: s/ocnfiguration/configuration/
+      (Closes: #341518)
+    - doc/quilt.1.in: Document common options to all commands
+      (Closes: #334408)
+  * Remove spurious ccache suggests (Closes: #354547).
+  * Rewrite the package description (Closes: #347499).
+  * Let the manpage make clearer that literal QUILT_COMMAND_ARGS is
+    not read (Closes: #354997)
+  * Let the manpage give the exact path to the pdf documentation 
+    (Closes: #352324)
+
+ -- Martin Quinson <[e-mail]>  Tue, 21 Mar 2006 21:29:06 +0100
+
+quilt (0.42-2) unstable; urgency=low
+
+  * Add a missing semi-colon in quilt.debbuild.mk (Closes: #343893)
+
+ -- Martin Quinson <[e-mail]>  Fri, 30 Dec 2005 23:43:06 +0100
+
+quilt (0.42-1) unstable; urgency=low
+
+  * New upstream release.	
+    - New commands:
+      annotate: to see which patch modify which line of a file
+      header: to print or change the patch header
+      rename: to rename patches
+    - New options:
+      {diff,refresh} --no-index: suppress Index: lines in patch
+      delete -n: delete the next patch after topmost
+      --version: print the program version
+    - Rework the german translation (Closes: #313827).
+  * [Makefile.in]: in Debian, the docdir is /usr/share/doc/quilt, without
+    the version number. (Closes: #321155)
+  * Use the full path to /usr/sbin/sendmail (Closes: #318924)
+  * Add text and html versions of the pdf documentation (Closes: #320294)
+    Build-dep on hevea and lynx to get it working. Damn, that's huge deps
+	
+ -- Martin Quinson <[e-mail]>  Wed, 29 Jun 2005 18:52:42 +0200
+
+quilt (0.40-6) unstable; urgency=low
+
+  [patchsys-quilt.mk]
+  * Don't call update-config after reverting patches.  (Closes: #299010)
+
+ -- Martin Quinson <[e-mail]>  Wed, 29 Jun 2005 18:52:42 +0200
+
+quilt (0.40-5) unstable; urgency=low
+
+  [Packaging]
+  * Do not automatically generate debian/control.in since it is now
+    forbidden by policy.
+  [quilt.debbuild.mk]
+  * also cleanup arch cruft from debian dirs (patch stolen from cdbs)
+  * Pass the -nd flag to wget when fetching upstream source to avoid
+    by all means creating a dirctory structure.
+
+ -- Martin Quinson <[e-mail]>  Wed, 29 Jun 2005 10:36:57 +0200
+
+quilt (0.40-4) unstable; urgency=low
+
+  * Do depend on patchutils only when using cdbs
+    (dependency moved from control.in to patchsys-quilt.mk)
+  * quilt.debuild.mk: Also cleanup svn stuff from debian dirs
+
+ -- Martin Quinson <[e-mail]>  Sun, 22 May 2005 11:23:27 +0200
+
+quilt (0.40-3) unstable; urgency=low
+
+  * Depend on patchutils (>= 0.2.25) since we use lsdiff -H to fix #295913
+
+ -- Martin Quinson <[e-mail]>  Fri, 13 May 2005 18:43:23 +0200
+
+quilt (0.40-2) unstable; urgency=low
+
+  * Add /usr/share/quilt/quilt.debbuild.mk to ease the build from the cvs 
+    of debian packages using quilt. Read its header for documentation.
+    
+ -- Martin Quinson <[e-mail]>  Thu, 12 May 2005 23:02:13 +0200
+
+quilt (0.40-1) unstable; urgency=low
+
+  * New upstream version
+  * Add /usr/share/quilt/quilt.make for the ones not using CDBS.
+    The "patch" and "unpatch" targets are implemented.
+
+ -- Martin Quinson <[e-mail]>  Wed, 11 May 2005 15:51:51 +0200
+
+quilt (0.39-3) unstable; urgency=low
+
+  * Add a word in the man page about how to display compressed pdf files
+    since this non-bug got reported twice now (Closes: #304848).
+
+ -- Martin Quinson <[e-mail]>  Tue, 26 Apr 2005 16:02:16 +0200
+
+quilt (0.39-2) unstable; urgency=low
+
+  * Pass -p $opt_strip_level option to diffstat in refresh command.
+    (Closes: #298785)
+  * fixes from upstream cvs:
+    - Add a missing "exit 1" to quilt/fold.in when no patches are applied.
+    - typo in graph help message.
+    
+ -- Martin Quinson <[e-mail]>  Wed, 23 Mar 2005 11:10:07 +0100
+
+quilt (0.39-1) unstable; urgency=low
+
+  * New upstream release. 
+    0.38 were mostly bugfixes, and those bugs were also reported against
+      debian package, so I had to steal most of the cvs content already.
+    0.39 is also mainly bugfixes. There is a new "mail" command I didn't
+      test yet. ;)
+      
+  * Refuse to add symlinks into patches since we fail to backup them
+    properly. (Closes: #294424). Will be in 0.40 ;)
+  * Take care of the lost souls patching their config.* files. 
+    Cdbs updates them automatically. Thanks to Robert Millan for detecting
+    the issue (in cdbs) and proposing a fix (in quilt). (Closes: #295913).
+    
+    This implies a versionned depend on cdbs (>=0.4.27-1) for using packages, 
+    since part of the fix is in there. quilt itself suggests this version.
+
+ -- Martin Quinson <[e-mail]>  Thu, 24 Feb 2005 13:51:10 +0100
+
+quilt (0.37-5) unstable; urgency=low
+
+  * Let cdbs track the build-dep automatically.
+  * Make sure people letting cdbs tracking the builddeps for them will get
+    the one on quilt when using the quilt patchsys.
+  Fix upstream bugs:
+  * Strip out the letters from the bash version before [numerical] comparison
+    (Closes: #288839)
+  * Make sure directories are completed with the trailing '/' (for further
+    completion) where quilt expects a file and refuses any directory.
+    (Closes: #281256)
+
+ -- Martin Quinson <[e-mail]>  Thu,  6 Jan 2005 07:51:02 +0100
+
+quilt (0.37-4) unstable; urgency=low
+
+  * Fix the 'patches' command (print the patch names again).
+    (Closes: #286293).
+
+ -- Martin Quinson <[e-mail]>  Thu, 23 Dec 2004 14:48:35 +0100
+
+quilt (0.37-3) unstable; urgency=low
+
+  * Fix extra trailing space in series file after quilt refresh.
+    (Closes: #285865)
+
+ -- Martin Quinson <[e-mail]>  Thu, 16 Dec 2004 21:33:54 +0100
+
+quilt (0.37-2) unstable; urgency=low
+
+  * Fix a quoting issue in bash_autocompletion. Patch from upstream CVS.
+    (Closes: #285322)
+
+ -- Martin Quinson <[e-mail]>  Mon, 13 Dec 2004 14:54:25 +0100
+
+quilt (0.37-1) unstable; urgency=low
+
+  * New upstream release(s. I missed the 0.36, sorry):
+    - "quilt new" now work from a sub-dir (instead of creating a new
+      patches/ dir in the current one).
+    - allow to list all modified files (within patch ranges).
+    - japaneese translation.
+    - touch files after they are restored to not confuse make and friends.
+    - various bug fixes.
+  * Fix a bashism in patchsys-quilt.mk (Closes: #275253)
+  * Useless cleanup in debian/rules (Closes: #268967)
+  * Acknoledge NMU. Thanks Matt! (Closes: #264053)
+  * Use my Debian address as maintainer.
+  * Fix two typos in description. Thanks Matt (Kraii) ! (Closes: #266195)
+
+ -- Martin Quinson <[e-mail]>  Wed,  8 Dec 2004 16:12:21 +0100
+
+quilt (0.35-1.1) unstable; urgency=low
+
+  * NMU at maintainer's request
+  * Add ${shlibs:Depends} to debian/control:Depends (Closes: #264053)
+    
+ -- Matt Zimmerman <[e-mail]>  Fri,  6 Aug 2004 18:41:46 -0700
+ 
+quilt (0.35-1) unstable; urgency=low
+
+  * New upstream version.
+    - bash completion made usable (even out of Debian).
+    - New configuration variables: QUILT_<command>_ARGS amongst others.
+    - Reintroduction of the diffstat feature (--diffstat option of refresh).
+    - Setting QUILT_PATCHES_PREFIX asks quilt to display the full path to
+      the patches instead of the patch names (for copy/paste).
+    - Ability to specify the type of patch, and the context length (-u, -U
+      num, -c, and -C num options of diff and refresh).
+    - Syntax highlighting (--color option of diff).
+    - Various bug fixes.
+
+ -- Martin Quinson <[e-mail]>  Thu, 15 Jul 2004 15:06:43 -0700
+ 
+quilt (0.34-2) unstable; urgency=low
+
+  * [patchsys-quilt.mk] Fix a stupid bug preventing to work on empty
+    patch series
+
+ -- Martin Quinson <[e-mail]>  Fri, 11 Jun 2004 10:45:08 -0700
+
+quilt (0.34-1) unstable; urgency=low
+
+  * New upstream release.
+    - Backward compatibility of .pc directory implemented
+  * Get ride of the now useless big fat warning in NEWS.Debian about that.
+  * Use the manpage generated by the upstream makefile, and remove the
+    one embeeded in the debian dir.
+
+ -- Martin Quinson <[e-mail]>  Thu, 10 Jun 2004 16:35:00 -0700
+    
+quilt (0.33-1) unstable; urgency=low
+
+  * New upstream release.
+    - Return exit status 2 when commands go beyond the series (push when
+      already on top, and so on)
+    - Bunch of bug fixes.
+  * [patchsys-quilt.mk] quilt return 2 when there was nothing to do.
+
+ -- Martin Quinson <[e-mail]>  Tue,  8 Jun 2004 11:54:58 -0700
+
+quilt (0.32-3) unstable; urgency=low
+
+  * push exits 0 when no patch is to be pushed.
+
+ -- Martin Quinson <[e-mail]>  Thu,  3 Jun 2004 08:46:23 -0700
+
+quilt (0.32-2) unstable; urgency=low
+
+  * Use relative link for debian/patches. Closes: #242342
+  * Specify we want to use gawk since mawk causes trouble. Closes: #251972.
+  * Add an entry to NEWS.Debian warning about the breakage in opened tree
+    occuring between 0.30 and 0.32 versions. At least people using
+    apt-listchanges will be warned about that. It looks like the best we can
+    do for now.
+  * pop exits 0 when no patch is to be removed.
+
+ -- Martin Quinson <[e-mail]>  Tue,  1 Jun 2004 11:41:51 -0700
+
+quilt (0.32-1) unstable; urgency=low
+
+  * New upstream release.
+    - It is now possible to use quilt from within sub-directories of the
+      working tree. Quilt will automatically find the root of the tree.
+    - New 'graph' command to display neat graphics of patch dependencies.
+    - 'fork' semantic reverted to previous one: the forked patch is the
+      topmost one, not the next in the series.
+    - documentation update.
+    - man page (provided by your servitor ;)
+  * Fix a typo in output of setup -l. Closes #236933
+  * Rephrase package description. Closes #236221
+
+ -- Martin Quinson <[e-mail]>  Fri, 19 Mar 2004 10:00:03 -0800
+
+quilt (0.30-4) unstable; urgency=low
+
+  * patchsys-quilt.mk: 
+    Various improvements from David Kimdon. Closes: #234449
+    - rm debian/stamp-patch in reverse-patches (instead of clean) so that this
+      target can be called directly.
+    - Make those rules usable along with the cdbs tarball.mk ones.
+    - remove a dupplicated useless line
+
+ -- Martin Quinson <[e-mail]>  Wed, 25 Feb 2004 10:22:39 -0800
+
+quilt (0.30-3) unstable; urgency=low
+
+  * Add a man page from the upstream CVS. Closes: #219318
+
+ -- Martin Quinson <[e-mail]>  Mon, 23 Feb 2004 08:43:08 -0800
+
+quilt (0.30-2) unstable; urgency=low
+ 
+  * [debian/control]
+    - Remove the dependency on bash since it's an essential package.
+    - Upgrade the dependency on debhelper to (>= 4.1.0) as requested by cdbs.
+  * [debian/quilt.install] 
+    - Reput quilt.pdf in the package back, and make sure it won't disapear
+      anymore. 
+ 
+ -- Martin Quinson <[e-mail]>  Mon,  2 Feb 2004 16:45:12 -0800
+
+quilt (0.30-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix the URL of the project (Closes #223387).  
+  * add a dependency on gawk (Closes #227111).
+
+ -- Martin Quinson <[e-mail]>  Fri, 30 Jan 2004 16:10:23 -0800
+
+quilt (0.29-3) unstable; urgency=low
+
+  * force the shell to be bash, since we use tons of bashism
+
+ -- Martin Quinson <[e-mail]>  Mon, 24 Nov 2003 11:24:15 +0100
+
+quilt (0.29-2) unstable; urgency=low
+
+  * Add the patchsys-quilt.mk file achieving the integration of quilt within
+    cdbs.
+  * Install the upstream changelog under the changelog.gz name.
+  * Remove several files left over in the debian/ dir.
+  * Bump standard-version to 3.6.1.0: convert all control files to utf8.
+
+ -- Martin Quinson <[e-mail]>  Mon, 24 Nov 2003 10:24:15 +0100
+
+quilt (0.29-1) unstable; urgency=low
+
+  * New upstream version.
+  * Repackage to use cdbs.
+
+ -- Martin Quinson <[e-mail]>  Thu, 20 Nov 2003 11:04:34 +0100
+
+quilt (0.25-4) unstable; urgency=low
+
+  * Various cleanup in the packaging (like removing a `pwd` in the debian/rules)
+
+ -- Martin Quinson <[e-mail]>  Thu,  6 Nov 2003 16:27:15 +0100
+
+quilt (0.25-3) unstable; urgency=low
+
+  * Do not invoque autoconf during the build process since I do not change this file.
+    That way, autobuilder will be happy even without build-depend (Closes: #217055).
+
+ -- Martin Quinson <[e-mail]>  Fri, 31 Oct 2003 00:18:43 +0100
+
+quilt (0.25-2) unstable; urgency=low
+
+  * Do not install anything under /usr/share/doc/quilt-version/
+    Thanks to Daniel Jacobowitz for reporting that bug.
+
+ -- Martin Quinson <[e-mail]>  Fri, 12 Sep 2003 08:18:29 +0200
+
+quilt (0.25-1) unstable; urgency=low
+
+  * New upstream release.
+  * Set LC_ALL to C during the build so that the README.gz becomes in 
+    english and not french. Thanks to Jan-Benedict Glaw for reporting that 
+    issue.
+
+ -- Martin Quinson <[e-mail]>  Tue,  9 Sep 2003 08:30:52 +0200
+
+quilt (0.24-1) unstable; urgency=low
+
+  * New upstream release
+  * debquilt.mk: Makefile chunk to manage debian packages using quilt
+
+ -- Martin Quinson <[e-mail]>  Thu, 26 Jun 2003 15:26:16 +0200
+
+quilt (0.23-1) unstable; urgency=low
+
+  * New upstream release
+  * Hardcode location of bash
+
+ -- Martin Quinson <[e-mail]>  Wed,  9 Apr 2003 09:54:30 +0200
+
+quilt (0.22-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Quinson <[e-mail]>  Fri, 14 Feb 2003 14:12:31 +0100
+
+quilt (0.21-2) unstable; urgency=low
+
+  * Fight lintian warnings and error: 
+    - Format copyright file properly
+    - Don't depend on essential packages
+    - Change Build-Depends-Indep: to Build-Depends: since the package is
+      now arch-dependent. 
+    - Update to lastest standards
+  * The documentation did move one more time.
+
+ -- Martin Quinson <[e-mail]>  Fri, 31 Jan 2003 09:21:03 +0100
+
+quilt (0.21-1) unstable; urgency=low
+
+  * New upstream release.
+  * Change from architecture: all to architecture: any, since we now have a
+    compiled C programm.
+  * Add the new documentation provided.
+
+ -- Martin Quinson <[e-mail]>  Wed, 29 Jan 2003 10:19:31 +0100
+
+quilt (0.11-1) unstable; urgency=low
+
+  * New upstream release. New upstream author. Developement moved to savannah.
+  * Some functionnalities were removed, but all the scripts are much more robust now. 
+
+ -- Martin Quinson <[e-mail]>  Sat, 18 Jan 2003 23:36:29 +0100
+
+quilt (0.8.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Should now work if installed in /usr/lib or if unpacked in the current
+    directory.
+
+ -- Martin Quinson <[e-mail]>  Wed, 11 Dec 2002 09:31:28 +0100
+
+quilt (0.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Quinson <[e-mail]>  Wed,  6 Nov 2002 22:48:32 +0100
+
+quilt (0.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Quinson <[e-mail]>  Wed,  6 Nov 2002 22:48:32 +0100
+
+quilt (0.4-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Martin Quinson <[e-mail]>  Tue, 29 Oct 2002 09:29:20 +0100
+
+# -*- coding: utf-8 -*-
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/control'
--- debian/control	2010-01-14 22:23:25 +0000
+++ debian/control	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # -*- coding: utf-8 -*-
 
 Source: quilt
@@ -36,3 +37,43 @@
  allowing maintainers to easily add a quilt-based patch management system in
  their packages. The package also provides some basic support for those not
  using those tools. See README.Debian for more information.
+=======
+# -*- coding: utf-8 -*-
+
+Source: quilt
+Section: vcs
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Martin Quinson <[e-mail]>
+Uploaders: Raphaël Hertzog <[e-mail]>, Ryan Niebur <[e-mail]>
+Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends-Indep: gettext, hevea, lynx, diffstat, perl, procmail
+Standards-Version: 3.8.3
+Vcs-git: git://git.debian.org/git/collab-maint/quilt
+Vcs-Browser: http://git.debian.org/?p=collab-maint/quilt.git
+Homepage: http://savannah.nongnu.org/projects/quilt
+
+Package: quilt
+Architecture: all
+Depends: patch, diffstat, bzip2, gettext, ${misc:Depends}
+Suggests: procmail, graphviz
+Enhances: debhelper, cdbs
+Description: Tool to work with series of patches
+ Quilt manages a series of patches by keeping track of the changes
+ each of them makes. They are logically organized as a stack, and you can
+ apply, un-apply, refresh them easily by traveling into the stack (push/pop).
+ .
+ Quilt is good for managing additional patches applied to a package received
+ as a tarball or maintained in another version control system. The stacked
+ organization is proven to be efficient for the management of very large patch
+ sets (more than hundred patches). As matter of fact, it was designed by and
+ for Linux kernel hackers (Andrew Morton, from the -mm  branch, is the
+ original author), and its main use by the current upstream maintainer is to
+ manage the (hundreds of) patches against the kernel made for the SUSE
+ distribution. 
+ .
+ This package provides seamless integration into Debhelper or CDBS,
+ allowing maintainers to easily add a quilt-based patch management system in
+ their packages. The package also provides some basic support for those not
+ using those tools. See README.Debian for more information.
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/dh_quilt_patch' (properties changed: +x to -x)
=== modified file 'debian/dh_quilt_unpatch' (properties changed: +x to -x)
=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2010-01-14 22:23:25 +0000
+++ debian/gbp.conf	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 [DEFAULT]
 pristine-tar = True
 debian-tag = %(version)s
@@ -5,3 +6,11 @@
 
 [git-buildpackage]
 sign-tags = True
+=======
+[DEFAULT]
+pristine-tar = True
+debian-tag = %(version)s
+
+[git-buildpackage]
+sign-tags = True
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/patches/arch_all'
--- debian/patches/arch_all	2009-12-11 15:00:38 +0000
+++ debian/patches/arch_all	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
   * Make backup-files a shell script instead of a binary, so we can make
     quilt arch: all [Steve Langasek, thanks so much]
     (Closes: #363659)
@@ -1122,3 +1123,1130 @@
  	then
  		printf $"Failed to copy files to temporary directory\n" >&2
  		return 1
+=======
+  * Make backup-files a shell script instead of a binary, so we can make
+    quilt arch: all [Steve Langasek, thanks so much]
+    (Closes: #363659)
+    
+Upstream status: Submitted 060427
+
+---
+ Makefile.in                   |   26 -
+ bin/quilt.in                  |    4 
+ lib/backup-files.c            |  601 ------------------------------------------
+ quilt/add.in                  |    2 
+ quilt/pop.in                  |    6 
+ quilt/push.in                 |    2 
+ quilt/scripts/backup-files.in |  292 ++++++++++++++++++++
+ quilt/scripts/patchfns.in     |    2 
+ quilt/snapshot.in             |    2 
+ 9 files changed, 307 insertions(+), 630 deletions(-)
+
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,7 +6,6 @@
+ prefix :=	@prefix@
+ exec_prefix :=	@exec_prefix@
+ bindir :=	@bindir@
+-libdir :=	@libdir@
+ datarootdir :=	@datarootdir@
+ datadir :=	@datadir@
+ docdir :=	@docdir@
+@@ -51,11 +50,6 @@
+ LIBS :=		@LIBS@
+ EXEEXT :=	@EXEEXT@
+ 
+-LIBOBJS :=	$(filter $(patsubst lib/%.c,lib/%.o,$(wildcard lib/*.c)), $(patsubst %,lib/%,@LIBOBJS@))
+-ifneq ($(LIBOBJS),)
+-CFLAGS += -Ilib
+-endif
+-
+ COMPAT_SYMLINKS	:= @COMPAT_SYMLINKS@
+ COMPAT_PROGRAMS	:= @COMPAT_PROGRAMS@
+ 
+@@ -83,7 +77,7 @@
+ DIRT +=		$(QUILT_IN:%=quilt/%)
+ 
+ SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
+-		remove-trailing-ws
++		remove-trailing-ws backup-files
+ 
+ SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
+ SCRIPTS :=	$(SCRIPTS_IN)
+@@ -131,16 +125,13 @@
+ # Settings for running the uninstalled version of quilt in the source tree:
+ PATH :=		$(CURDIR)/bin:$(CURDIR)/compat:$(PATH)
+ QUILT_DIR :=	$(CURDIR)/quilt
+-QUILT_LIB :=	$(CURDIR)/lib
+ QUILTRC :=	$(CURDIR)/test/test.quiltrc
+-export QUILT_DIR QUILT_LIB QUILTRC
++export QUILT_DIR QUILTRC
+ 
+ #-----------------------------------------------------------------------
+ 
+ all : configure scripts compat $(DOC:%=doc/%) $(MAN1) mofiles
+ 
+-$(LIB:%=lib/%) :: $(LIBOBJS)
+-
+ ifeq ($(USE_NLS),yes)
+ mofiles : $(LINGUAS:%=po/%.mo)
+ else
+@@ -154,7 +145,7 @@
+ 	$(MSGMERGE) -o $@ $@ $^
+ 
+ scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) 				\
+-	  $(SCRIPTS:%=quilt/scripts/%) $(LIB:%=lib/%)			\
++	  $(SCRIPTS:%=quilt/scripts/%) 					\
+ 	  $(if $(PATCH_WRAPPER),bin/patch-wrapper)
+ 
+ dist : clean $(PACKAGE)-$(VERSION).tar.gz
+@@ -258,8 +249,7 @@
+ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt/scripts/*.in)) :: Makefile
+ % :: %.in
+ 	@echo "$< -> $@" >&2
+-	@$(SED) -e 's:@QUILT_LIB''@:$(libdir)/$(PACKAGE):g'		\
+-		-e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g'		\
++	@$(SED) -e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g'		\
+ 		-e 's:@PERL''@:$(PERL):g'				\
+ 		-e 's:@BASH''@:$(BASH):g'				\
+ 		-e 's:@PATCH''@:$(PATCH):g'				\
+@@ -270,7 +260,7 @@
+ 		$< > $@
+ 	@$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@)
+ 
+-lib/backup-files.o :: Makefile
++#lib/backup-files.o :: Makefile
+ 
+ configure : configure.ac aclocal.m4
+ 	autoconf
+@@ -322,9 +312,6 @@
+ 		   $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
+ endif
+ 	
+-	$(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
+-	$(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
+-
+ 	$(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+ 	$(INSTALL) -m 644 doc/README					\
+ 		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+@@ -361,7 +348,6 @@
+ 
+ uninstall ::
+ 	rm -rf $(BIN:%=$(BUILD_ROOT)$(bindir)/%)			\
+-	       $(BUILD_ROOT)$(libdir)/$(PACKAGE)			\
+ 	       $(BUILD_ROOT)$(datadir)/$(PACKAGE)			\
+ 	       $(patsubst %,$(BUILD_ROOT)$(mandir)/man1/%,		\
+ 		   $(notdir $(MAN1)))					\
+@@ -385,7 +371,7 @@
+ 
+ # Include a run-time generated list of dependencies for each test case
+ test/.depend : Makefile $(TESTS)
+-	@(  printf "%s : bin/quilt quilt/scripts/patchfns $(LIB:%=lib/%) $(COMPAT)\n" $(TESTS); \
++	@(  printf "%s : bin/quilt quilt/scripts/patchfns $(COMPAT)\n" $(TESTS); \
+ 	    $(AWK) 'sub(/.*\$$ *quilt /, "")				\
+ 			{ print FILENAME, ":", "quilt/"$$1}' $(TESTS); \
+ 	    $(AWK) 'sub(/.*\<quilt_command /, "") && ($$1 !~ /[^a-z]/)	\
+Index: b/quilt/add.in
+===================================================================
+--- a/quilt/add.in
++++ b/quilt/add.in
+@@ -121,7 +121,7 @@
+ 		continue
+ 	fi
+ 
+-	if ! $QUILT_LIB/backup-files -b -s -L -B $QUILT_PC/$patch/ $SUBDIR$file
++	if ! $QUILT_DIR/scripts/backup-files -b -s -L -B $QUILT_PC/$patch/ $SUBDIR$file
+ 	then
+ 		printf $"Failed to back up file %s\n" "$SUBDIR$file" >&2
+ 		status=1
+Index: b/quilt/pop.in
+===================================================================
+--- a/quilt/pop.in
++++ b/quilt/pop.in
+@@ -95,7 +95,7 @@
+ 		local prefix=$QUILT_PC/$patch/
+ 		[ ${prefix:0:1} == / ] || prefix=$PWD/$prefix
+ 		if ! ( cd $workdir && \
+-		       $QUILT_LIB/backup-files -B $prefix -rks - )
++		       $QUILT_DIR/scripts/backup-files -B $prefix -r -k -s - )
+ 		then
+ 			printf $"Failed to copy files to temporary directory\n" >&2
+ 			rm -rf $workdir
+@@ -162,7 +162,7 @@
+ 			status=$?
+ 		else
+ 			printf $"Removing patch %s\n" "$(print_patch $patch)"
+-			$QUILT_LIB/backup-files $silent -r -t -B $QUILT_PC/$patch/ -
++			$QUILT_DIR/scripts/backup-files $silent -r -t -B $QUILT_PC/$patch/ -
+ 			status=$?
+ 		fi
+ 		remove_from_db $patch
+@@ -264,7 +264,7 @@
+ 	# of one: This will automatically be the case in the usual
+ 	# situations, but we don't want to risk file corruption in weird
+ 	# corner cases such as files added to a patch but not modified.
+-	$QUILT_LIB/backup-files -L -s -B $QUILT_PC/$patch/ -
++	$QUILT_DIR/scripts/backup-files -L -s -B $QUILT_PC/$patch/ -
+ 	printf $"Now at patch %s\n" "$(print_patch $patch)"
+ fi
+ ### Local Variables:
+Index: b/quilt/push.in
+===================================================================
+--- a/quilt/push.in
++++ b/quilt/push.in
+@@ -135,7 +135,7 @@
+ {
+ 	local patch=$1
+ 
+-	$QUILT_LIB/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ -
++	$QUILT_DIR/scripts/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ -
+ }
+ 
+ cleanup_patch_output() {
+Index: b/quilt/snapshot.in
+===================================================================
+--- a/quilt/snapshot.in
++++ b/quilt/snapshot.in
+@@ -85,7 +85,7 @@
+ 	}
+ 	{ print }
+ ' \
+-| $QUILT_LIB/backup-files -b -s -L -f - -B "$QUILT_PC/$snap_subdir/"
++| $QUILT_DIR/scripts/backup-files -b -s -L -f - -B "$QUILT_PC/$snap_subdir/"
+ 
+ ### Local Variables:
+ ### mode: shell-script
+Index: b/quilt/scripts/backup-files.in
+===================================================================
+--- /dev/null
++++ b/quilt/scripts/backup-files.in
+@@ -0,0 +1,292 @@
++#! @BASH@
++
++set -e
++
++# File: backup-files.sh
++
++# Copyright (C) 2006 Steve Langasek <[e-mail]>
++# portions Copyright (C) 2003, 2004, 2005, 2006 Andreas Gruenbacher
++# <[e-mail]>, SuSE Labs
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; version 2 dated June, 1991.
++
++# This program is distributed in the hope that it will be useful, but 
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
++# General Public License for more details.
++
++# You should have received a copy of the GNU General Public License 
++# along with this program;  if not, write to the Free Software
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
++# MA 02110-1301, USA.
++
++
++# Create backup files of a list of files similar to GNU patch. A path
++# name prefix and suffix for the backup file can be specified with the
++# -B and -z options.
++
++usage () {
++	progname="$1"
++	printf "Usage: %s [-B prefix] [-z suffix] [-f {file|-}] [-s] [-k] [-t] [-L] [-b|-r|-x] {file|-} ...\n"\
++	"\n"\
++	"\tCreate hard linked backup copies of a list of files\n"\
++	"\tread from standard input.\n"\
++	"\n"\
++	"\t-b\tCreate backup\n"\
++	"\t-r\tRestore the backup\n"\
++	"\t-x\tRemove backup files and empty parent directories\n"\
++	"\t-k\tWhen doing a restore, keep the backup files\n"\
++	"\t-B\tPath name prefix for backup files\n"\
++	"\t-z\tPath name suffix for backup files\n"\
++	"\t-s\tSilent operation; only print error messages\n"\
++	"\t-f\tRead the filenames to process from file (- = standard input)\n"\
++	"\t-t\tTouch original files after restore (update their mtimes)\n\n"\
++	"\t-L\tEnsure that when finished, the source file has a link count of 1\n\n", \
++	"$progname"
++}
++
++copy_file() {
++	from="$1"
++	to="$2"
++	cp -dp --remove-destination "$from" "$to"
++}
++
++link_or_copy_file() {
++	from="$1"
++	to="$2"
++	if ! ln "$from" "$to" 2>/dev/null || [ -d "$to" ]; then
++		copy_file "$from" "$to"
++	fi
++}
++
++ensure_nolinks() {
++	filename="$1"
++
++	link_count=$(stat -c '%h' "$filename")
++	if [ -z "$link_count" ] || [ "$link_count" -gt 1 ]; then
++		dirname=$(dirname "$filename")
++		basename=$(basename "$filename")
++		# Temp file name is "path/to/.file.XXXXXX"
++		tmpname=$(mktemp "${dirname}/.${basename}.XXXXXX")
++		cp -dp "$filename" "$tmpname"
++		mv "$tmpname" "$filename"
++	fi
++}
++
++process_file() {
++	file="$1"
++	backup="${OPT_PREFIX}${file}${OPT_SUFFIX}"
++
++	if [ "$OPT_WHAT" == "backup" ]; then
++		if [ -e "$backup" ]; then
++			rm "$backup"
++		else
++			mkdir -p "$(dirname "$backup")"
++		fi
++		if [ ! -e "$file" ]; then
++			$ECHO "New file $file"
++			touch "$backup"
++			chmod 000 "$backup"
++		else
++			$ECHO "Copying $file"
++			if [ -n "$OPT_NOLINKS" -a "$(stat -c '%h' "$file")" = "1" ]; then
++				copy_file "$file" "$backup"
++			else
++				link_or_copy_file "$file" "$backup"
++				if [ -n "$OPT_NOLINKS" ]; then
++					ensure_nolinks "$file"
++				fi
++			fi
++			if [ -n "OPT_TOUCH" ]; then
++				touch "$backup"
++			fi
++		fi
++	elif [ "$OPT_WHAT" == "restore" ]; then
++		mkdir -p "$(dirname "$file")"
++
++		if [ ! -e "$backup" ]; then
++			return 1
++		fi
++		if [ ! -s "$backup" ]; then
++			if [ -e "$file" ]; then
++				rm "$file"
++			fi
++			$ECHO "Removing $file"
++			if [ -z "$OPT_KEEP_BACKUP" ]; then
++				rm "$backup"
++				while [ -d "${backup%/*}" ] && ! [ -L "${backup%/*}" ]
++				do
++					backup="${backup%/*}"
++					rmdir --ignore-fail-on-non-empty "$backup" 2>/dev/null
++					if [ -d "$backup" ]; then
++						break
++					fi
++				done
++			fi
++		else
++			$ECHO "Restoring $file"
++			if [ -e "$file" ]; then
++				rm "$file"
++			fi
++			if [ -n "$OPT_NOLINKS" -a "$(stat -c '%h' "$backup")" != "1" ]; then
++				copy_file "$backup" "$file"
++			else
++                        	link_or_copy_file "$backup" "$file"
++				if [ -n "$OPT_NOLINKS" ]; then
++					ensure_nolinks "$file"
++				fi
++			fi
++
++			if [ -z "$OPT_KEEP_BACKUP" ]; then
++				rm "$backup"
++				while [ -d "${backup%/*}" ] && ! [ -L "${backup%/*}" ]
++				do
++					backup="${backup%/*}"
++					rmdir --ignore-fail-on-non-empty "$backup" 2>/dev/null
++					if [ -d "$backup" ]; then
++						break
++					fi
++				done
++			fi
++			if [ -n "$OPT_TOUCH" ]; then
++				touch "$file"
++			fi
++		fi
++	elif [ "$OPT_WHAT" == "remove" ]; then
++		if [ -e "$backup" ]; then
++			rm "$backup"
++		fi
++		while [ -d "${backup%/*}" ] && ! [ -L "${backup%/*}" ]
++		do
++			backup="${backup%/*}"
++			rmdir --ignore-fail-on-non-empty "$backup" 2>/dev/null
++			if [ -d "$backup" ]; then
++				break
++			fi
++		done
++	elif [ "$OPT_WHAT" == "noop" ]; then
++		if [ -e "$file" ] && [ -n "$OPT_NOLINKS" ]; then
++			ensure_nolinks "$file"
++		fi
++	else
++		return 1
++	fi
++}
++
++walk() {
++	path="$1"
++	if [ ! -f "$path" ]; then
++		return 0
++	fi
++
++	if [ "${path#$OPT_PREFIX}" == "$path" ]
++	then
++		# prefix does not match
++		return 0
++	fi
++	path="${path#$OPT_PREFIX}"
++
++	if [ -n "$OPT_SUFFIX" ] && [ "${path%$OPT_SUFFIX}" == "$path" ]
++	then
++		# suffix does not match
++		return 0
++	fi
++	path="${path%$OPT_SUFFIX}"
++
++	process_file "$path"
++}
++
++
++ECHO=echo
++declare -a FILELIST
++progname="$0"
++while [ $# -gt 0 ]; do
++	case $1 in
++	-b)	OPT_WHAT=backup
++		;;
++	-r)	OPT_WHAT=restore
++		;;
++	-x)	OPT_WHAT=remove
++		;;
++	-B)	OPT_PREFIX=$2
++		shift
++		;;
++	-f)	OPT_FILE=$2
++		shift
++		;;
++	-z)	OPT_SUFFIX=$2
++		shift
++		;;
++	-s)	ECHO=:
++		;;
++	-k)	OPT_KEEP_BACKUP=1
++		;;
++	-L)	OPT_NOLINKS=1
++		;;
++	-t)	OPT_TOUCH=1
++		;;
++	-?*)	usage "$progname"
++		exit 0
++		;;
++	*)	FILELIST=($@)
++		break
++		;;
++	esac
++
++        shift
++done
++
++if [ -z "${OPT_PREFIX}${OPT_SUFFIX}" ]; then
++	usage "$progname"
++	exit 1
++fi
++if [ ${#FILELIST[@]} == 0 ] && [ -z "$OPT_FILE" ]; then
++	usage "$progname"
++	exit 1
++fi
++
++if [ -n "$OPT_FILE" ]; then
++	cat "$OPT_FILE" \
++	| while read nextfile; do
++		process_file "$nextfile"
++	done
++fi
++
++I=0
++while [ $I -lt ${#FILELIST[@]} ]; do
++
++	case "${FILELIST[$I]}" in
++	-)
++		path="${OPT_PREFIX%/*}"
++		if ! [ -n "$path" ] && [ -d "$path" ] ; then
++			I=$(($I+1))
++			continue
++		fi
++
++		find "$path" -mindepth 1 \( -type f -o -type d \) -print 2>/dev/null \
++		| while read
++		do
++			if [ -d "$REPLY" ]
++			then
++				if ! [ -r "$REPLY" ] || ! [ -x "$REPLY" ]
++				then
++					echo "$REPLY: Permission denied"
++					exit 1
++				fi
++			else
++				walk "$REPLY"
++			fi
++		done
++		if [ $? != 0 ]; then
++			exit 1
++		fi
++		;;
++	*)
++		process_file "${FILELIST[$I]}"
++		;;
++	esac
++		
++	I=$(($I+1))
++done
+Index: b/bin/quilt.in
+===================================================================
+--- a/bin/quilt.in
++++ b/bin/quilt.in
+@@ -9,8 +9,8 @@
+ export TEXTDOMAIN=quilt
+ export TEXTDOMAINDIR=@LOCALEDIR@
+ 
+-: ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@}
+-export QUILT_DIR QUILT_LIB
++: ${QUILT_DIR=@QUILT_DIR@}
++export QUILT_DIR
+ 
+ if [ -z "$QUILTRC" ]
+ then
+Index: b/lib/backup-files.c
+===================================================================
+--- a/lib/backup-files.c
++++ /dev/null
+@@ -1,601 +0,0 @@
+-/*
+-  File: backup-files.c
+-
+-  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+-  Andreas Gruenbacher <[e-mail]>, SuSE Labs
+-
+-  This program is free software; you can redistribute it and/or
+-  modify it under the terms of the GNU Library General Public
+-  License as published by the Free Software Foundation; either
+-  version 2 of the License, or (at your option) any later version.
+-
+-  This program is distributed in the hope that it will be useful,
+-  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-  Library General Public License for more details.
+-
+-  You should have received a copy of the GNU Library General Public
+-  License along with this library; if not, write to the Free Software
+-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-*/
+-
+-/*
+- * Create backup files of a list of files similar to GNU patch. A path
+- * name prefix and suffix for the backup file can be specified with the
+- * -B and -z options.
+- */
+-
+-#define _GNU_SOURCE 1
+-
+-#ifdef HAVE_CONFIG_H
+-# include "config.h"
+-#endif
+-
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <utime.h>
+-#include <fcntl.h>
+-#include <unistd.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <errno.h>
+-#include <string.h>
+-#include <dirent.h>
+-
+-#if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
+-# define mkstemp(x) creat(mktemp(x), 0600)
+-#endif
+-
+-#ifndef PATH_MAX
+-# define PATH_MAX 4096
+-#endif
+-
+-#ifdef __MINGW32__
+-#define mkdir(x,y) mkdir(x)
+-/* Symlinks are not supported */
+-#define lstat stat
+-static int link(const char *oldpath, const char *newpath)
+-{
+-	errno = ENOSYS;
+-	return -1;
+-}
+-#endif
+-
+-const char *progname;
+-
+-enum { what_noop, what_backup, what_restore, what_remove };
+-
+-const char *opt_prefix="", *opt_suffix="", *opt_file;
+-int opt_silent, opt_what=what_noop;
+-int opt_nolinks, opt_touch;
+-int opt_keep_backup;
+-
+-#define LINE_LENGTH 1024
+-
+-
+-static void
+-usage(void)
+-{
+-	printf("Usage: %s [-B prefix] [-z suffix] [-f {file|-}] [-sktL] [-b|-r|-x] {file|-} ...\n"
+-	       "\n"
+-	       "\tCreate hard linked backup copies of a list of files\n"
+-	       "\tread from standard input.\n"
+-	       "\n"
+-	       "\t-b\tCreate backup\n"
+-	       "\t-r\tRestore the backup\n"
+-	       "\t-x\tRemove backup files and empty parent directories\n"
+-	       "\t-k\tWhen doing a restore, keep the backup files\n"
+-	       "\t-B\tPath name prefix for backup files\n"
+-	       "\t-z\tPath name suffix for backup files\n"
+-	       "\t-s\tSilent operation; only print error messages\n"
+-	       "\t-f\tRead the filenames to process from file (- = standard input)\n"
+-	       "\t-t\tTouch original files after restore (update their mtimes)\n\n"
+-	       "\t-L\tEnsure that when finished, the source file has a link count of 1\n\n",
+-	       progname);
+-}
+-
+-static void *
+-malloc_nofail(size_t size)
+-{
+-	void *p = malloc(size);
+-	if (!p) {
+-		perror(progname);
+-		exit(1);
+-	}
+-	return p;
+-}
+-
+-static void
+-create_parents(const char *filename)
+-{
+-	struct stat st;
+-	int rv = -1;
+-	char *fn = malloc_nofail(strlen(filename) + 1), *f;
+-
+-	strcpy(fn, filename);
+-
+-	f = strrchr(fn, '/');
+-	if (f == NULL)
+-		goto out;
+-	*f = '\0';
+-	if (stat(fn, &st) == 0)
+-		goto out;
+-	*f = '/';
+-
+-	f = strchr(fn, '/');
+-	while (f != NULL) {
+-		*f = '\0';
+-		if (!rv || (rv = stat(fn, &st)) != 0) {
+-			mkdir(fn, 0777);
+-		}
+-		*f = '/';
+-		f = strchr(f+1, '/');
+-	}
+-out:
+-	free(fn);
+-}
+-
+-static void
+-remove_parents(const char *filename)
+-{
+-	char *fn = malloc_nofail(strlen(filename) + 1), *f;
+-
+-	strcpy(fn, filename);
+-
+-	f = strrchr(fn, '/');
+-	if (f == NULL)
+-		goto out;
+-	do {
+-		*f = '\0';
+-		if (rmdir(fn) == -1)
+-			goto out;
+-	} while ((f = strrchr(fn, '/')) != NULL);
+-	rmdir(fn);
+-out:
+-	free(fn);
+-}
+-
+-static int
+-copy_fd(int from_fd, int to_fd)
+-{
+-	char buffer[16384];
+-	char *wbuf;
+-	ssize_t len, l;
+-
+-	for ( ;; ) {
+-		len = read(from_fd, buffer, sizeof(buffer));
+-		if (len == 0)
+-			return 0;
+-		if (len < 0) {
+-			if (errno == EINTR || errno == EAGAIN)
+-				continue;
+-			return 1;
+-		}
+-		for (wbuf = buffer; len != 0; ) {
+-			l = write(to_fd, wbuf, len);
+-			if (l < 0) {
+-				if (errno == EINTR || errno == EAGAIN)
+-					continue;
+-				return 1;
+-			}
+-			wbuf += l;
+-			len -= l;
+-		}
+-	}
+-}
+-
+-static int
+-copy_file(const char *from, const struct stat *st, const char *to)
+-{
+-	int from_fd, to_fd, error = 1;
+-
+-	if ((from_fd = open(from, O_RDONLY)) == -1) {
+-		perror(from);
+-		return 1;
+-	}
+-	unlink(to);  /* make sure we don't inherit this file's mode. */
+-	if ((to_fd = creat(to, st->st_mode)) < 0) {
+-		perror(to);
+-		close(from_fd);
+-		return 1;
+-	}
+-#if defined(HAVE_FCHMOD)
+-	(void) fchmod(to_fd, st->st_mode);
+-#elif defined(HAVE_CHMOD)
+-	(void) chmod(to, st->st_mode);
+-#endif
+-	if (copy_fd(from_fd, to_fd)) {
+-		fprintf(stderr, "%s -> %s: %s\n", from, to, strerror(errno));
+-		unlink(to);
+-		goto out;
+-	}
+-
+-	error = 0;
+-out:
+-	close(from_fd);
+-	close(to_fd);
+-
+-	return error;
+-}
+-
+-static int
+-link_or_copy_file(const char *from, const struct stat *st, const char *to)
+-{
+-	if (link(from, to) == 0)
+-		return 0;
+-	if (errno != EXDEV && errno != EPERM &&
+-	    errno != EMLINK && errno != ENOSYS) {
+-		fprintf(stderr, "Could not link file `%s' to `%s': %s\n",
+-		       from, to, strerror(errno));
+-		return 1;
+-	}
+-	return copy_file(from, st, to);
+-}
+-
+-static int
+-ensure_nolinks(const char *filename)
+-{
+-	struct stat st;
+-
+-	if (stat(filename, &st) != 0) {
+-		perror(filename);
+-		return 1;
+-	}
+-	if (st.st_nlink > 1) {
+-		char *tmpname = malloc(1 + strlen(filename) + 7 + 1), *c;
+-		int from_fd = -1, to_fd = -1;
+-		int error = 1;
+-
+-		if (!tmpname)
+-			goto fail;
+-		from_fd = open(filename, O_RDONLY);
+-		if (from_fd == -1)
+-			goto fail;
+-
+-		/* Temp file name is "path/to/.file.XXXXXX" */
+-		strcpy(tmpname, filename);
+-		strcat(tmpname, ".XXXXXX");
+-		c = strrchr(tmpname, '/');
+-		if (c == NULL)
+-			c = tmpname;
+-		else
+-			c++;
+-		memmove(c + 1, c, strlen(c) + 1);
+-		*c = '.';
+-
+-		to_fd = mkstemp(tmpname);
+-		if (to_fd == -1)
+-			goto fail;
+-		if (copy_fd(from_fd, to_fd))
+-			goto fail;
+-#if defined(HAVE_FCHMOD)
+-		(void) fchmod(to_fd, st.st_mode);
+-#elif defined(HAVE_CHMOD)
+-		(void) chmod(tmpname, st.st_mode);
+-#endif
+-		close(from_fd);
+-		from_fd = -1;
+-		close(to_fd);
+-		to_fd = -1;
+-		if (rename(tmpname, filename))
+-			goto fail;
+-
+-		error = 0;
+-	fail:
+-		if (error)
+-			perror(filename);
+-		if (from_fd != -1)
+-			close(from_fd);
+-		if (to_fd != -1)
+-			close(to_fd);
+-		free(tmpname);
+-		return error;
+-	} else
+-		return 0;
+-}
+-
+-static int
+-process_file(const char *file)
+-{
+-	char *backup = malloc_nofail(
+-		strlen(opt_prefix) + strlen(file) + strlen(opt_suffix) + 1);
+-
+-	sprintf(backup, "%s%s%s", opt_prefix, file, opt_suffix);
+-
+-	if (opt_what == what_backup) {
+-		struct stat st;
+-		int missing_file = (stat(file, &st) == -1 && errno == ENOENT);
+-
+-		unlink(backup);
+-		create_parents(backup);
+-		if (missing_file) {
+-			int fd;
+-
+-			if (!opt_silent)
+-				printf("New file %s\n", file);
+-			/* GNU patch creates new files with mode==0. */
+-			if ((fd = creat(backup, 0)) == -1) {
+-				perror(backup);
+-				goto fail;
+-			}
+-			close(fd);
+-		} else {
+-			if (!opt_silent)
+-				printf("Copying %s\n", file);
+-			if (opt_nolinks && st.st_nlink == 1) {
+-				if (copy_file(file, &st, backup))
+-					goto fail;
+-			} else {
+-				if (link_or_copy_file(file, &st, backup))
+-					goto fail;
+-				if (opt_nolinks && ensure_nolinks(file))
+-					goto fail;
+-			}
+-			if (opt_touch)
+-				(void) utime(backup, NULL);
+-			else {
+-				struct utimbuf ut;
+-				ut.actime = ut.modtime = st.st_mtime;
+-				(void) utime(backup, &ut);
+-			}
+-		}
+-	} else if (opt_what == what_restore) {
+-		struct stat st;
+-
+-		create_parents(file);
+-		if (stat(backup, &st) != 0) {
+-			perror(backup);
+-			goto fail;
+-		}
+-		if (st.st_size == 0) {
+-			if (unlink(file) == 0 || errno == ENOENT) {
+-				if (!opt_silent)
+-					printf("Removing %s\n", file);
+-			} else {
+-				perror(file);
+-				goto fail;
+-			}
+-			if (!opt_keep_backup) {
+-				unlink(backup);
+-				remove_parents(backup);
+-			}
+-		} else {
+-			if (!opt_silent)
+-				printf("Restoring %s\n", file);
+-			unlink(file);
+-			if (opt_nolinks && st.st_nlink != 1) {
+-				if (copy_file(backup, &st, file))
+-					goto fail;
+-			} else {
+-				if (link_or_copy_file(backup, &st, file))
+-					goto fail;
+-				if (opt_nolinks && ensure_nolinks(file))
+-					goto fail;
+-			}
+-			if (!opt_keep_backup) {
+-				unlink(backup);
+-				remove_parents(backup);
+-			}
+-			if (opt_touch)
+-				(void) utime(file, NULL);
+-			else {
+-				struct utimbuf ut;
+-				ut.actime = ut.modtime = st.st_mtime;
+-				(void) utime(file, &ut);
+-			}
+-		}
+-	} else if (opt_what == what_remove) {
+-		unlink(backup);
+-		remove_parents(backup);
+-	} else if (opt_what == what_noop) {
+-		struct stat st;
+-		int missing_file = (stat(file, &st) == -1 && errno == ENOENT);
+-
+-		if (!missing_file && opt_nolinks) {
+-			if (ensure_nolinks(file))
+-				goto fail;
+-		}
+-	} else
+-		goto fail;
+-
+-	free(backup);
+-	return 0;
+-
+-fail:
+-	free(backup);
+-	return 1;
+-}
+-
+-static int
+-foreachdir_rec(const char *path, struct stat *st,
+-	       int (*walk)(const char *, const struct stat *))
+-{
+-	DIR *dir;
+-	struct dirent *dp;
+-	int failed = 0;
+-	char *p = malloc_nofail(PATH_MAX);
+-
+-	if (access(path, R_OK|X_OK) || !(dir = opendir(path)))
+-		return walk(path, NULL);
+-	while ((dp = readdir(dir))) {
+-		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
+-			continue;
+-		if (strlen(path) + 1 + strlen(dp->d_name) + 1 > PATH_MAX) {
+-			fprintf(stderr, "%s/%s: name too long\n", path,
+-				dp->d_name);
+-			failed = -1;
+-			goto out;
+-		}
+-		sprintf(p, "%s/%s", path, dp->d_name);
+-		
+-		if (lstat(p, st))
+-			continue;  /* file has disappeared meanwhile */
+-		if (S_ISDIR(st->st_mode)) {
+-			failed = foreachdir_rec(p, st, walk);
+-			if (failed)
+-				goto out;
+-		} else {
+-			failed = walk(p, st);
+-			if (failed)
+-				goto out;
+-		}
+-	}
+-	if (closedir(dir) != 0)
+-		failed = -1;
+-
+-out:
+-	free(p);
+-	return failed;
+-}
+-
+-static int
+-foreachdir(const char *path,
+-	   int (*walk)(const char *, const struct stat *))
+-{
+-	struct stat st;
+-
+-	if (lstat(path, &st))
+-		return walk(path, NULL);
+-	return foreachdir_rec(path, &st, walk);
+-}
+-
+-static int
+-walk(const char *path, const struct stat *st)
+-{
+-	size_t prefix_len=strlen(opt_prefix), suffix_len=strlen(opt_suffix);
+-	size_t len = strlen(path);
+-	char *p;
+-	int ret;
+-
+-	if (!st) {
+-		perror(path);
+-		return 1;
+-	}
+-	if (!S_ISREG(st->st_mode))
+-		return 0;
+-	if (strncmp(opt_prefix, path, prefix_len))
+-		return 0;  /* prefix does not match */
+-	if (len < suffix_len || strcmp(opt_suffix, path + len - suffix_len))
+-		return 0;  /* suffix does not match */
+-
+-	p = malloc_nofail(len - prefix_len - suffix_len + 1);
+-	memcpy(p, path + prefix_len, len - prefix_len - suffix_len);
+-	p[len - prefix_len - suffix_len] = '\0';
+-	ret = process_file(p);
+-	free(p);
+-	return ret;
+-}
+-
+-int
+-main(int argc, char *argv[])
+-{
+-	int opt, status = 0;
+-
+-	progname = argv[0];
+-
+-	while ((opt = getopt(argc, argv, "brkxB:z:f:shLt")) != -1) {
+-		switch(opt) {
+-			case 'b':
+-				opt_what = what_backup;
+-				break;
+-
+-			case 'r':
+-				opt_what = what_restore;
+-				break;
+-
+-			case 'k':
+-				opt_keep_backup = 1;
+-				break;
+-
+-			case 'x':
+-				opt_what = what_remove;
+-				break;
+-
+-			case 'B':
+-				opt_prefix = optarg;
+-				break;
+-
+-			case 'f':
+-				opt_file = optarg;
+-				break;
+-
+-			case 'z':
+-				opt_suffix = optarg;
+-				break;
+-
+-			case 's':
+-				opt_silent = 1;
+-				break;
+-
+-			case 'L':
+-				opt_nolinks = 1;
+-				break;
+-
+-			case 't':
+-				opt_touch = 1;
+-				break;
+-
+-			case 'h':
+-			default:
+-				usage();
+-				return 0;
+-		}
+-	}
+-
+-	if ((*opt_prefix == '\0' && *opt_suffix == '\0') ||
+-	    (opt_file == NULL && optind == argc)) {
+-		usage();
+-		return 1;
+-	}
+-
+-	if (opt_file != NULL) {
+-		FILE *file;
+-		char line[LINE_LENGTH];
+-
+-		if (!strcmp(opt_file, "-")) {
+-			file = stdin;
+-		} else {
+-			if ((file = fopen(opt_file, "r")) == NULL) {
+-				perror(opt_file);
+-				return 1;
+-			}
+-		}
+-
+-		while (fgets(line, sizeof(line), file)) {
+-			char *l = strchr(line, '\0');
+-
+-			if (l > line && *(l-1) == '\n')
+-				*(l-1) = '\0';
+-			if (*line == '\0')
+-				continue;
+-
+-			if ((status = process_file(line)) != 0)
+-				return status;
+-		}
+-
+-		if (file != stdin) {
+-			fclose(file);
+-		}
+-	}
+-	for (; optind < argc; optind++) {
+-		if (strcmp(argv[optind], "-") == 0) {
+-			struct stat st;
+-			char *dir = strdup(opt_prefix), *d = strrchr(dir, '/');
+-			if (d)
+-				*d = '\0';
+-			else
+-				d = ".";
+-			if (stat(dir, &st) == 0) {
+-				status = foreachdir(dir, walk);
+-				if (status == -1)
+-					perror(dir);
+-			}
+-			free(dir);
+-		} else
+-			status = process_file(argv[optind]);
+-		if (status)
+-			return status;
+-	}
+-
+-	return status;
+-}
+Index: b/quilt/scripts/patchfns.in
+===================================================================
+--- a/quilt/scripts/patchfns.in
++++ b/quilt/scripts/patchfns.in
+@@ -884,7 +884,7 @@
+ 	local prefix=$QUILT_PC/$patch/
+ 	[ ${prefix:0:1} == / ] || prefix=$PWD/$prefix
+ 	if ! ( cd $workdir && \
+-	       $QUILT_LIB/backup-files -B $prefix -rks ${@:--} )
++	       $QUILT_DIR/scripts/backup-files -B $prefix -r -k -s ${@:--} )
+ 	then
+ 		printf $"Failed to copy files to temporary directory\n" >&2
+ 		return 1
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-01-14 22:23:25 +0000
+++ debian/patches/series	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 fix-manpage-generation
 arch_all
 debianize
@@ -23,3 +24,26 @@
 use-sensible-editor
 test-suite-update-for-patch-2.6
 check_series_is_no_dir
+=======
+fix-manpage-generation
+arch_all
+debianize
+fail_on_missing
+return2
+mailname
+testsuite_cleanups
+doc_improvement
+makefile_glitche
+test_broken_patches
+po-fix-msguniq
+check_SERIES_exists
+patch-wrapper_do_depend_on_proc
+override_mail_sender_in_testsuite
+mail-signature
+no-signature-test
+mail-from-locale
+create_db_on_snapshot
+unset_posix_strict_conformance_variables
+shell-subcommand
+check_series_is_no_dir
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/patches/test_broken_patches'
--- debian/patches/test_broken_patches	2009-12-11 15:00:38 +0000
+++ debian/patches/test_broken_patches	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ---
  test/file-not-found.test |   30 ++++++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)
@@ -37,3 +38,56 @@
 +
 +$ cd ..
 +$ rm -rf d
+=======
+---
+ test/file-not-found.test |   42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+Index: b/test/file-not-found.test
+===================================================================
+--- /dev/null
++++ b/test/file-not-found.test
+@@ -0,0 +1,42 @@
++# Try to push a patch touching a file which does not exist in this tree
++
++$ rm -rf d
++$ mkdir -p d/patches
++$ cd d
++
++$ mkdir subdir
++$ echo foo > subdir/file.txt
++$ echo bar > subdir/other.txt
++$ diff -u subdir/file.txt subdir/other.txt > patches/patch
++# simulate --no-timestamp
++$ sed 's|subdir/file.txt.*|subdir/file.txt|' patches/patch > patches/patch2
++$ sed 's|subdir/other.txt.*|subdir/other.txt|' patches/patch2 > patches/patch
++$ rm subdir/other.txt patches/patch2
++$ echo patch > patches/series
++
++$ quilt push
++> Applying patch patches/patch
++> can't find file to patch at input line 3
++> Perhaps you used the wrong -p or --strip option?
++> The text leading up to this was:
++> --------------------------
++> |--- subdir/file.txt
++> |+++ subdir/other.txt
++> --------------------------
++> No file to patch.  Skipping patch.
++> 1 out of 1 hunk ignored
++> Patch patches/patch does not apply (enforce with -f)
++
++$ quilt push -qf
++> Applying patch patches/patch
++> The text leading up to this was:
++> --------------------------
++> |--- subdir/file.txt
++> |+++ subdir/other.txt
++> --------------------------
++> No file to patch.  Skipping patch.
++> 1 out of 1 hunk ignored
++> Patch patches/patch appears to be empty; applied
++
++$ cd ..
++$ rm -rf d
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/patchsys-quilt.mk'
--- debian/patchsys-quilt.mk	2009-12-11 15:00:38 +0000
+++ debian/patchsys-quilt.mk	2010-02-12 23:40:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2003 Martin Quinson <[e-mail]>
 # Description: An advanced patch system based on the quilt facilities.
@@ -123,3 +124,129 @@
 	rm -f debian/stamp-patch*
 
 endif
+=======
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Martin Quinson <[e-mail]>
+# Description: An advanced patch system based on the quilt facilities.
+#  please refere to the documentation of the quilt package for more information.
+#
+# Used variables for configuration:
+#  
+
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+_cdbs_rules_patchsys_quilt := 1
+
+ifdef _cdbs_rules_patchsys
+$(error cannot load two patch systems at the same time)
+endif
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+DEB_SRCDIR ?= .
+_cdbs_patch_system_apply_rule := apply-patches
+_cdbs_patch_system_unapply_rule := reverse-patches
+
+# standard targets, as recommended by Debian policy 3.8.0
+.PHONY: patch unpatch
+patch: apply-patches
+unpatch: reverse-patches
+
+# DEB_PATCHDIRS: directory containing your source file for patches.
+#
+# You might find it convenient to add the snippet below to your
+# $HOME/.quiltrc so that you can use quilt without having to reset
+# QUILT_PATCHES when you switch from one project to the other:
+# for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+#        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+#                export QUILT_PATCHES=debian/patches
+#        fi
+# done
+DEB_PATCHDIRS = $(CURDIR)/debian/patches
+
+# DEB_QUILT_TOPDIR: directory where patches will be applied
+# Use it only to override back to "." when CDBS sets DEB_SRCDIR
+# and you don't want the quilt patching to happen in a subdirectory
+DEB_QUILT_TOPDIR ?= $(DEB_SRCDIR)
+
+# Internal variables, do not change it unless you know what you're doing
+DEB_QUILT_CMD = cd $(DEB_QUILT_TOPDIR) && QUILT_PATCHES=$(DEB_PATCHDIRS) quilt --quiltrc /dev/null
+
+# Declare Build-Dep of packages using this file onto quilt
+CDBS_BUILD_DEPENDS      := $(CDBS_BUILD_DEPENDS), quilt
+
+# Build-Dep on patchutils to check for fool souls patching config.* files
+# This is a Bad Thing since cdbs updates those files automatically.
+#  (code stolen from cdbs itself, in dpatch.mk)
+
+CDBS_BUILD_DEPENDS      := $(CDBS_BUILD_DEPENDS), patchutils (>= 0.2.25)
+
+# target reverse-config, which we use, don't exist in old cdbs 
+CDBS_BUILD_DEPENDS      := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.27)
+
+evil_patches_that_do_nasty_things := $(shell \
+if lsdiff=`which lsdiff` ; then \
+  patchlist=`$(DEB_QUILT_CMD) series \
+               | sed 's|^|$(DEB_PATCHDIRS)/|' \
+               | tr "\n" " "`; \
+  if [ "x$$patchlist" != x ] ; then \
+    $$lsdiff -H $$patchlist \
+    | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \
+  fi;\
+fi)
+ifneq (, $(evil_patches_that_do_nasty_things))
+$(warning WARNING:  The following patches are modifying auto-updated files.  This can result in serious trouble:  $(evil_patches_that_do_nasty_things))
+endif
+
+
+post-patches:: apply-patches
+
+clean:: reverse-patches
+
+# The patch subsystem
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched:
+# reverse-config must be first
+	$(MAKE) -f debian/rules reverse-config
+	
+# quilt exits with 2 as return when there was nothing to do. 
+# That's not an error here (but it's usefull to break loops in crude scripts)
+	$(DEB_QUILT_CMD) push -a || test $$? = 2
+	touch debian/stamp-patched
+	
+	$(MAKE) -f debian/rules update-config
+# update-config must be last
+
+reverse-patches:
+# reverse-config must be first
+	$(MAKE) -f debian/rules reverse-config
+	
+	if [ -d "$(DEB_QUILT_TOPDIR)" ]; then \
+	  $(DEB_QUILT_CMD) pop -a -R || test $$? = 2 ; \
+	fi
+	rm -rf $(DEB_QUILT_TOPDIR)/.pc
+	rm -f debian/stamp-patch*
+
+endif
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/rules'
--- debian/rules	2009-10-29 17:56:18 +0000
+++ debian/rules	2010-02-12 23:40:30 +0000
@@ -1,49 +1,155 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-
-# $Id: rules,v 1.15 2005/01/06 19:32:53 mquinson Exp $
-
-# Import Common Debian Build System (CDBS).
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-# Here is a badly nammed changelog file
-DEB_INSTALL_CHANGELOGS_ALL = quilt.changes
-
-# installing under debian/tmp...
-DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C
-DEB_MAKE_CHECK_TARGET = check
-
-# ... and moving it to the right dir using dh_install
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-
-# also specify the full path to sendmail, as requested by policy
-DEB_CONFIGURE_EXTRA_FLAGS := --with-sendmail=/usr/sbin/sendmail
-
-# distribute a text version of the doc
-common-build-indep::
-	mkdir doc/tmp || true
-	cd doc/tmp; LC_ALL=C hevea ../main.tex ; LC_ALL=C hevea ../main.tex; LC_ALL=C hevea ../main.tex
-	perl -pe 'if (/\\sh{.*}/) {s:\\sh{(.*)}:<I>$$1</I>:}'	\
-	     < doc/tmp/main.html > doc/quilt.html
-	LC_ALL=C perl -e '$$/ = undef; $$f=<>; $$f =~ s|<A[^>]*?HREF="[^"]*#[^"]*">(.*?)</A>|$$1|msg; print $$f;' < doc/tmp/main.html > doc/tmp/tmp.html
-	LC_ALL=C lynx doc/tmp/tmp.html -dump > doc/quilt.txt
-	pod2man -c Debhelper debian/dh_quilt_patch debian/dh_quilt_patch.1
-	pod2man -c Debhelper debian/dh_quilt_unpatch debian/dh_quilt_unpatch.1
-
-clean::
-	rm -rf doc/quilt.txt doc/quilt.html doc/tmp test/.pc test/d
-	rm -f compat/awk compat/sendmail
-	rm -f debian/dh_quilt_patch.1 debian/dh_quilt_unpatch.1
-
-# Don't even try to build the package when /proc is not mounted since the
-# checks will fail after a long while. Closes: #380598
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-pre-build::
-	@if ! [ -d /proc/1 ]; then \
-	   echo "quilt needs a mounted /proc to correctly build";\
-	   echo "If you really want to build without /proc, add nocheck to the DEB_BUILD_OPTIONS"; \
-	   exit 1; \
-	fi
-endif
-
+<<<<<<< TREE
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+# $Id: rules,v 1.15 2005/01/06 19:32:53 mquinson Exp $
+
+# Import Common Debian Build System (CDBS).
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+# Here is a badly nammed changelog file
+DEB_INSTALL_CHANGELOGS_ALL = quilt.changes
+
+# installing under debian/tmp...
+DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C
+DEB_MAKE_CHECK_TARGET = check
+
+# ... and moving it to the right dir using dh_install
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
+# also specify the full path to sendmail, as requested by policy
+DEB_CONFIGURE_EXTRA_FLAGS := --with-sendmail=/usr/sbin/sendmail
+
+# distribute a text version of the doc
+common-build-indep::
+	mkdir doc/tmp || true
+	cd doc/tmp; LC_ALL=C hevea ../main.tex ; LC_ALL=C hevea ../main.tex; LC_ALL=C hevea ../main.tex
+	perl -pe 'if (/\\sh{.*}/) {s:\\sh{(.*)}:<I>$$1</I>:}'	\
+	     < doc/tmp/main.html > doc/quilt.html
+	LC_ALL=C perl -e '$$/ = undef; $$f=<>; $$f =~ s|<A[^>]*?HREF="[^"]*#[^"]*">(.*?)</A>|$$1|msg; print $$f;' < doc/tmp/main.html > doc/tmp/tmp.html
+	LC_ALL=C lynx doc/tmp/tmp.html -dump > doc/quilt.txt
+	pod2man -c Debhelper debian/dh_quilt_patch debian/dh_quilt_patch.1
+	pod2man -c Debhelper debian/dh_quilt_unpatch debian/dh_quilt_unpatch.1
+
+clean::
+	rm -rf doc/quilt.txt doc/quilt.html doc/tmp test/.pc test/d
+	rm -f compat/awk compat/sendmail
+	rm -f debian/dh_quilt_patch.1 debian/dh_quilt_unpatch.1
+
+# Don't even try to build the package when /proc is not mounted since the
+# checks will fail after a long while. Closes: #380598
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+pre-build::
+	@if ! [ -d /proc/1 ]; then \
+	   echo "quilt needs a mounted /proc to correctly build";\
+	   echo "If you really want to build without /proc, add nocheck to the DEB_BUILD_OPTIONS"; \
+	   exit 1; \
+	fi
+endif
+
+=======
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+# $Id: rules,v 1.15 2005/01/06 19:32:53 mquinson Exp $
+
+# Import Common Debian Build System (CDBS).
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+# Here is a badly nammed changelog file
+DEB_INSTALL_CHANGELOGS_ALL = quilt.changes
+
+# installing under debian/tmp...
+DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C
+DEB_MAKE_CHECK_TARGET = check
+
+# ... and moving it to the right dir using dh_install
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
+# also specify the full path to sendmail, as requested by policy
+DEB_CONFIGURE_EXTRA_FLAGS := --with-sendmail=/usr/sbin/sendmail
+
+# distribute a text version of the doc
+common-build-indep::
+	mkdir doc/tmp || true
+	cd doc/tmp; LC_ALL=C hevea ../main.tex ; LC_ALL=C hevea ../main.tex; LC_ALL=C hevea ../main.tex
+	perl -pe 'if (/\\sh{.*}/) {s:\\sh{(.*)}:<I>$$1</I>:}'	\
+	     < doc/tmp/main.html > doc/quilt.html
+	LC_ALL=C perl -e '$$/ = undef; $$f=<>; $$f =~ s|<A[^>]*?HREF="[^"]*#[^"]*">(.*?)</A>|$$1|msg; print $$f;' < doc/tmp/main.html > doc/tmp/tmp.html
+	LC_ALL=C lynx doc/tmp/tmp.html -dump > doc/quilt.txt
+	pod2man -c Debhelper debian/dh_quilt_patch debian/dh_quilt_patch.1
+	pod2man -c Debhelper debian/dh_quilt_unpatch debian/dh_quilt_unpatch.1
+
+clean::
+	rm -rf doc/quilt.txt doc/quilt.html doc/tmp test/.pc test/d
+	rm -f compat/awk compat/sendmail
+	rm -f debian/dh_quilt_patch.1 debian/dh_quilt_unpatch.1
+
+# Don't even try to build the package when /proc is not mounted since the
+# checks will fail after a long while. Closes: #380598
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+pre-build::
+	@if ! [ -d /proc/1 ]; then \
+	   echo "quilt needs a mounted /proc to correctly build";\
+	   echo "If you really want to build without /proc, add nocheck to the DEB_BUILD_OPTIONS"; \
+	   exit 1; \
+	fi
+endif
+
+###
+###   Auto-patching stuff. 
+###
+### Some extra love is needed to use ourselves without builddepending on us.
+
+post-patches:: apply-patches
+clean:: reverse-patches
+
+# standard targets as recommended by Debian Policy 3.8.0
+.PHONY: patch unpatch
+patch: apply-patches
+unpatch: reverse-patches
+
+#_cdbs_patch_system_apply_rule := apply-patches
+#_cdbs_patch_system_unapply_rule := reverse-patches
+
+QUILTBIN=/usr/bin/quilt
+QUILTOPT=--quiltrc debian/quiltrc.build
+
+apply-patches: pre-build debian/stamp-patched
+debian/stamp-patched:
+	if [ -e $(QUILTBIN) ] ; then \
+	  $(QUILTBIN) $(QUILTOPT) push -a || test $$? = 2; \
+	else  \
+	  echo "WARNING: quilt not installed. DO NOT MODIFY THE PACKAGE WITHOUT INSTALLING QUILT.";\
+	  echo "building quilt without quilt is good for autobuilders only, not for humans.";\
+	  list=`cat debian/patches/series|sed 's/#.*$$//'|grep -v '^$$'`; \
+	  if [ -n "$$list" ] ; then \
+	    for patch in `echo $$list` ; do \
+	      if [ ! -e debian/patches/.dpkg-source-applied ] || \
+		 ! grep -q "^$$patch$$" debian/patches/.dpkg-source-applied; then \
+	         patch -p1 < debian/patches/$$patch ; \
+	      fi ; \
+	    done ; \
+	  fi ; \
+	fi
+	touch debian/stamp-patched
+
+reverse-patches:
+	if [ -e $(QUILTBIN) ] ; then \
+	  $(QUILTBIN) $(QUILTOPT) pop -a || test $$? = 2; \
+	else if [ -e debian/stamp-patched ] ; then \
+	  echo "WARNING: quilt not installed. DO NOT MODIFY THE PACKAGE WITHOUT INSTALLING QUILT.";\
+	  echo "building quilt without quilt is good for autobuilders only, not for humans.";\
+	  list=`cat debian/patches/series|sed 's/#.*$$//'|grep -v '^$$'|tac`; \
+	  if [ -n "$$list" ] ; then \
+	    for patch in `echo $$list` ; do \
+	      patch -p1 -R < debian/patches/$$patch ; \
+	    done; \
+	  fi;fi; \
+	fi
+	rm -rf .pc
+	rm -f debian/stamp-patch*
+
+>>>>>>> MERGE-SOURCE

=== modified file 'doc/main.tex'
=== modified file 'doc/quilt.1.in'
=== added file 'lib/backup-files.c.OTHER'
--- lib/backup-files.c.OTHER	1970-01-01 00:00:00 +0000
+++ lib/backup-files.c.OTHER	2010-02-12 23:40:30 +0000
@@ -0,0 +1,601 @@
+/*
+  File: backup-files.c
+
+  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+  Andreas Gruenbacher <[e-mail]>, SuSE Labs
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+/*
+ * Create backup files of a list of files similar to GNU patch. A path
+ * name prefix and suffix for the backup file can be specified with the
+ * -B and -z options.
+ */
+
+#define _GNU_SOURCE 1
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <utime.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <dirent.h>
+
+#if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
+# define mkstemp(x) creat(mktemp(x), 0600)
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX 4096
+#endif
+
+#ifdef __MINGW32__
+#define mkdir(x,y) mkdir(x)
+/* Symlinks are not supported */
+#define lstat stat
+static int link(const char *oldpath, const char *newpath)
+{
+	errno = ENOSYS;
+	return -1;
+}
+#endif
+
+const char *progname;
+
+enum { what_noop, what_backup, what_restore, what_remove };
+
+const char *opt_prefix="", *opt_suffix="", *opt_file;
+int opt_silent, opt_what=what_noop;
+int opt_nolinks, opt_touch;
+int opt_keep_backup;
+
+#define LINE_LENGTH 1024
+
+
+static void
+usage(void)
+{
+	printf("Usage: %s [-B prefix] [-z suffix] [-f {file|-}] [-sktL] [-b|-r|-x] {file|-} ...\n"
+	       "\n"
+	       "\tCreate hard linked backup copies of a list of files\n"
+	       "\tread from standard input.\n"
+	       "\n"
+	       "\t-b\tCreate backup\n"
+	       "\t-r\tRestore the backup\n"
+	       "\t-x\tRemove backup files and empty parent directories\n"
+	       "\t-k\tWhen doing a restore, keep the backup files\n"
+	       "\t-B\tPath name prefix for backup files\n"
+	       "\t-z\tPath name suffix for backup files\n"
+	       "\t-s\tSilent operation; only print error messages\n"
+	       "\t-f\tRead the filenames to process from file (- = standard input)\n"
+	       "\t-t\tTouch original files after restore (update their mtimes)\n\n"
+	       "\t-L\tEnsure that when finished, the source file has a link count of 1\n\n",
+	       progname);
+}
+
+static void *
+malloc_nofail(size_t size)
+{
+	void *p = malloc(size);
+	if (!p) {
+		perror(progname);
+		exit(1);
+	}
+	return p;
+}
+
+static void
+create_parents(const char *filename)
+{
+	struct stat st;
+	int rv = -1;
+	char *fn = malloc_nofail(strlen(filename) + 1), *f;
+
+	strcpy(fn, filename);
+
+	f = strrchr(fn, '/');
+	if (f == NULL)
+		goto out;
+	*f = '\0';
+	if (stat(fn, &st) == 0)
+		goto out;
+	*f = '/';
+
+	f = strchr(fn, '/');
+	while (f != NULL) {
+		*f = '\0';
+		if (!rv || (rv = stat(fn, &st)) != 0) {
+			mkdir(fn, 0777);
+		}
+		*f = '/';
+		f = strchr(f+1, '/');
+	}
+out:
+	free(fn);
+}
+
+static void
+remove_parents(const char *filename)
+{
+	char *fn = malloc_nofail(strlen(filename) + 1), *f;
+
+	strcpy(fn, filename);
+
+	f = strrchr(fn, '/');
+	if (f == NULL)
+		goto out;
+	do {
+		*f = '\0';
+		if (rmdir(fn) == -1)
+			goto out;
+	} while ((f = strrchr(fn, '/')) != NULL);
+	rmdir(fn);
+out:
+	free(fn);
+}
+
+static int
+copy_fd(int from_fd, int to_fd)
+{
+	char buffer[16384];
+	char *wbuf;
+	ssize_t len, l;
+
+	for ( ;; ) {
+		len = read(from_fd, buffer, sizeof(buffer));
+		if (len == 0)
+			return 0;
+		if (len < 0) {
+			if (errno == EINTR || errno == EAGAIN)
+				continue;
+			return 1;
+		}
+		for (wbuf = buffer; len != 0; ) {
+			l = write(to_fd, wbuf, len);
+			if (l < 0) {
+				if (errno == EINTR || errno == EAGAIN)
+					continue;
+				return 1;
+			}
+			wbuf += l;
+			len -= l;
+		}
+	}
+}
+
+static int
+copy_file(const char *from, const struct stat *st, const char *to)
+{
+	int from_fd, to_fd, error = 1;
+
+	if ((from_fd = open(from, O_RDONLY)) == -1) {
+		perror(from);
+		return 1;
+	}
+	unlink(to);  /* make sure we don't inherit this file's mode. */
+	if ((to_fd = creat(to, st->st_mode)) < 0) {
+		perror(to);
+		close(from_fd);
+		return 1;
+	}
+#if defined(HAVE_FCHMOD)
+	(void) fchmod(to_fd, st->st_mode);
+#elif defined(HAVE_CHMOD)
+	(void) chmod(to, st->st_mode);
+#endif
+	if (copy_fd(from_fd, to_fd)) {
+		fprintf(stderr, "%s -> %s: %s\n", from, to, strerror(errno));
+		unlink(to);
+		goto out;
+	}
+
+	error = 0;
+out:
+	close(from_fd);
+	close(to_fd);
+
+	return error;
+}
+
+static int
+link_or_copy_file(const char *from, const struct stat *st, const char *to)
+{
+	if (link(from, to) == 0)
+		return 0;
+	if (errno != EXDEV && errno != EPERM &&
+	    errno != EMLINK && errno != ENOSYS) {
+		fprintf(stderr, "Could not link file `%s' to `%s': %s\n",
+		       from, to, strerror(errno));
+		return 1;
+	}
+	return copy_file(from, st, to);
+}
+
+static int
+ensure_nolinks(const char *filename)
+{
+	struct stat st;
+
+	if (stat(filename, &st) != 0) {
+		perror(filename);
+		return 1;
+	}
+	if (st.st_nlink > 1) {
+		char *tmpname = malloc(1 + strlen(filename) + 7 + 1), *c;
+		int from_fd = -1, to_fd = -1;
+		int error = 1;
+
+		if (!tmpname)
+			goto fail;
+		from_fd = open(filename, O_RDONLY);
+		if (from_fd == -1)
+			goto fail;
+
+		/* Temp file name is "path/to/.file.XXXXXX" */
+		strcpy(tmpname, filename);
+		strcat(tmpname, ".XXXXXX");
+		c = strrchr(tmpname, '/');
+		if (c == NULL)
+			c = tmpname;
+		else
+			c++;
+		memmove(c + 1, c, strlen(c) + 1);
+		*c = '.';
+
+		to_fd = mkstemp(tmpname);
+		if (to_fd == -1)
+			goto fail;
+		if (copy_fd(from_fd, to_fd))
+			goto fail;
+#if defined(HAVE_FCHMOD)
+		(void) fchmod(to_fd, st.st_mode);
+#elif defined(HAVE_CHMOD)
+		(void) chmod(tmpname, st.st_mode);
+#endif
+		close(from_fd);
+		from_fd = -1;
+		close(to_fd);
+		to_fd = -1;
+		if (rename(tmpname, filename))
+			goto fail;
+
+		error = 0;
+	fail:
+		if (error)
+			perror(filename);
+		if (from_fd != -1)
+			close(from_fd);
+		if (to_fd != -1)
+			close(to_fd);
+		free(tmpname);
+		return error;
+	} else
+		return 0;
+}
+
+static int
+process_file(const char *file)
+{
+	char *backup = malloc_nofail(
+		strlen(opt_prefix) + strlen(file) + strlen(opt_suffix) + 1);
+
+	sprintf(backup, "%s%s%s", opt_prefix, file, opt_suffix);
+
+	if (opt_what == what_backup) {
+		struct stat st;
+		int missing_file = (stat(file, &st) == -1 && errno == ENOENT);
+
+		unlink(backup);
+		create_parents(backup);
+		if (missing_file) {
+			int fd;
+
+			if (!opt_silent)
+				printf("New file %s\n", file);
+			/* GNU patch creates new files with mode==0. */
+			if ((fd = creat(backup, 0)) == -1) {
+				perror(backup);
+				goto fail;
+			}
+			close(fd);
+		} else {
+			if (!opt_silent)
+				printf("Copying %s\n", file);
+			if (opt_nolinks && st.st_nlink == 1) {
+				if (copy_file(file, &st, backup))
+					goto fail;
+			} else {
+				if (link_or_copy_file(file, &st, backup))
+					goto fail;
+				if (opt_nolinks && ensure_nolinks(file))
+					goto fail;
+			}
+			if (opt_touch)
+				(void) utime(backup, NULL);
+			else {
+				struct utimbuf ut;
+				ut.actime = ut.modtime = st.st_mtime;
+				(void) utime(backup, &ut);
+			}
+		}
+	} else if (opt_what == what_restore) {
+		struct stat st;
+
+		create_parents(file);
+		if (stat(backup, &st) != 0) {
+			perror(backup);
+			goto fail;
+		}
+		if (st.st_size == 0) {
+			if (unlink(file) == 0 || errno == ENOENT) {
+				if (!opt_silent)
+					printf("Removing %s\n", file);
+			} else {
+				perror(file);
+				goto fail;
+			}
+			if (!opt_keep_backup) {
+				unlink(backup);
+				remove_parents(backup);
+			}
+		} else {
+			if (!opt_silent)
+				printf("Restoring %s\n", file);
+			unlink(file);
+			if (opt_nolinks && st.st_nlink != 1) {
+				if (copy_file(backup, &st, file))
+					goto fail;
+			} else {
+				if (link_or_copy_file(backup, &st, file))
+					goto fail;
+				if (opt_nolinks && ensure_nolinks(file))
+					goto fail;
+			}
+			if (!opt_keep_backup) {
+				unlink(backup);
+				remove_parents(backup);
+			}
+			if (opt_touch)
+				(void) utime(file, NULL);
+			else {
+				struct utimbuf ut;
+				ut.actime = ut.modtime = st.st_mtime;
+				(void) utime(file, &ut);
+			}
+		}
+	} else if (opt_what == what_remove) {
+		unlink(backup);
+		remove_parents(backup);
+	} else if (opt_what == what_noop) {
+		struct stat st;
+		int missing_file = (stat(file, &st) == -1 && errno == ENOENT);
+
+		if (!missing_file && opt_nolinks) {
+			if (ensure_nolinks(file))
+				goto fail;
+		}
+	} else
+		goto fail;
+
+	free(backup);
+	return 0;
+
+fail:
+	free(backup);
+	return 1;
+}
+
+static int
+foreachdir_rec(const char *path, struct stat *st,
+	       int (*walk)(const char *, const struct stat *))
+{
+	DIR *dir;
+	struct dirent *dp;
+	int failed = 0;
+	char *p = malloc_nofail(PATH_MAX);
+
+	if (access(path, R_OK|X_OK) || !(dir = opendir(path)))
+		return walk(path, NULL);
+	while ((dp = readdir(dir))) {
+		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
+			continue;
+		if (strlen(path) + 1 + strlen(dp->d_name) + 1 > PATH_MAX) {
+			fprintf(stderr, "%s/%s: name too long\n", path,
+				dp->d_name);
+			failed = -1;
+			goto out;
+		}
+		sprintf(p, "%s/%s", path, dp->d_name);
+		
+		if (lstat(p, st))
+			continue;  /* file has disappeared meanwhile */
+		if (S_ISDIR(st->st_mode)) {
+			failed = foreachdir_rec(p, st, walk);
+			if (failed)
+				goto out;
+		} else {
+			failed = walk(p, st);
+			if (failed)
+				goto out;
+		}
+	}
+	if (closedir(dir) != 0)
+		failed = -1;
+
+out:
+	free(p);
+	return failed;
+}
+
+static int
+foreachdir(const char *path,
+	   int (*walk)(const char *, const struct stat *))
+{
+	struct stat st;
+
+	if (lstat(path, &st))
+		return walk(path, NULL);
+	return foreachdir_rec(path, &st, walk);
+}
+
+static int
+walk(const char *path, const struct stat *st)
+{
+	size_t prefix_len=strlen(opt_prefix), suffix_len=strlen(opt_suffix);
+	size_t len = strlen(path);
+	char *p;
+	int ret;
+
+	if (!st) {
+		perror(path);
+		return 1;
+	}
+	if (!S_ISREG(st->st_mode))
+		return 0;
+	if (strncmp(opt_prefix, path, prefix_len))
+		return 0;  /* prefix does not match */
+	if (len < suffix_len || strcmp(opt_suffix, path + len - suffix_len))
+		return 0;  /* suffix does not match */
+
+	p = malloc_nofail(len - prefix_len - suffix_len + 1);
+	memcpy(p, path + prefix_len, len - prefix_len - suffix_len);
+	p[len - prefix_len - suffix_len] = '\0';
+	ret = process_file(p);
+	free(p);
+	return ret;
+}
+
+int
+main(int argc, char *argv[])
+{
+	int opt, status = 0;
+
+	progname = argv[0];
+
+	while ((opt = getopt(argc, argv, "brkxB:z:f:shLt")) != -1) {
+		switch(opt) {
+			case 'b':
+				opt_what = what_backup;
+				break;
+
+			case 'r':
+				opt_what = what_restore;
+				break;
+
+			case 'k':
+				opt_keep_backup = 1;
+				break;
+
+			case 'x':
+				opt_what = what_remove;
+				break;
+
+			case 'B':
+				opt_prefix = optarg;
+				break;
+
+			case 'f':
+				opt_file = optarg;
+				break;
+
+			case 'z':
+				opt_suffix = optarg;
+				break;
+
+			case 's':
+				opt_silent = 1;
+				break;
+
+			case 'L':
+				opt_nolinks = 1;
+				break;
+
+			case 't':
+				opt_touch = 1;
+				break;
+
+			case 'h':
+			default:
+				usage();
+				return 0;
+		}
+	}
+
+	if ((*opt_prefix == '\0' && *opt_suffix == '\0') ||
+	    (opt_file == NULL && optind == argc)) {
+		usage();
+		return 1;
+	}
+
+	if (opt_file != NULL) {
+		FILE *file;
+		char line[LINE_LENGTH];
+
+		if (!strcmp(opt_file, "-")) {
+			file = stdin;
+		} else {
+			if ((file = fopen(opt_file, "r")) == NULL) {
+				perror(opt_file);
+				return 1;
+			}
+		}
+
+		while (fgets(line, sizeof(line), file)) {
+			char *l = strchr(line, '\0');
+
+			if (l > line && *(l-1) == '\n')
+				*(l-1) = '\0';
+			if (*line == '\0')
+				continue;
+
+			if ((status = process_file(line)) != 0)
+				return status;
+		}
+
+		if (file != stdin) {
+			fclose(file);
+		}
+	}
+	for (; optind < argc; optind++) {
+		if (strcmp(argv[optind], "-") == 0) {
+			struct stat st;
+			char *dir = strdup(opt_prefix), *d = strrchr(dir, '/');
+			if (d)
+				*d = '\0';
+			else
+				d = ".";
+			if (stat(dir, &st) == 0) {
+				status = foreachdir(dir, walk);
+				if (status == -1)
+					perror(dir);
+			}
+			free(dir);
+		} else
+			status = process_file(argv[optind]);
+		if (status)
+			return status;
+	}
+
+	return status;
+}

=== modified file 'quilt/edit.in'
=== modified file 'quilt/import.in'
=== modified file 'quilt/mail.in'
--- quilt/mail.in	2009-12-11 15:00:38 +0000
+++ quilt/mail.in	2010-02-12 23:40:30 +0000
@@ -19,7 +19,11 @@
 
 usage()
 {
+<<<<<<< TREE
 	printf $"Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] [--signature file] [--reply-to message] [first_patch [last_patch]]\n"
+=======
+	printf $"Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] [--reply-to message] [first_patch [last_patch]]\n"
+>>>>>>> MERGE-SOURCE
 	if [ x$1 = x-h ]
 	then
 		printf $"
@@ -135,8 +139,13 @@
 		| ${QUILT_SENDMAIL:-sendmail} \
 			${QUILT_SENDMAIL_ARGS--f "$opt_sender"} "$@"
 	else
+<<<<<<< TREE
 		local from_date=$(LC_ALL=C date "+%a %b %e %H:%M:%S %Y")
 		echo "From $opt_sender_address $from_date"
+=======
+		local from_date=$(date "+%a %b %e %H:%M:%S %Y")
+		echo "From $opt_sender_address $from_date"
+>>>>>>> MERGE-SOURCE
 		sed -e 's/^From />From /' $tmpfile
 		echo
 	fi
@@ -233,6 +242,7 @@
 	usage
 fi
 
+<<<<<<< TREE
 # check if formail is installed before doing anything
 if ! type formail &> /dev/null
 then
@@ -275,6 +285,40 @@
 		hostname=$(hostname -f 2>/dev/null)
 	fi
 	
+=======
+# check if formail is installed before doing anything
+if ! type formail &> /dev/null
+then
+        echo "You have to install 'formail' to use 'quilt mail'" >&2
+        exit 1
+fi
+
+if [ $# -ge 1 ]
+then
+	if [ "$1" = - ]
+	then
+		first_patch="$(find_first_patch)" || exit 1
+	else
+		first_patch="$(find_patch "$1")" || exit 1
+	fi
+
+	if [ $# -ge 2 ]
+	then
+		if [ "$2" = - ]
+		then
+			last_patch="$(find_last_patch)" || exit 1
+		else
+			last_patch="$(find_patch "$2")" || exit 1
+		fi
+	else
+		last_patch=$first_patch
+	fi
+fi
+
+if [ -z "$opt_sender" ]
+then
+	hostname=$(hostname -f 2>/dev/null)
+>>>>>>> MERGE-SOURCE
 	if [ "$hostname" = "${hostname/.}" ]
 	then
 		hostname=$(hostname)
@@ -497,8 +541,13 @@
 
 if [ -z "$opt_message" ]
 then
+<<<<<<< TREE
 	if ! LANG=$ORIGINAL_LANG sensible-editor $introduction
 	then
+=======
+	if ! LANG=$ORIGINAL_LANG $EDITOR $introduction
+	then
+>>>>>>> MERGE-SOURCE
 		rm -f $introduction
 		exit 1
 	fi

=== modified file 'quilt/pop.in'
--- quilt/pop.in	2009-12-11 15:00:38 +0000
+++ quilt/pop.in	2010-02-12 23:40:30 +0000
@@ -92,10 +92,17 @@
 
 	if [ -d $QUILT_PC/$patch ]
 	then
+<<<<<<< TREE
 		local prefix=$QUILT_PC/$patch/
 		[ ${prefix:0:1} == / ] || prefix=$PWD/$prefix
 		if ! ( cd $workdir && \
 		       $QUILT_DIR/scripts/backup-files -B $prefix -r -k -s - )
+=======
+		local prefix=$QUILT_PC/$patch/
+		[ ${prefix:0:1} == / ] || prefix=$PWD/$prefix
+		if ! ( cd $workdir && \
+		       $QUILT_LIB/backup-files -B $prefix -rks - )
+>>>>>>> MERGE-SOURCE
 		then
 			printf $"Failed to copy files to temporary directory\n" >&2
 			rm -rf $workdir

=== modified file 'quilt/push.in'
=== modified file 'quilt/scripts/patchfns.in'
--- quilt/scripts/patchfns.in	2010-01-14 22:23:25 +0000
+++ quilt/scripts/patchfns.in	2010-02-12 23:40:30 +0000
@@ -502,6 +502,18 @@
 	echo "$patch"
 }
 
+find_last_patch()
+{
+	local patch=$(cat_series | tail -n 1)
+	if [ -z "$patch" ]
+	then
+		printf $"No patches in series\n" >&2
+		return 1
+	fi
+
+	echo "$patch"
+}
+
 find_top_patch()
 {
 	if ! top_patch
@@ -875,6 +887,7 @@
 	return 1
 }
 
+<<<<<<< TREE
 apply_patch_temporarily()
 {
 	local workdir=$1 patch=$2 patch_file patch_args
@@ -924,6 +937,57 @@
         echo "${base%-$num}-$((num+1))${patch#$base}"
 }
 
+=======
+apply_patch_temporarily()
+{
+	local workdir=$1 patch=$2 patch_file patch_args
+
+	patch_file=$(patch_file_name "$patch")
+	patch_args=$(patch_args "$patch")
+
+	shift 2
+
+	local prefix=$QUILT_PC/$patch/
+	[ ${prefix:0:1} == / ] || prefix=$PWD/$prefix
+	if ! ( cd $workdir && \
+	       $QUILT_LIB/backup-files -B $prefix -rks ${@:--} )
+	then
+		printf $"Failed to copy files to temporary directory\n" >&2
+		return 1
+	fi
+
+	if [ -s $patch_file ]
+	then
+		if ! cat_file $patch_file \
+		     | patch -d $workdir $QUILT_PATCH_OPTS $patch_args \
+		     	     --no-backup-if-mismatch -Ef \
+			     >/dev/null 2>/dev/null
+		then
+			# Generating a relative diff for a subset of files in
+			# the patch will fail. Also, if a patch was force
+			# applied, we know that it won't apply cleanly. In
+			# all other cases, print a warning.
+
+			if [ ! -e $QUILT_PC/$patch~refresh -a $# -eq 0 ]
+			then
+				printf $"Failed to patch temporary files\n" >&2
+				return 1
+			fi
+		fi
+	fi
+}
+
+next_filename()
+{
+	local patch=$1 base num
+        base=$(echo "$patch" \
+               | sed -r -e 's:(\.gz|\.bz2)$::' -e 's:(\.diff?|\.patch)$::')
+        num=$(echo "$base" | sed -nre 's:.*-([0-9]+)$:\1:'p)
+        [ -n "$num" ] || num=1
+        echo "${base%-$num}-$((num+1))${patch#$base}"
+}
+
+>>>>>>> MERGE-SOURCE
 create_db() {
 	if ! [ -e $QUILT_PC ]
 	then
@@ -1008,6 +1072,7 @@
     unset basedir down
 fi
 
+<<<<<<< TREE
 : ${QUILT_SERIES:=series}
 
 if [ "${QUILT_SERIES:0:1}" = / ]
@@ -1019,6 +1084,19 @@
 elif [ -e $QUILT_SERIES -a ! -d $QUILT_SERIES ]
 then
 	SERIES=$QUILT_SERIES
+=======
+: ${QUILT_SERIES:=series}
+
+if [ "${QUILT_SERIES:0:1}" = / ]
+then
+	SERIES=$QUILT_SERIES
+elif [ -e $QUILT_PC/$QUILT_SERIES ]
+then
+	SERIES=$QUILT_PC/$QUILT_SERIES
+elif [ -e $QUILT_SERIES ]
+then
+	SERIES=$QUILT_SERIES
+>>>>>>> MERGE-SOURCE
 else
 	SERIES=$QUILT_PATCHES/$QUILT_SERIES
 fi

=== modified file 'test/mail.test'
--- test/mail.test	2009-12-11 15:00:38 +0000
+++ test/mail.test	2010-02-12 23:40:30 +0000
@@ -62,6 +62,7 @@
 	< Aw: [patch] Fwd: Re: [patch 5/7] Fw: Subject of 5.diff
 	<
 
+<<<<<<< TREE
 	$ cat - no-subject > patches/6.diff
 	< Subject: Must not expand * ? [abc]
 	<
@@ -78,6 +79,24 @@
 	> Cc: Dummy <[e-mail]>
 	> Subject: [test 2/6] Subject of 2.diff is: split into multiple lines
 	> From a@b.c
+=======
+	$ cat - no-subject > patches/6.diff
+	< Subject: Must not expand * ? [abc]
+	<
+
+	$ ls patches/ > series
+	$ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message"
+	$ sed -nre "s/^(From [^ ]*).*/\\1/p" -e "/^Subject:/p" -e "/^To:/p" -e "/^Cc:/p" -e "/^ /p" -e "/^Replace-.*:/p" -e "/^Recipient-.*:/p" mbox
+	> From a@b.c
+	> Subject: [test 0/6] This is a test
+	> From a@b.c
+	> Cc: Dummy <[e-mail]>
+	> Subject: [test 1/6] Subject of 1.diff
+	> From a@b.c
+	> Cc: Dummy <[e-mail]>
+	> Subject: [test 2/6] Subject of 2.diff is: split into multiple lines
+	> From a@b.c
+>>>>>>> MERGE-SOURCE
 	> To: "John X. Doe" <[e-mail]>
 	> Subject: [test 3/6] Subject of 3.diff
 	> To: John X. Doe <[e-mail]>

=== modified file 'test/run'
=== added file 'test/symlink_pc.test.ignoreme'
--- test/symlink_pc.test.ignoreme	1970-01-01 00:00:00 +0000
+++ test/symlink_pc.test.ignoreme	2010-02-12 23:40:30 +0000
@@ -0,0 +1,183 @@
+This test is very similar to one.test, except that it uses a symlinked .pc
+directory.
+
+	$ rm -rf d pc
+	$ mkdir -p d/patches pc
+	$ cd d
+	$ ln -s ../pc .pc
+	$ mkdir dir
+	$ echo "This is file one." > dir/file1
+	$ quilt new patch1.diff
+	> Patch %{P}patch1.diff is now on top
+
+	$ quilt add dir/file1
+	> File dir/file1 added to patch %{P}patch1.diff
+
+	$ quilt add file2
+	> File file2 added to patch %{P}patch1.diff
+
+	$ quilt diff
+	$ quilt diff -z
+	$ quilt refresh
+	> Nothing in patch %{P}patch1.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ echo "This is file two." > file2
+	$ quilt diff
+	> Index: d/file2
+	> ===================================================================
+	> --- /dev/null
+	> +++ d/file2
+	> @@ -0,0 +1 @@
+	> +This is file two.
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt diff -z
+	> Index: d/file2
+	> ===================================================================
+	> --- /dev/null
+	> +++ d/file2
+	> @@ -0,0 +1 @@
+	> +This is file two.
+
+	$ quilt refresh
+	> Refreshed patch %{P}patch1.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt diff -z
+	$ echo "Another line has been added." >> dir/file1
+	$ quilt diff -z
+	> Index: d/dir/file1
+	> ===================================================================
+	> --- d.orig/dir/file1
+	> +++ d/dir/file1
+	> @@ -1 +1,2 @@
+	>  This is file one.
+	> +Another line has been added.
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt diff -z dir/file1
+	> Index: d/dir/file1
+	> ===================================================================
+	> --- d.orig/dir/file1
+	> +++ d/dir/file1
+	> @@ -1 +1,2 @@
+	>  This is file one.
+	> +Another line has been added.
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt refresh
+	> Refreshed patch %{P}patch1.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt new patch2.diff
+	> Patch %{P}patch2.diff is now on top
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt add dir/file3
+	> File dir/file3 added to patch %{P}patch2.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ echo "This is file three." > dir/file3
+	$ quilt refresh
+	> Refreshed patch %{P}patch2.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt add -P patch1 dir/file3
+	> File dir/file3 modified by patch %{P}patch2.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt pop -R
+	> Removing patch %{P}patch2.diff
+	> Removing dir/file3
+	>
+	> Now at patch %{P}patch1.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt add file4
+	> File file4 added to patch %{P}patch1.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ echo "This is file 4." > file4
+	$ quilt refresh
+	> Refreshed patch %{P}patch1.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt push
+	> Applying patch %{P}patch2.diff
+	>~ patching file `?dir/file3'?
+	>
+	> Now at patch %{P}patch2.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt new subdir/patch3.diff
+	> Patch %{P}subdir/patch3.diff is now on top
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt add file4
+	> File file4 added to patch %{P}subdir/patch3.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ rm file4
+	$ quilt diff
+	> Index: d/file4
+	> ===================================================================
+	> --- d.orig/file4
+	> +++ /dev/null
+	> @@ -1 +0,0 @@
+	> -This is file 4.
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt add -P patch2 file4
+	> File file4 modified by patch %{P}subdir/patch3.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt refresh
+	> Refreshed patch %{P}subdir/patch3.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ echo "Another line here, too." >> dir/file3
+	$ quilt refresh patch2
+	> Refreshed patch %{P}patch2.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ echo "Another line added." >> file2
+	$ quilt diff -z -P patch1
+	> Index: d/file2
+	> ===================================================================
+	> --- d.orig/file2
+	> +++ d/file2
+	> @@ -1 +1,2 @@
+	>  This is file two.
+	> +Another line added.
+	> Warning: more recent patches modify files in patch %{P}patch1.diff
+	
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt refresh patch1
+	> More recent patches modify files in patch %{P}patch1.diff. Enforce refresh with -f.
+	
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt refresh -f patch1
+	> Refreshed patch %{P}patch1.diff
+	
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ echo "Another line here, too." >> dir/file3
+	$ quilt pop -R
+	> Removing patch %{P}subdir/patch3.diff
+	> Restoring file4
+	>
+	> Now at patch %{P}patch2.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt refresh patch2
+	> Refreshed patch %{P}patch2.diff
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ quilt pop -qaR
+	> Removing patch %{P}patch2.diff
+	> Removing patch %{P}patch1.diff
+	> No patches applied
+
+	$ test -L .pc || echo ".pc isn't a symlink anymore"
+	$ cd ..
+#	$ rm -rf d pc

=== modified file 'test/test.quiltrc'