Debian Bug report logs - #473381
cdbs: patchsys-quilt.mk should follow quilt convention

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Raphael Hertzog <hertzog@debian.org>

To: Debian Bug Tracking System <submit@bugs.debian.org>

Subject: cdbs: patchsys-quilt.mk should follow quilt convention

Date: Sun, 30 Mar 2008 11:35:44 +0200

Package: cdbs
Version: 0.4.51
Severity: normal

Since quilt uses the "patches" directory by default, patchsys-quilt.mk
creates a symlink patches -> debian/patches/. This is the wrong way to do
it IMO.

You should have a behaviour similar to the what quilt recommends: see the
/usr/share/quilt/quilt.make file. It calls quilt that way:
QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2

It's better since:
- the user configuration doesn't mess up with the behaviour of the build
  (which in itself warrants an important bug IMO)
- it doesn't create a useless symlink (see how this symlink can create
  problems in some unexpected way when trying to convert a package to
  using a new source package format:
  http://lists.debian.org/debian-dpkg/2008/03/msg00195.html)

Thanks for your work.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.24-1-686 (SMP w/1 CPU core)
Locale: LANG=POSIX, LC_CTYPE=POSIX (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash

Versions of packages cdbs depends on:
ii  debhelper                     6.0.10     helper programs for debian/rules

Versions of packages cdbs recommends:
ii  autotools-dev                 20080123.1 Update infrastructure for config.{

-- no debconf information

Message #10 received at 473381@bugs.debian.org (full text, mbox, reply):

From: Peter Eisentraut <peter_e@gmx.net>

To: Raphael Hertzog <hertzog@debian.org>, 473381@bugs.debian.org

Cc: control@bugs.debian.org

Subject: Re: Bug#473381: cdbs: patchsys-quilt.mk should follow quilt convention

Date: Sun, 30 Mar 2008 17:07:16 +0200

reassign 473381 quilt
stop

Raphael Hertzog wrote:
> Since quilt uses the "patches" directory by default, patchsys-quilt.mk
> creates a symlink patches -> debian/patches/. This is the wrong way to do
> it IMO.
>
> You should have a behaviour similar to the what quilt recommends: see the
> /usr/share/quilt/quilt.make file. It calls quilt that way:
> QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push -a || test
> $$? = 2

patchsys-quilt.mk is part of the quilt package.  The quilt maintainer probably 
knows what quilt recommends. :)

Message #17 received at 473381@bugs.debian.org (full text, mbox, reply):

From: Sune Vuorela <Sune@vuorela.dk>

To: 473381@bugs.debian.org

Subject: cdbs: patchsys-quilt.mk should follow quilt convention

Date: Fri, 2 May 2008 00:43:04 +0200

[Message part 1 (text/plain, inline)]

Hi!

There is also broken behaviour here if there is something called patches in 
the root of the sources.

By setting DEB_QUILT_PATCHDIR_LINK to debian/patches, there is created a 
symbolic link called debian/patches/patches taht isn't cleaned up on clean.

/Sune
-- 
I cannot turn on the file of the connector from MacOS XP, how does it work?

First from the control folder inside Netscape NT you must connect the cable 
and you neither should reset a port, nor need to send the editor and 
therefore from the control drawer menu inside iMac 6.2 you either can never 
cancel a RO IDE e-mail over a LCD prompt, or should never ping a front-end 
for digiting from a pointer to the jumper on the terminale.

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 473381@bugs.debian.org (full text, mbox, reply):

From: Raphael Hertzog <hertzog@debian.org>

To: 473381@bugs.debian.org

Cc: Martin Quinson <mquinson@debian.org>, Simon Horman <horms@debian.org>

Subject: quilt: diff for patchsys-quilt.mk

Date: Thu, 22 May 2008 22:26:09 +0200

[Message part 1 (text/plain, inline)]

tags 473381 + patch
thanks

Hi,

here's a patch for patchsys-quilt.mk so that quilt always uses
debian/patches directly instead of relying on the symlink. I left the
symlink creation code for backwards compatibility but you might want to
drop it too (it's useless IMO).

Also I'm wondering about the current state of this package. There
has been quite a few bugs opened recently and none of them had a response
from the maintainers. What's up? Will you come back to life?

I might be interested to help but I could use an explanation of where we
are. It looks like upstream is calm too... are you using a VCS to
maintain the package?

Please consider integrating this fix as it will help to switch to the new
source package format "3.0 (quilt)" that uses debian/patches directly
without creating this symlink (and thus a 3.0 quilt source package unpacked
where you call "debian/rules reverse-patch" fails because it can't find
"patches"... and is thus unable to unapply them).

Cheers,
-- 
Raphaël Hertzog

Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/

[quilt-0.46-4.1-nmu.diff (text/x-diff, attachment)]

Message #29 received at 473381@bugs.debian.org (full text, mbox, reply):

From: Simon Horman <horms@verge.net.au>

To: Raphael Hertzog <hertzog@debian.org>

Cc: 473381@bugs.debian.org, Martin Quinson <mquinson@debian.org>

Subject: Re: quilt: diff for patchsys-quilt.mk

Date: Fri, 23 May 2008 08:48:07 +1000

On Thu, May 22, 2008 at 10:26:09PM +0200, Raphael Hertzog wrote:
> 
> Also I'm wondering about the current state of this package. There
> has been quite a few bugs opened recently and none of them had a response
> from the maintainers. What's up? Will you come back to life?
> 
> I might be interested to help but I could use an explanation of where we
> are. It looks like upstream is calm too... are you using a VCS to
> maintain the package?
> 
> Please consider integrating this fix as it will help to switch to the new
> source package format "3.0 (quilt)" that uses debian/patches directly
> without creating this symlink (and thus a 3.0 quilt source package unpacked
> where you call "debian/rules reverse-patch" fails because it can't find
> "patches"... and is thus unable to unapply them).

I posted one or two patches to Martin some time last year and
at that time he asked if I would be interested in becoming
a co-maintainer to help him out. Unfortunately since that time
I haven't had any time to work on the package.

I'm happy to withdraw as a co-maintainer. Or alternatively go through
all the pending patches if that helps. Though if they are decent
patches they really ought to go upstream, if they aren't already there.

As for a VCS, Martin may be using one, but I am not aware of it.


-- 
Horms

Message #34 received at 473381@bugs.debian.org (full text, mbox, reply):

From: Simon Horman <horms@verge.net.au>

To: Raphael Hertzog <hertzog@debian.org>

Cc: 473381@bugs.debian.org, Martin Quinson <mquinson@debian.org>

Subject: Re: quilt: diff for patchsys-quilt.mk

Date: Fri, 23 May 2008 08:51:05 +1000

On Fri, May 23, 2008 at 08:48:07AM +1000, Simon Horman wrote:
> On Thu, May 22, 2008 at 10:26:09PM +0200, Raphael Hertzog wrote:
> > 
> > Also I'm wondering about the current state of this package. There
> > has been quite a few bugs opened recently and none of them had a response
> > from the maintainers. What's up? Will you come back to life?
> > 
> > I might be interested to help but I could use an explanation of where we
> > are. It looks like upstream is calm too... are you using a VCS to
> > maintain the package?
> > 
> > Please consider integrating this fix as it will help to switch to the new
> > source package format "3.0 (quilt)" that uses debian/patches directly
> > without creating this symlink (and thus a 3.0 quilt source package unpacked
> > where you call "debian/rules reverse-patch" fails because it can't find
> > "patches"... and is thus unable to unapply them).
> 
> I posted one or two patches to Martin some time last year and
> at that time he asked if I would be interested in becoming
> a co-maintainer to help him out. Unfortunately since that time
> I haven't had any time to work on the package.
> 
> I'm happy to withdraw as a co-maintainer. Or alternatively go through
> all the pending patches if that helps. Though if they are decent
> patches they really ought to go upstream, if they aren't already there.

I forgot to say this, I'm also more than happy for someone else
to look into doing this. But its really Martin's call.

> As for a VCS, Martin may be using one, but I am not aware of it.
> 
> 
> -- 
> Horms

-- 
Horms

Message #39 received at 473381@bugs.debian.org (full text, mbox, reply):

From: Raphael Hertzog <hertzog@debian.org>

To: 473381@bugs.debian.org, 478421@bugs.debian.org, 482750@bugs.debian.org, 482948@bugs.debian.org

Cc: Martin Quinson <mquinson@debian.org>

Subject: quilt: diff for NMU version 0.46-4.1

Date: Wed, 28 May 2008 21:32:11 +0200

[Message part 1 (text/plain, inline)]

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/

[quilt-0.46-4.1-nmu.diff (text/x-diff, attachment)]

Message #46 received at 473381-close@bugs.debian.org (full text, mbox, reply):

From: Raphael Hertzog <hertzog@debian.org>

To: 473381-close@bugs.debian.org

Subject: Bug#473381: fixed in quilt 0.46-4.1

Date: Sat, 31 May 2008 20:47:24 +0000

Source: quilt
Source-Version: 0.46-4.1

We believe that the bug you reported is fixed in the latest version of
quilt, which is due to be installed in the Debian FTP archive:

quilt_0.46-4.1.diff.gz
  to pool/main/q/quilt/quilt_0.46-4.1.diff.gz
quilt_0.46-4.1.dsc
  to pool/main/q/quilt/quilt_0.46-4.1.dsc
quilt_0.46-4.1_all.deb
  to pool/main/q/quilt/quilt_0.46-4.1_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 473381@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Raphael Hertzog <hertzog@debian.org> (supplier of updated quilt package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Wed, 28 May 2008 13:57:30 +0200
Source: quilt
Binary: quilt
Architecture: source all
Version: 0.46-4.1
Distribution: unstable
Urgency: low
Maintainer: Martin Quinson <mquinson@debian.org>
Changed-By: Raphael Hertzog <hertzog@debian.org>
Description: 
 quilt      - Tool to work with series of patches
Closes: 473381 478421 482750 482948
Changes: 
 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.
Checksums-Sha1: 
 e9d4d74ce4a2bd120bdd55ca96b6f3a8d2b0d1a8 1120 quilt_0.46-4.1.dsc
 f8305299b3a70a17bf6934f5517c1e8a24a7242a 36260 quilt_0.46-4.1.diff.gz
 2b059bf2d36e3c90cd96cdbdd098af930854a985 341026 quilt_0.46-4.1_all.deb
Checksums-Sha256: 
 23d44092fa912becc4b8c1cdf409c9a91f0a9131dbcf353818ab591c6c5b9998 1120 quilt_0.46-4.1.dsc
 5f502d95b94bf3832b6892a6447b04caa3b0fd2ad5235e2be9ae00f1349a59a1 36260 quilt_0.46-4.1.diff.gz
 3f42340c5f0216bfdf84afe65710e045fb37205118499000f4a28b629a6a6d3e 341026 quilt_0.46-4.1_all.deb
Files: 
 cb160a862e1b9c44926d24f15ed9f2e5 1120 devel optional quilt_0.46-4.1.dsc
 dc29b5a16b7dadd931e7ed968c26d7fd 36260 devel optional quilt_0.46-4.1.diff.gz
 eae057645822c92342c215ec1a309d9c 341026 devel optional quilt_0.46-4.1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Signed by Raphael Hertzog

iD8DBQFIPa6EvPbGD26BadIRAk5uAKCxtUqtcaeHO85d/b6AHNrH+0IlQgCgs5qQ
A/540o/g4+Tdi8D1syWc05Q=
=eeP6
-----END PGP SIGNATURE-----

Message #51 received at 473381@bugs.debian.org (full text, mbox, reply):

From: Martin Quinson <martin.quinson@loria.fr>

To: Raphael Hertzog <hertzog@debian.org>, 482948@bugs.debian.org

Cc: 473381@bugs.debian.org, 478421@bugs.debian.org, 482750@bugs.debian.org, Martin Quinson <mquinson@debian.org>

Subject: Re: Bug#482948: quilt: diff for NMU version 0.46-4.1

Date: Wed, 4 Jun 2008 23:26:25 +0200

[Message part 1 (text/plain, inline)]

Hello Raphael,

I'm sorry for being quite MIA these days. I'm in the process of
building an house extension and, in the same time, find a new job in
another city. Life is a bit crazy right now, sorry about that.
All debian related mails go to a mailbox that I don't really have
time to open for now, unfortunately. 

Your patch is more than welcome, I'm feeling sorry for my packages.

If you want, I'd be more than pleased to exchange some words through
IM one day. My identifiers are on my loria web page, feel free.

Thanks for your work,
Mt.

On Wed, May 28, 2008 at 09:32:11PM +0200, Raphael Hertzog wrote:
> 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 <hertzog@debian.org>  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 <martin.quinson@tuxfamily.org>
> +# Copyright © 2003 Martin Quinson <martin.quinson@tuxfamily.org>
>  # 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 <mquinson@debian.org>
>  Uploaders: Martin Quinson <mquinson@debian.org>, Simon Horman <horms@debian.org>
> -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 <agruen@suse.de>
> +Author: Andreas GrÃŒnbacher, SuSE Labs <agruen@suse.de>
>  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.


-- 
Testing can only prove the presence of bugs.     --- Dijkstra

[signature.asc (application/pgp-signature, inline)]

Send a report that this bug log contains spam.