tags 473381 + patch
tags 478421 + patch
tags 482750 + patch
tags 482948 + patch
thanks
Hi,
I just uploaded an NMU to DELAYED/4-days. It fixes those 4 bugs and
several lintian errors/warnings. I subscribed to the PTS of quilt
and will follow any fallout of my NMU but it should be safe.
Martin, I still haven't got any answer from you concerning the maintenance
of quilt. It would be nice to hear back from you... there's some work to
push our patches upstream and since the new source package format that I
promote is based on quilt, its usage will increase in lenny+1. So it would
be nice to have an actively maintained package.
Attached is the diff for my quilt 0.46-4.1 NMU. Feel free to comment, I
can cancel the NMU at any time (or on the contrary move it to incoming
directly without further waiting).
Cheers,
--
Raphaël Hertzog
Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/
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,32 @@
+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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]>
+# Copyright © 2003 Martin Quinson <[EMAIL PROTECTED]>
# Description: An advanced patch system based on the quilt facilities.
# please refere to the documentation of the quilt package for more information.
#
@@ -43,19 +43,19 @@
_cdbs_patch_system_unapply_rule := 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
-
# 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_SRCDIR) && 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 +67,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 +94,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
@@ -114,11 +109,6 @@
if [ -d "$(DEB_SRCDIR)" ] ; 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 -f debian/stamp-patch*
diff -u quilt-0.46/debian/control quilt-0.46/debian/control
--- quilt-0.46/debian/control
+++ quilt-0.46/debian/control
@@ -5,12 +5,13 @@
Priority: optional
Maintainer: Martin Quinson <[EMAIL PROTECTED]>
Uploaders: Martin Quinson <[EMAIL PROTECTED]>, Simon Horman <[EMAIL PROTECTED]>
-Build-Depends-Indep: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), gettext, hevea, lynx, awk, diffstat
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0)
+Build-Depends-Indep: gettext, hevea, lynx, diffstat
Standards-Version: 3.6.1.0
Package: quilt
Architecture: all
-Depends: patch, diffstat, bzip2, gettext, awk
+Depends: patch, diffstat, bzip2, gettext
Suggests: procmail, graphviz
Description: Tool to work with series of patches
Quilt manages a series of patches by keeping track of the changes
@@ -21,7 +22,7 @@
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
+ 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.
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.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 <[EMAIL PROTECTED]>
+Author: Andreas GrÃŒnbacher, SuSE Labs <[EMAIL PROTECTED]>
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
@@ -75,7 +75,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
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 <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.
