Bug#485267: marked as done (twm: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches)
Your message dated Sat, 14 Jun 2008 14:32:03 +0000
with message-id <E1K7WnT-0002jl-Do@ries.debian.org>
and subject line Bug#485267: fixed in twm 1:1.0.4-2
has caused the Debian Bug report #485267,
regarding twm: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)
--
485267: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485267
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: twm
Version: 1:1.0.4-1
Severity: wishlist
Usertags: 3.0-quilt-by-default
To prepare a possible switch to the new source package format "3.0
(quilt)" [1], I converted all source packages and tried to rebuild them.
Unfortunately, twm failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :
$ apt-get source twm
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' twm-1.0.4/debian/control
$ dpkg-source -b twm-1.0.4
$ dpkg-source -x twm_1.0.4-1.dsc
$ cd twm-1.0.4 && debuild -us -uc
In this process, if the .diff.gz contains changes to upstream files,
dpkg-source will have created a corresponding patch in
debian/patches/debian-changes-1:1.0.4-1 and will have registered that
patch in a quilt series (debian/patches/series, it is created if needed).
All the patches listed in the "series" file are applied directly during
the extraction (dpkg-source -x). quilt itself is used if available (and
will thus lead to the creation of the .pc directory), otherwise
dpkg-source applies the patches by itself. For more information about the
new source package format see the manual page dpkg-source(1).
In the case of twm, it already uses quilt but some of the patches
require the '-p0' option of patch to be properly applied and this
option has been hardcoded in the series file. The new source package
format doesn't support this quilt feature and requires patches
to be applicable with the '-p1' option.
You can use the following command to easily update all the patches
that use the '-p0' option:
awk '{ if ($2 == "-p0") print $1 }' debian/patches/series | while read f; do perl -pi -e 's|^--- (?:\./)?|--- a/|; s|^\+\+\+ (?:\./)?|+++ b/|;' debian/patches/$f ; done
Not that you can replace "a" by "twm-1.0.4.orig" and
"b" by "twm-1.0.4" if you prefer.
Then don't forget to strip the "-p0" options from debian/patches/series.
As a side note, you must also pay attention to the following points in your
quilt usage to guarantee compatibility with the new source package
format:
- the patches must be in debian/patches/ together with the "series" file
(you can use QUILT_PATCHES=debian/patches if needed)
- you should not override QUILT_PC to change the location of quilt's
internal directory (".pc" by default)
- the patches should not reference absolute filenames (in +++/--- lines)
- your clean target must work even if the patches are already applied
- your build target must work with patches applied even if the clean
target is supposed to unapply them (because dpkg-source -b might
have applied them back)
Cheers,
[1] http://lists.debian.org/debian-devel-announce/2008/04/msg00004.html
[2] the upcoming dpkg-dev 1.14.20 is more tolerant with patches, you can
grab it here if you want to try with that version:
http://people.debian.org/~hertzog/packages/dpkg-dev_1.14.20_all.deb
--
Raphael Hertzog
--- End Message ---
--- Begin Message ---
Source: twm
Source-Version: 1:1.0.4-2
We believe that the bug you reported is fixed in the latest version of
twm, which is due to be installed in the Debian FTP archive:
twm_1.0.4-2.diff.gz
to pool/main/t/twm/twm_1.0.4-2.diff.gz
twm_1.0.4-2.dsc
to pool/main/t/twm/twm_1.0.4-2.dsc
twm_1.0.4-2_i386.deb
to pool/main/t/twm/twm_1.0.4-2_i386.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 485267@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Brice Goglin <bgoglin@debian.org> (supplier of updated twm 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: Sat, 14 Jun 2008 16:08:36 +0200
Source: twm
Binary: twm
Architecture: source i386
Version: 1:1.0.4-2
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Brice Goglin <bgoglin@debian.org>
Description:
twm - Tab window manager
Closes: 485267
Changes:
twm (1:1.0.4-2) unstable; urgency=low
.
* Update patches to not require -p0 and pull newest xsfbs, closes: #485267.
* Add myself to Uploaders.
Checksums-Sha1:
757a434d5d65f6104dfed0844a12911dbb8c9ad3 1290 twm_1.0.4-2.dsc
b6feafb44daafb4eddb7550155e50d837a7a4c23 23763 twm_1.0.4-2.diff.gz
046e2be86d1460a135b21ee353455cb2393ba3a0 111740 twm_1.0.4-2_i386.deb
Checksums-Sha256:
b1a750705e0b8d5b18a051d067798a6c2b8897dd1a97e6eb63cee358d8944dbf 1290 twm_1.0.4-2.dsc
1af393a7f6bb227a766a37be237710642900675e392435001a9e803347228048 23763 twm_1.0.4-2.diff.gz
113999bd96285bc68ab4eea7582a18a031c9e79fab44df62746ef3d4575c2383 111740 twm_1.0.4-2_i386.deb
Files:
06d53784aa70ca4e7b8ea42108e308ad 1290 x11 optional twm_1.0.4-2.dsc
ef8a2441a8402d0687c397108f66f52d 23763 x11 optional twm_1.0.4-2.diff.gz
36e4f84a202f22d1d25fa91c8ee3d85c 111740 x11 optional twm_1.0.4-2_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFIU9LeRh88F8PcWfoRAjLAAJ9729+jqddsRzN1woVqFCc4a5EVMQCfazAm
GPiU5epQPOOWvMP0jcv0edU=
=75je
-----END PGP SIGNATURE-----
--- End Message ---
Reply to: