diff -u quilt-0.46/debian/changelog quilt-0.46/debian/changelog --- quilt-0.46/debian/changelog +++ quilt-0.46/debian/changelog @@ -1,3 +1,111 @@ +quilt (0.46-7~hardy1) hardy; urgency=low + + * Backport, no source changes. + + -- Max Bowsher Fri, 28 Aug 2009 10:34:02 +0100 + +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 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 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 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 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 diff -u quilt-0.46/debian/patchsys-quilt.mk quilt-0.46/debian/patchsys-quilt.mk --- quilt-0.46/debian/patchsys-quilt.mk +++ quilt-0.46/debian/patchsys-quilt.mk @@ -1,5 +1,5 @@ # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Martin Quinson +# Copyright © 2003 Martin Quinson # Description: An advanced patch system based on the quilt facilities. # please refere to the documentation of the quilt package for more information. # @@ -38,24 +38,33 @@ 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_PATCHDIR_LINK -# By default, quilt expects to find the patch files into the /patches directory. -# Since it is often more pleasant to place them into /debian/patches, a link -# is created by this makefile chunk to fix it. -# In the case where you already have a /patches directory in your package, -# redefine this variable to somewhere else, and set QUILT_PATCHES in your -# $HOME/.quiltrc (so that quilt knows where to search for this) -DEB_QUILT_PATCHDIR_LINK = 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_SRCDIR) && $(if $(DEB_QUILT_PATCHDIR_LINK),QUILT_PATCHES=$(DEB_QUILT_PATCHDIR_LINK)) quilt --quiltrc /dev/null +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 @@ -67,12 +76,12 @@ 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-1) +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|^|$(if $(DEB_QUILT_PATCHDIR_LINK),$(DEB_QUILT_PATCHDIR_LINK)/)|' \ + | sed 's|^|$(DEB_PATCHDIRS)/|' \ | tr "\n" " "`; \ if [ "x$$patchlist" != x ] ; then \ $$lsdiff -H $$patchlist \ @@ -94,11 +103,6 @@ # reverse-config must be first $(MAKE) -f debian/rules reverse-config - if [ -n "$(DEB_QUILT_PATCHDIR_LINK)" ] ; then \ - if [ -L $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ] ; then : ; else \ - (cd $(DEB_SRCDIR); ln -s $(DEB_PATCHDIRS) $(DEB_QUILT_PATCHDIR_LINK)) ; \ - fi ; \ - fi # 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 @@ -111,15 +115,10 @@ # reverse-config must be first $(MAKE) -f debian/rules reverse-config - if [ -d "$(DEB_SRCDIR)" ] ; then \ + if [ -d "$(DEB_QUILT_TOPDIR)" ]; then \ $(DEB_QUILT_CMD) pop -a -R || test $$? = 2 ; \ - fi - if [ -n "$(DEB_QUILT_PATCHDIR_LINK)" ] ; then \ - if [ -L $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ] ; then \ - rm $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ; \ - fi ; \ fi - rm -rf $(DEB_SRCDIR)/.pc + rm -rf $(DEB_QUILT_TOPDIR)/.pc rm -f debian/stamp-patch* endif diff -u quilt-0.46/debian/copyright quilt-0.46/debian/copyright --- quilt-0.46/debian/copyright +++ quilt-0.46/debian/copyright @@ -14,3 +14,5 @@ + Copyright (C) 2003, 2004, 2005, 2006 Andreas Gruenbacher , SuSE Labs + Copyright (C) 2006 Steve Langasek -These scripts are released under the GPL, available on any Debian box at: -/usr/share/common-licenses/GPL +These scripts are released under the GPL version 2 (or any later version), +available on any Debian box at: /usr/share/common-licenses/GPL-2 diff -u quilt-0.46/debian/control quilt-0.46/debian/control --- quilt-0.46/debian/control +++ quilt-0.46/debian/control @@ -4,14 +4,19 @@ Section: devel Priority: optional Maintainer: Martin Quinson -Uploaders: Martin Quinson , Simon Horman -Build-Depends-Indep: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), gettext, hevea, lynx, awk, diffstat -Standards-Version: 3.6.1.0 +Uploaders: Simon Horman , Raphael Hertzog +Build-Depends: cdbs, debhelper (>= 5) +Build-Depends-Indep: gettext, hevea, lynx, diffstat, perl +Standards-Version: 3.8.1 +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, awk +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 @@ -24,12 +29,9 @@ - for linux kernel hackers (Andrew Morton, from the -mm branch, is the + 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 completely integrates into the CDBS, allowing maintainers - using this new paradigm for their packaging scripts to benefit from the - comfort of quilt when editing their diff against upstream. The package - also provides some basic support for those not using CDBS. - . - http://savannah.nongnu.org/projects/quilt is the current best approximation - of an upstream homepage. + 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. diff -u quilt-0.46/debian/quilt.docs quilt-0.46/debian/quilt.docs --- quilt-0.46/debian/quilt.docs +++ quilt-0.46/debian/quilt.docs @@ -3 +3 @@ - +debian/README.source diff -u quilt-0.46/debian/quilt.make quilt-0.46/debian/quilt.make --- quilt-0.46/debian/quilt.make +++ quilt-0.46/debian/quilt.make @@ -14,7 +14,7 @@ patch: $(QUILT_STAMPFN) $(QUILT_STAMPFN): # 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) + # That's not an error here (but it's useful to break loops in crude scripts) QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2 touch $(QUILT_STAMPFN) diff -u quilt-0.46/debian/compat quilt-0.46/debian/compat --- quilt-0.46/debian/compat +++ quilt-0.46/debian/compat @@ -1 +1 @@ -4 +5 diff -u quilt-0.46/debian/quilt.doc-base quilt-0.46/debian/quilt.doc-base --- quilt-0.46/debian/quilt.doc-base +++ quilt-0.46/debian/quilt.doc-base @@ -1,12 +1,12 @@ Document: quilt Title: Introduction to Quilt -Author: Andreas Grünbacher, SuSE Labs +Author: Andreas Grünbacher, SuSE Labs Abstract: After looking at different strategies for dealing with - software packages that consist of a base software package on top of - which a number of patches are applied, this document introduces the - script collection quilt, which was specifically written to help - deal with multiple patches and common patch management tasks. -Section: Apps/Text + software packages that consist of a base software package on top of + which a number of patches are applied, this document introduces the + script collection quilt, which was specifically written to help + deal with multiple patches and common patch management tasks. +Section: Programming Format: text Files: /usr/share/doc/quilt/quilt.txt.gz diff -u quilt-0.46/debian/rules quilt-0.46/debian/rules --- quilt-0.46/debian/rules +++ quilt-0.46/debian/rules @@ -18,27 +18,23 @@ DEB_DH_INSTALL_SOURCEDIR := debian/tmp # also specify the full path to sendmail, as requested by policy -DEB_CONFIGURE_EXTRA_FLAGS := --with-mta=/usr/sbin/sendmail +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 - cp doc/tmp/main.html doc/quilt.html + perl -pe 'if (/\\sh{.*}/) {s:\\sh{(.*)}:$$1:}' \ + < doc/tmp/main.html > doc/quilt.html LC_ALL=C perl -e '$$/ = undef; $$f=<>; $$f =~ s|]*?HREF="[^"]*#[^"]*">(.*?)|$$1|msg; print $$f;' < doc/tmp/main.html > doc/tmp/tmp.html LC_ALL=C lynx doc/tmp/tmp.html -dump > doc/quilt.txt - -# sendmail is in /usr/sbin, not in user path, so add a link here (See #410890) -common-build-indep:: - mkdir -p debian/tmp/usr/share/quilt/compat/ - ln -sf /usr/sbin/sendmail debian/tmp/usr/share/quilt/compat/sendmail + 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 - -# I fail to see where this comes from, but it lands in the diff if not killed. -clean:: 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 @@ -59,6 +55,11 @@ 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 @@ -75,7 +76,10 @@ list=`cat debian/patches/series|sed 's/#.*$$//'|grep -v '^$$'`; \ if [ -n "$$list" ] ; then \ for patch in `echo $$list` ; do \ - patch -p1 < debian/patches/$$patch ; \ + 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 diff -u quilt-0.46/debian/patches/fail_on_missing quilt-0.46/debian/patches/fail_on_missing --- quilt-0.46/debian/patches/fail_on_missing +++ quilt-0.46/debian/patches/fail_on_missing @@ -9,10 +9,10 @@ test/missing.test | 4 ++++ 2 files changed, 11 insertions(+) -Index: quilt-0.46/quilt/push.in +Index: quilt/quilt/push.in =================================================================== ---- quilt-0.46.orig/quilt/push.in 2007-04-20 13:37:29.000000000 +0200 -+++ quilt-0.46/quilt/push.in 2007-04-20 13:37:32.000000000 +0200 +--- quilt.orig/quilt/push.in ++++ quilt/quilt/push.in @@ -183,6 +183,13 @@ no_reject_files="-r $tmp" fi @@ -27,10 +27,10 @@ apply_patch $patch "$patch_file" status=$? trap "" SIGINT -Index: quilt-0.46/test/missing.test +Index: quilt/test/missing.test =================================================================== ---- quilt-0.46.orig/test/missing.test 2007-04-20 13:33:31.000000000 +0200 -+++ quilt-0.46/test/missing.test 2007-04-20 13:37:32.000000000 +0200 +--- quilt.orig/test/missing.test ++++ quilt/test/missing.test @@ -7,6 +7,10 @@ < missing2.diff diff -u quilt-0.46/debian/patches/create_db_on_snapshot quilt-0.46/debian/patches/create_db_on_snapshot --- quilt-0.46/debian/patches/create_db_on_snapshot +++ quilt-0.46/debian/patches/create_db_on_snapshot @@ -2,10 +2,10 @@ quilt/snapshot.in | 1 + 1 file changed, 1 insertion(+) -Index: quilt-0.46/quilt/snapshot.in +Index: quilt/quilt/snapshot.in =================================================================== ---- quilt-0.46.orig/quilt/snapshot.in 2007-08-05 15:52:25.000000000 +0200 -+++ quilt-0.46/quilt/snapshot.in 2007-08-05 15:52:43.000000000 +0200 +--- quilt.orig/quilt/snapshot.in ++++ quilt/quilt/snapshot.in @@ -74,6 +74,7 @@ fi diff -u quilt-0.46/debian/patches/mail-from-locale quilt-0.46/debian/patches/mail-from-locale --- quilt-0.46/debian/patches/mail-from-locale +++ quilt-0.46/debian/patches/mail-from-locale @@ -28,10 +28,10 @@ quilt/mail.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: quilt-0.46/quilt/mail.in +Index: quilt/quilt/mail.in =================================================================== ---- quilt-0.46.orig/quilt/mail.in 2007-04-20 14:26:05.000000000 +0200 -+++ quilt-0.46/quilt/mail.in 2007-04-20 14:26:08.000000000 +0200 +--- quilt.orig/quilt/mail.in ++++ quilt/quilt/mail.in @@ -89,7 +89,7 @@ --remove-header Bcc "$@" < $tmpfile \ | sendmail ${QUILT_SENDMAIL_ARGS--f "$opt_sender"} "$@" diff -u quilt-0.46/debian/patches/override_mail_sender_in_testsuite quilt-0.46/debian/patches/override_mail_sender_in_testsuite --- quilt-0.46/debian/patches/override_mail_sender_in_testsuite +++ quilt-0.46/debian/patches/override_mail_sender_in_testsuite @@ -2,10 +2,10 @@ test/mail.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: quilt-0.46/test/mail.test +Index: quilt/test/mail.test =================================================================== ---- quilt-0.46.orig/test/mail.test 2007-04-20 13:33:28.000000000 +0200 -+++ quilt-0.46/test/mail.test 2007-04-20 13:38:55.000000000 +0200 +--- quilt.orig/test/mail.test ++++ quilt/test/mail.test @@ -12,7 +12,7 @@ $ cat no-subject > patches/1.diff diff -u quilt-0.46/debian/patches/arch_all quilt-0.46/debian/patches/arch_all --- quilt-0.46/debian/patches/arch_all +++ quilt-0.46/debian/patches/arch_all @@ -5,7 +5,7 @@ Upstream status: Submitted 060427 --- - Makefile.in | 31 -- + Makefile.in | 29 -- bin/quilt.in | 4 lib/backup-files.c | 585 ------------------------------------------ quilt/add.in | 2 @@ -14,12 +14,12 @@ quilt/remove.in | 2 quilt/scripts/backup-files.in | 269 +++++++++++++++++++ quilt/snapshot.in | 2 - 9 files changed, 283 insertions(+), 618 deletions(-) + 9 files changed, 283 insertions(+), 616 deletions(-) -Index: quilt-0.46/Makefile.in +Index: quilt/Makefile.in =================================================================== ---- quilt-0.46.orig/Makefile.in 2007-04-20 13:37:15.000000000 +0200 -+++ quilt-0.46/Makefile.in 2007-04-20 13:37:29.000000000 +0200 +--- quilt.orig/Makefile.in ++++ quilt/Makefile.in @@ -6,7 +6,6 @@ prefix := @prefix@ exec_prefix := @exec_prefix@ @@ -49,19 +49,17 @@ SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) SCRIPTS := $(SCRIPTS_IN) -@@ -93,11 +87,6 @@ +@@ -93,9 +87,6 @@ SRC += $(wildcard compat/*.in) $(wildcard compat/*.sh) DIRT += $(patsubst %.in,%,$(wildcard compat/*.in)) $(COMPAT_SYMLINKS:%=compat/%) -LIB_SRC := backup-files.c -LIB := backup-files$(EXEEXT) -SRC += $(LIB_SRC:%=lib/%) --DIRT += lib/backup-files$(EXEEXT) $(LIB_SRC:%.c=lib/%.o) -- + DIRT += lib/backup-files$(EXEEXT) $(LIB_SRC:%.c=lib/%.o) + DOC_IN := README - DOC_SRC := $(DOC_IN:%=doc/%.in) - DOC := $(DOC_IN) -@@ -127,16 +116,13 @@ +@@ -127,16 +118,13 @@ # Settings for running the uninstalled version of quilt in the source tree: PATH := $(CURDIR)/bin:$(CURDIR)/compat:$(PATH) QUILT_DIR := $(CURDIR)/quilt @@ -79,7 +77,7 @@ ifeq ($(USE_NLS),yes) mofiles : $(LINGUAS:%=po/%.mo) else -@@ -150,7 +136,7 @@ +@@ -150,7 +138,7 @@ $(MSGMERGE) -o $@ $@ $^ scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) \ @@ -88,7 +86,7 @@ $(if $(PATCH_WRAPPER),bin/patch-wrapper) dist : clean $(PACKAGE)-$(VERSION).tar.gz -@@ -249,8 +235,7 @@ +@@ -249,8 +237,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt/scripts/*.in)) :: Makefile % :: %.in @echo "$< -> $@" >&2 @@ -98,7 +96,7 @@ -e 's:@PERL''@:$(PERL):g' \ -e 's:@BASH''@:$(BASH):g' \ -e 's:@PATCH''@:$(PATCH):g' \ -@@ -261,7 +246,7 @@ +@@ -261,7 +248,7 @@ $< > $@ @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) @@ -107,7 +105,7 @@ configure : configure.ac aclocal.m4 autoconf -@@ -313,9 +298,6 @@ +@@ -313,9 +300,6 @@ $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch endif @@ -117,7 +115,7 @@ $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ $(INSTALL) -m 644 doc/README \ $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ -@@ -350,7 +332,6 @@ +@@ -350,7 +334,6 @@ uninstall :: rm -rf $(BIN:%=$(BUILD_ROOT)$(bindir)/%) \ @@ -125,7 +123,7 @@ $(BUILD_ROOT)$(datadir)/$(PACKAGE) \ $(patsubst %,$(BUILD_ROOT)$(mandir)/man1/%, \ $(notdir $(MAN1))) \ -@@ -375,7 +356,7 @@ +@@ -375,7 +358,7 @@ # Include a run-time generated list of dependencies for each test case test/.depend : Makefile $(TESTS) @@ -134,10 +132,10 @@ $(AWK) 'sub(/.*\$$ *quilt /, "") \ { print FILENAME, ":", "quilt/"$$1}' $(TESTS); \ $(AWK) 'sub(/.*\&2 status=1 -Index: quilt-0.46/quilt/pop.in +Index: quilt/quilt/pop.in =================================================================== ---- quilt-0.46.orig/quilt/pop.in 2007-04-20 13:37:15.000000000 +0200 -+++ quilt-0.46/quilt/pop.in 2007-04-20 13:37:29.000000000 +0200 +--- quilt.orig/quilt/pop.in ++++ quilt/quilt/pop.in @@ -168,7 +168,7 @@ status=$? else @@ -169,10 +167,10 @@ printf $"Now at patch %s\n" "$(print_patch $patch)" fi ### Local Variables: -Index: quilt-0.46/quilt/push.in +Index: quilt/quilt/push.in =================================================================== ---- quilt-0.46.orig/quilt/push.in 2007-04-20 13:37:16.000000000 +0200 -+++ quilt-0.46/quilt/push.in 2007-04-20 13:37:29.000000000 +0200 +--- quilt.orig/quilt/push.in ++++ quilt/quilt/push.in @@ -139,7 +139,7 @@ { local patch=$1 @@ -182,10 +180,10 @@ } cleanup_patch_output() { -Index: quilt-0.46/quilt/remove.in +Index: quilt/quilt/remove.in =================================================================== ---- quilt-0.46.orig/quilt/remove.in 2007-04-20 13:37:16.000000000 +0200 -+++ quilt-0.46/quilt/remove.in 2007-04-20 13:37:29.000000000 +0200 +--- quilt.orig/quilt/remove.in ++++ quilt/quilt/remove.in @@ -86,7 +86,7 @@ fi @@ -195,10 +193,10 @@ then printf $"Failed to remove file %s from patch %s\n" \ "$SUBDIR$file" "$(print_patch $patch)" >&2 -Index: quilt-0.46/quilt/snapshot.in +Index: quilt/quilt/snapshot.in =================================================================== ---- quilt-0.46.orig/quilt/snapshot.in 2007-04-20 13:37:16.000000000 +0200 -+++ quilt-0.46/quilt/snapshot.in 2007-04-20 13:37:29.000000000 +0200 +--- quilt.orig/quilt/snapshot.in ++++ quilt/quilt/snapshot.in @@ -85,7 +85,7 @@ } { print } @@ -208,10 +206,10 @@ ### Local Variables: ### mode: shell-script -Index: quilt-0.46/quilt/scripts/backup-files.in +Index: quilt/quilt/scripts/backup-files.in =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ quilt-0.46/quilt/scripts/backup-files.in 2007-04-20 13:37:29.000000000 +0200 +--- /dev/null ++++ quilt/quilt/scripts/backup-files.in @@ -0,0 +1,269 @@ +#! @BASH@ + @@ -264,7 +262,7 @@ +link_or_copy_file() { + from="$1" + to="$2" -+ if ! ln "$from" "$to" || [ -d "$to" ]; then ++ if ! ln "$from" "$to" 2>/dev/null || [ -d "$to" ]; then + cp -dp --remove-destination "$from" "$to" + fi +} @@ -482,10 +480,10 @@ + + I=$(($I+1)) +done -Index: quilt-0.46/bin/quilt.in +Index: quilt/bin/quilt.in =================================================================== ---- quilt-0.46.orig/bin/quilt.in 2007-04-20 13:37:16.000000000 +0200 -+++ quilt-0.46/bin/quilt.in 2007-04-20 13:37:29.000000000 +0200 +--- quilt.orig/bin/quilt.in ++++ quilt/bin/quilt.in @@ -9,8 +9,8 @@ export TEXTDOMAIN=quilt export TEXTDOMAINDIR=@LOCALEDIR@ @@ -497,10 +495,10 @@ if [ -z "$QUILTRC" ] then -Index: quilt-0.46/lib/backup-files.c +Index: quilt/lib/backup-files.c =================================================================== ---- quilt-0.46.orig/lib/backup-files.c 2007-04-20 13:37:16.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- quilt.orig/lib/backup-files.c ++++ /dev/null @@ -1,585 +0,0 @@ -/* - File: backup-files.c diff -u quilt-0.46/debian/patches/return2 quilt-0.46/debian/patches/return2 --- quilt-0.46/debian/patches/return2 +++ quilt-0.46/debian/patches/return2 @@ -9,10 +9,10 @@ quilt/scripts/patchfns.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) -Index: quilt-0.46/quilt/push.in +Index: quilt/quilt/push.in =================================================================== ---- quilt-0.46.orig/quilt/push.in 2007-04-20 13:37:32.000000000 +0200 -+++ quilt-0.46/quilt/push.in 2007-04-20 13:38:32.000000000 +0200 +--- quilt.orig/quilt/push.in ++++ quilt/quilt/push.in @@ -347,7 +347,7 @@ [ -z "$opt_all" ] && number=1 fi @@ -22,10 +22,10 @@ [ -n "$opt_quiet" ] && silent=-s [ -z "$opt_verbose" ] && silent_unless_verbose=-s -Index: quilt-0.46/quilt/scripts/patchfns.in +Index: quilt/quilt/scripts/patchfns.in =================================================================== ---- quilt-0.46.orig/quilt/scripts/patchfns.in 2007-04-20 13:33:30.000000000 +0200 -+++ quilt-0.46/quilt/scripts/patchfns.in 2007-04-20 13:38:32.000000000 +0200 +--- quilt.orig/quilt/scripts/patchfns.in ++++ quilt/quilt/scripts/patchfns.in @@ -459,7 +459,7 @@ if [ -z "$patch" ] then diff -u quilt-0.46/debian/patches/generic-awk quilt-0.46/debian/patches/generic-awk --- quilt-0.46/debian/patches/generic-awk +++ quilt-0.46/debian/patches/generic-awk @@ -14,10 +14,10 @@ quilt/mail.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: quilt-0.46/quilt/mail.in +Index: quilt/quilt/mail.in =================================================================== ---- quilt-0.46.orig/quilt/mail.in 2007-08-05 15:51:45.000000000 +0200 -+++ quilt-0.46/quilt/mail.in 2007-08-05 15:51:45.000000000 +0200 +--- quilt.orig/quilt/mail.in ++++ quilt/quilt/mail.in @@ -223,9 +223,9 @@ if [ ${#mh[@]} -eq 0 ] then diff -u quilt-0.46/debian/patches/series quilt-0.46/debian/patches/series --- quilt-0.46/debian/patches/series +++ quilt-0.46/debian/patches/series @@ -18,0 +19 @@ +unset_posix_strict_conformance_variables diff -u quilt-0.46/debian/patches/debianize quilt-0.46/debian/patches/debianize --- quilt-0.46/debian/patches/debianize +++ quilt-0.46/debian/patches/debianize @@ -7,11 +7,11 @@ doc/quilt.1.in | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) -Index: quilt-0.46/Makefile.in +Index: quilt/Makefile.in =================================================================== ---- quilt-0.46.orig/Makefile.in 2007-04-20 13:37:29.000000000 +0200 -+++ quilt-0.46/Makefile.in 2007-04-20 13:37:31.000000000 +0200 -@@ -242,7 +242,7 @@ +--- quilt.orig/Makefile.in ++++ quilt/Makefile.in +@@ -244,7 +244,7 @@ -e 's:@VERSION''@:$(VERSION):g' \ -e 's:@RELEASE''@:$(RELEASE):g' \ -e 's:@LOCALEDIR''@:$(localedir):g' \ @@ -20,10 +20,10 @@ $< > $@ @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) -Index: quilt-0.46/doc/quilt.1.in +Index: quilt/doc/quilt.1.in =================================================================== ---- quilt-0.46.orig/doc/quilt.1.in 2007-04-20 13:33:31.000000000 +0200 -+++ quilt-0.46/doc/quilt.1.in 2007-04-20 13:37:31.000000000 +0200 +--- quilt.orig/doc/quilt.1.in ++++ quilt/doc/quilt.1.in @@ -212,8 +212,7 @@ .SH SEE ALSO diff -u quilt-0.46/debian/patches/check_SERIES_exists quilt-0.46/debian/patches/check_SERIES_exists --- quilt-0.46/debian/patches/check_SERIES_exists +++ quilt-0.46/debian/patches/check_SERIES_exists @@ -10,10 +10,10 @@ quilt/scripts/patchfns.in | 3 +++ 1 file changed, 3 insertions(+) -Index: quilt-0.46/quilt/scripts/patchfns.in +Index: quilt/quilt/scripts/patchfns.in =================================================================== ---- quilt-0.46.orig/quilt/scripts/patchfns.in 2007-04-20 13:38:32.000000000 +0200 -+++ quilt-0.46/quilt/scripts/patchfns.in 2007-04-20 13:38:52.000000000 +0200 +--- quilt.orig/quilt/scripts/patchfns.in ++++ quilt/quilt/scripts/patchfns.in @@ -327,6 +327,9 @@ sed -e '/^$/d' -e '/^#/d' -e 's/^[ '$'\t'']*//' \ -e 's/[ '$'\t''].*//' $SERIES diff -u quilt-0.46/debian/patches/doc_improvement quilt-0.46/debian/patches/doc_improvement --- quilt-0.46/debian/patches/doc_improvement +++ quilt-0.46/debian/patches/doc_improvement @@ -11,10 +11,10 @@ quilt/import.in | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) -Index: quilt-0.46/doc/quilt.1.in +Index: quilt/doc/quilt.1.in =================================================================== ---- quilt-0.46.orig/doc/quilt.1.in 2007-08-05 15:47:16.000000000 +0200 -+++ quilt-0.46/doc/quilt.1.in 2007-08-05 15:47:16.000000000 +0200 +--- quilt.orig/doc/quilt.1.in ++++ quilt/doc/quilt.1.in @@ -145,8 +145,8 @@ Upon startup, quilt evaluates the file .quiltrc in the user's home @@ -35,10 +35,10 @@ By default, quilt includes timestamps in headers when generating patches. If this variable is set to anything, no timestamp will be included. This -Index: quilt-0.46/bin/guards.in +Index: quilt/bin/guards.in =================================================================== ---- quilt-0.46.orig/bin/guards.in 2007-08-05 15:47:12.000000000 +0200 -+++ quilt-0.46/bin/guards.in 2007-08-05 15:47:16.000000000 +0200 +--- quilt.orig/bin/guards.in ++++ quilt/bin/guards.in @@ -263,7 +263,7 @@ file system. If files are referenced in the specification that do not exist, or if files are not enlisted in the specification file warnings are printed. The @@ -48,10 +48,10 @@ I<--prefix> option specifies the location of the files. =head1 AUTHOR -Index: quilt-0.46/quilt/import.in +Index: quilt/quilt/import.in =================================================================== ---- quilt-0.46.orig/quilt/import.in 2007-08-05 15:47:12.000000000 +0200 -+++ quilt-0.46/quilt/import.in 2007-08-05 15:47:16.000000000 +0200 +--- quilt.orig/quilt/import.in ++++ quilt/quilt/import.in @@ -33,7 +33,7 @@ Patch filename to use inside quilt. This option can only be used when importing a single patch. @@ -61,10 +61,10 @@ -d {o|a|n} When overwriting in existing patch, keep the old (o), all (a), or -Index: quilt-0.46/doc/main.tex +Index: quilt/doc/main.tex =================================================================== ---- quilt-0.46.orig/doc/main.tex 2007-08-05 15:50:56.000000000 +0200 -+++ quilt-0.46/doc/main.tex 2007-08-05 15:51:04.000000000 +0200 +--- quilt.orig/doc/main.tex ++++ quilt/doc/main.tex @@ -576,7 +576,7 @@ approach will often result in false positives, the latter approach may result in false negatives (that is, \quilt{graph} diff -u quilt-0.46/debian/patches/mailname quilt-0.46/debian/patches/mailname --- quilt-0.46/debian/patches/mailname +++ quilt-0.46/debian/patches/mailname @@ -7,10 +7,10 @@ quilt/mail.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -Index: quilt-0.46/quilt/mail.in +Index: quilt/quilt/mail.in =================================================================== ---- quilt-0.46.orig/quilt/mail.in 2007-04-20 13:33:30.000000000 +0200 -+++ quilt-0.46/quilt/mail.in 2007-04-20 13:38:34.000000000 +0200 +--- quilt.orig/quilt/mail.in ++++ quilt/quilt/mail.in @@ -154,7 +154,17 @@ fi diff -u quilt-0.46/debian/patches/makefile_glitche quilt-0.46/debian/patches/makefile_glitche --- quilt-0.46/debian/patches/makefile_glitche +++ quilt-0.46/debian/patches/makefile_glitche @@ -1,25 +1,42 @@ -Fixes a small issue in the generated manpage. +From: Romain Francoise +Closes: #436936 + +Here's a patch for this bug; it's necessary because during the +Debian build process the top-level makefile is debian/rules and make +adds -w to MAKEFLAGS for sub-makes, causing the messages to appear +in the documentation when these targets are run. During a normal +build the makefile is not run by a sub-make so this bug isn't +triggered. Upstream status: not submitted --- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -Index: quilt-0.46/Makefile.in +Index: quilt/Makefile.in =================================================================== ---- quilt-0.46.orig/Makefile.in 2007-04-20 13:38:44.000000000 +0200 -+++ quilt-0.46/Makefile.in 2007-04-20 13:38:47.000000000 +0200 -@@ -182,7 +182,7 @@ +--- quilt.orig/Makefile.in ++++ quilt/Makefile.in +@@ -171,7 +171,7 @@ + @while read line; do \ + case "$$line" in \ + '@REFERENCE''@') \ +- $(MAKE) -s reference \ ++ $(MAKE) -s --no-print-directory reference \ + ;; \ + *) \ + echo $$line \ +@@ -184,7 +184,7 @@ while read line; do \ case "$$line" in \ '@REFERENCE''@') \ - $(MAKE) -s reference | \ -+ $(MAKE) -s reference -s| \ ++ $(MAKE) -s --no-print-directory reference | \ $(SED) -e 's/^quilt \([^ ]*\)\(.*\)/.IP "\\fB\1\\fP\2 " 4/' \ -e $$'s/^ \\(-[^\t]*\\)\t\\?/.IP " \\1" 8\\\n/' \ -e $$'s/^ \t\\?//' \ -@@ -191,7 +191,7 @@ +@@ -193,7 +193,7 @@ echo "$$line" \ ;; \ esac; \ diff -u quilt-0.46/debian/patches/no-signature-test quilt-0.46/debian/patches/no-signature-test --- quilt-0.46/debian/patches/no-signature-test +++ quilt-0.46/debian/patches/no-signature-test @@ -15,10 +15,10 @@ test/mail.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: quilt-0.46/test/mail.test +Index: quilt/test/mail.test =================================================================== ---- quilt-0.46.orig/test/mail.test 2007-04-20 13:38:55.000000000 +0200 -+++ quilt-0.46/test/mail.test 2007-04-20 14:26:07.000000000 +0200 +--- quilt.orig/test/mail.test ++++ quilt/test/mail.test @@ -62,7 +62,7 @@ < Aw: [patch] Fwd: Re: [patch 5/7] Fw: Subject of 5.diff < diff -u quilt-0.46/debian/patches/mail-signature quilt-0.46/debian/patches/mail-signature --- quilt-0.46/debian/patches/mail-signature +++ quilt-0.46/debian/patches/mail-signature @@ -16,10 +16,10 @@ quilt/mail.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) -Index: quilt-0.46/quilt/mail.in +Index: quilt/quilt/mail.in =================================================================== ---- quilt-0.46.orig/quilt/mail.in 2007-04-20 13:38:34.000000000 +0200 -+++ quilt-0.46/quilt/mail.in 2007-04-20 14:26:05.000000000 +0200 +--- quilt.orig/quilt/mail.in ++++ quilt/quilt/mail.in @@ -21,7 +21,7 @@ usage() diff -u quilt-0.46/debian/patches/testsuite_cleanups quilt-0.46/debian/patches/testsuite_cleanups --- quilt-0.46/debian/patches/testsuite_cleanups +++ quilt-0.46/debian/patches/testsuite_cleanups @@ -7,10 +7,10 @@ test/run | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) -Index: quilt-0.46/test/run +Index: quilt/test/run =================================================================== ---- quilt-0.46.orig/test/run 2007-04-20 13:33:30.000000000 +0200 -+++ quilt-0.46/test/run 2007-04-20 13:38:44.000000000 +0200 +--- quilt.orig/test/run ++++ quilt/test/run @@ -35,6 +35,26 @@ my $lineno; my $width = ($ENV{COLUMNS} || 80) >> 1; @@ -38,11 +38,11 @@ for (;;) { my $line = <>; $lineno++; if (defined $line) { -Index: quilt-0.46/Makefile.in +Index: quilt/Makefile.in =================================================================== ---- quilt-0.46.orig/Makefile.in 2007-04-20 13:37:31.000000000 +0200 -+++ quilt-0.46/Makefile.in 2007-04-20 13:38:44.000000000 +0200 -@@ -363,10 +363,6 @@ +--- quilt.orig/Makefile.in ++++ quilt/Makefile.in +@@ -365,10 +365,6 @@ { print FILENAME, ":", "quilt/"$$1 }' quilt/*.in; \ ) | sort -u | $(SED) -re 's:^test/(.*)\.test:test/.\1.ok:' > $@ @@ -53,7 +53,7 @@ # Each tests dependencies are stored in test/.depend ifneq ($(findstring check-,$(MAKECMDGOALS)),) test/.%.ok : test/%.test FORCE -@@ -374,10 +370,7 @@ +@@ -376,10 +372,7 @@ test/.%.ok : test/%.test endif @echo "[$(/ { desc = 0 } -+ /^EDESC/ { desc = 0 } - desc { print } -- /^DESC\>/ { desc = 1 } -+ /^DESC/ { desc = 1 } - ')) - if [ -n "$desc" ] - then only in patch2: unchanged: --- quilt-0.46.orig/debian/quilt.manpages +++ quilt-0.46/debian/quilt.manpages @@ -0,0 +1,2 @@ +debian/dh_quilt_patch.1 +debian/dh_quilt_unpatch.1 only in patch2: unchanged: --- quilt-0.46.orig/debian/README.Debian +++ quilt-0.46/debian/README.Debian @@ -0,0 +1,35 @@ +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) + ... + only in patch2: unchanged: --- quilt-0.46.orig/debian/dh_quilt_patch +++ quilt-0.46/debian/dh_quilt_patch @@ -0,0 +1,58 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_quilt_patch - apply patches listed in debian/patches/series + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B [S>] + +=head1 DESCRIPTION + +dh_quilt_patch simply calls B after having set +the environment variable B to B. +All patches listed in B are then applied in the +current directory. The command does not fail if the patches have +already been applied. + +=head1 EXAMPLES + +dh_quilt_patch is usually called indirectly in a rules file via the +dh command. + + %: + dh --with quilt $@ + +It can also be direcly called at the start of the build (or configure) +rule. + + build: + dh_quilt_patch + ./configure + $(MAKE) + +=cut + +init(); + +$ENV{"QUILT_PATCHES"} = "debian/patches"; +complex_doit('quilt --quiltrc /dev/null push -a || test $? = 2'); + +=head1 SEE ALSO + +L, L. + +This program is meant to be used together with debhelper. + +=head1 AUTHOR + +Raphael Hertzog + +=cut + only in patch2: unchanged: --- quilt-0.46.orig/debian/quilt.pm +++ quilt-0.46/debian/quilt.pm @@ -0,0 +1,9 @@ +#!/usr/bin/perl +use warnings; +use strict; +use Debian::Debhelper::Dh_Lib; + +insert_before("dh_auto_configure", "dh_quilt_patch"); +insert_before("dh_clean", "dh_quilt_unpatch"); + +1; only in patch2: unchanged: --- quilt-0.46.orig/debian/README.source +++ quilt-0.46/debian/README.source @@ -0,0 +1,57 @@ +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 + +where 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 + +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 /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). 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 + +You may need to run quilt pop -a to unapply patches first before running +this command. only in patch2: unchanged: --- quilt-0.46.orig/debian/source.lintian-overrides +++ quilt-0.46/debian/source.lintian-overrides @@ -0,0 +1,2 @@ +# We don't want to build-dep on ourselves +quilt source: quilt-series-but-no-build-dep only in patch2: unchanged: --- quilt-0.46.orig/debian/dh_quilt_unpatch +++ quilt-0.46/debian/dh_quilt_unpatch @@ -0,0 +1,60 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_quilt_unpatch - unapply patches listed in debian/patches/series + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B [S>] + +=head1 DESCRIPTION + +dh_quilt_unpatch simply calls B after having set +the environment variable B to B. +All patches listed in B are then unapplied in the +current directory. The command does not fail if the patches have +already been unapplied. + +=head1 EXAMPLES + +dh_quilt_unpatch is usually called indirectly in a rules file via the +dh command. + + %: + dh --with quilt $@ + +It can also be direcly called in the clean rule. + + clean: + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) clean + dh_quilt_unpatch + dh_clean + +=cut + +init(); + +$ENV{"QUILT_PATCHES"} = "debian/patches"; +complex_doit('quilt --quiltrc /dev/null pop -a || test $? = 2'); +complex_doit('rm -rf .pc'); + +=head1 SEE ALSO + +L, L. + +This program is meant to be used together with debhelper. + +=head1 AUTHOR + +Raphael Hertzog + +=cut + only in patch2: unchanged: --- quilt-0.46.orig/debian/watch +++ quilt-0.46/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://mirrors.linhub.com/savannah/quilt/quilt-([\d\.]+)\.tar\.gz + only in patch2: unchanged: --- quilt-0.46.orig/debian/dpatch2quilt.sh +++ quilt-0.46/debian/dpatch2quilt.sh @@ -0,0 +1,63 @@ +#!/bin/sh + +# to be run from the package top level directory +# parts taken from http://blog.orebokech.com/2007/08/converting-debian-packages-from-dpatch.html +# (c) gregor herrmann, 2007-2008, GPL2+ +# (c) Damyan Ivanov, 2007-2008, GPL2+ + +# (c) Martin Quinson, 2008, GPL2+ +# svn-related lines commented out by Martin Quinson. + +set -e + +export QUILT_PATCHES=debian/patches + +dh_testdir + +[ -f debian/patches/00list ] || exit 1 + +for p in $(dpatch list-all); do + quilt import -P $p.patch debian/patches/$p.dpatch + AUTHOR=$(dpatch cat --author-only $p.dpatch) + DESC=$(dpatch cat --desc-only $p.dpatch) + echo "Author: $AUTHOR" | quilt header -r $p.patch + echo "Description: $DESC" | quilt header -a $p.patch + + + quilt push + quilt refresh --no-timestamps --no-index --strip-trailing-whitespace + # svn add debian/patches/$p.patch +done +quilt pop -a + +COUNT_D=$(ls -1 debian/patches/*.dpatch | wc -l) +COUNT_Q=$(ls -1 debian/patches/*.patch | wc -l) + +# svn add debian/patches/series +# svn rm debian/patches/00list debian/patches/*.dpatch + +sed -i -e 's;/usr/share/dpatch/dpatch\.make;/usr/share/quilt/quilt.make;' debian/rules +sed -i -e 's;DPATCH_STAMPFN;QUILT_STAMPFN;' debian/rules +sed -i -e 's;patch-stamp;$(QUILT_STAMPFN);' debian/rules + +# same as "sed s/dpatch/quilt", but supports multi-line Build-Depends +perl -i -pe ' +if( /^Build-Depends: / ) { + $do_replace = 1; + s/dpatch ?(?:\(.+\))?/quilt (>= 0.40)/; + next; +} +if( /^ / ) { + s/dpatch ?(?:\(.+\))?/quilt (>= 0.40)/ if $do_replace; +} else { + $do_replace = 0; +}' debian/control + +echo +echo "The next commit would remove $COUNT_D dpatch patches and add $COUNT_Q quilt patches." + +if [ "$COUNT_D" != "$COUNT_Q" ] ; then + echo "WARNING: The numbers of removed dpatch patches and added quilt patches differ!" +fi + +exit 0 only in patch2: unchanged: --- quilt-0.46.orig/debian/patches/unset_posix_strict_conformance_variables +++ quilt-0.46/debian/patches/unset_posix_strict_conformance_variables @@ -0,0 +1,32 @@ +From: "brian m. carlson" +Subject: quilt: breaks when POSIXLY_CORRECT=1 +Date: Fri, 25 Jan 2008 20:02:28 +0000 +Closes: #462578 + +quilt breaks when POSIXLY_CORRECT is set to 1, because it invokes +patch, and patch does not work non-interactively in POSIX mode. (I +believe this is the mandated behavior, unfortunate as it is.) If you +want to rely on non-POSIX semantics of patch, you should unset +POSIXLY_CORRECT (and probably _POSIX2_VERSION and POSIXLY_PEDANTIC as +well). + + +--- + bin/quilt.in | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: quilt/bin/quilt.in +=================================================================== +--- quilt.orig/bin/quilt.in 2008-06-06 17:10:43.000000000 +0200 ++++ quilt/bin/quilt.in 2008-06-06 17:11:39.000000000 +0200 +@@ -6,6 +6,10 @@ + # + # See the COPYING and AUTHORS files for more details. + ++# unset posix strict conformance variables since patch cannot be run ++# non-interactively when they are set (doh!). ++unset POSIXLY_CORRECT _POSIX2_VERSION POSIXLY_PEDANTIC ++ + export TEXTDOMAIN=quilt + export TEXTDOMAINDIR=@LOCALEDIR@ +