Bug#485273: marked as done (xfs: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches)
Your message dated Sun, 15 Jun 2008 18:17:07 +0000
with message-id <E1K7wmp-0005UI-2W@ries.debian.org>
and subject line Bug#485273: fixed in xfs 1:1.0.8-1
has caused the Debian Bug report #485273,
regarding xfs: 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.)
--
485273: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485273
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: xfs
Version: 1:1.0.7-2
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, xfs failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :
$ apt-get source xfs
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' xfs-1.0.7/debian/control
$ dpkg-source -b xfs-1.0.7
$ dpkg-source -x xfs_1.0.7-2.dsc
$ cd xfs-1.0.7 && 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.7-2 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 xfs, 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 "xfs-1.0.7.orig" and
"b" by "xfs-1.0.7" 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: xfs
Source-Version: 1:1.0.8-1
We believe that the bug you reported is fixed in the latest version of
xfs, which is due to be installed in the Debian FTP archive:
xfs_1.0.8-1.diff.gz
to pool/main/x/xfs/xfs_1.0.8-1.diff.gz
xfs_1.0.8-1.dsc
to pool/main/x/xfs/xfs_1.0.8-1.dsc
xfs_1.0.8-1_i386.deb
to pool/main/x/xfs/xfs_1.0.8-1_i386.deb
xfs_1.0.8.orig.tar.gz
to pool/main/x/xfs/xfs_1.0.8.orig.tar.gz
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 485273@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 xfs 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 18:41:28 +0200
Source: xfs
Binary: xfs
Architecture: source i386
Version: 1:1.0.8-1
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Brice Goglin <bgoglin@debian.org>
Description:
xfs - X font server
Closes: 482788 485273
Changes:
xfs (1:1.0.8-1) unstable; urgency=low
.
* New upstream release.
* Always restart the xfs daemon on upgrade from << 1:1.0.7 since the
old prerm script always stopped it on upgrade, closes: #482788.
* Update patches to not use -p0, closes: #485273.
Checksums-Sha1:
c058e92530ef2608586535304b84798254430bb6 1217 xfs_1.0.8-1.dsc
5ae2fe90899600f58f8ff01a364d4a52394e2ae5 197220 xfs_1.0.8.orig.tar.gz
575f17485f1ad070b4a805fff043c6b915cc1c45 37610 xfs_1.0.8-1.diff.gz
807d7cb801bcfe3c7b31fb58ac7df195db613162 90362 xfs_1.0.8-1_i386.deb
Checksums-Sha256:
25ede030bd0b69a86d97be0c249e0006930ab8a5b6e0d2060e3b0b996d547d21 1217 xfs_1.0.8-1.dsc
8722c0226556ec430052e9c2b01083faf3c261e7184d0af57f159c8afa73b375 197220 xfs_1.0.8.orig.tar.gz
fb420a729dc1049b31c6058dd4bc9acfc6df9405d3da11771b3a5593577c6957 37610 xfs_1.0.8-1.diff.gz
83f64162426b5be2f7c15c2c81d2286e3b449a31f5c89f64ae6cdea6376ed601 90362 xfs_1.0.8-1_i386.deb
Files:
7cd686ce8fe958ac78924c49082484d6 1217 x11 optional xfs_1.0.8-1.dsc
6c9e85034871db0caa4f47cc7d3cd409 197220 x11 optional xfs_1.0.8.orig.tar.gz
586e796dfab83cbaa8a4ab9c7f32b9e4 37610 x11 optional xfs_1.0.8-1.diff.gz
3a53a7e277fd873fbe6931e731b774a5 90362 x11 optional xfs_1.0.8-1_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFIU/VWRh88F8PcWfoRAt9eAJwL9pbywgqS4jlwDyK4DinnSbIq0QCg1DTB
+4fp60UcTqkQ1Phvm9iZlRc=
=+ZV/
-----END PGP SIGNATURE-----
--- End Message ---
Reply to: