Your message dated Wed, 31 Dec 2008 21:17:04 +0000
with message-id <[email protected]>
and subject line Bug#484940: fixed in adonthell-data 0.3.5-1
has caused the Debian Bug report #484940,
regarding adonthell-data: FTBFS when converted to new source format 3.0
(quilt): due to patches that require -p0
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 [email protected]
immediately.)
--
484940: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=484940
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: adonthell-data
Version: 0.3.4.cvs.20050903-4
Severity: minor
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, adonthell-data failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :
$ apt-get source adonthell-data
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)'
adonthell-data-0.3.4.cvs.20050903/debian/control
$ dpkg-source -b adonthell-data-0.3.4.cvs.20050903
$ dpkg-source -x adonthell-data_0.3.4.cvs.20050903-4.dsc
$ cd adonthell-data-0.3.4.cvs.20050903 && 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-0.3.4.cvs.20050903-4 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 adonthell-data, 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 "adonthell-data-0.3.4.cvs.20050903.orig" and
"b" by "adonthell-data-0.3.4.cvs.20050903" 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: adonthell-data
Source-Version: 0.3.5-1
We believe that the bug you reported is fixed in the latest version of
adonthell-data, which is due to be installed in the Debian FTP archive:
adonthell-data_0.3.5-1.diff.gz
to pool/main/a/adonthell-data/adonthell-data_0.3.5-1.diff.gz
adonthell-data_0.3.5-1.dsc
to pool/main/a/adonthell-data/adonthell-data_0.3.5-1.dsc
adonthell-data_0.3.5-1_all.deb
to pool/main/a/adonthell-data/adonthell-data_0.3.5-1_all.deb
adonthell-data_0.3.5.orig.tar.gz
to pool/main/a/adonthell-data/adonthell-data_0.3.5.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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Iain Lane <[email protected]> (supplier of updated adonthell-data 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 31 Dec 2008 15:12:43 +0000
Source: adonthell-data
Binary: adonthell-data
Architecture: source all
Version: 0.3.5-1
Distribution: experimental
Urgency: low
Maintainer: Debian Games Team <[email protected]>
Changed-By: Iain Lane <[email protected]>
Description:
adonthell-data - Data files needed by Adonthell
Closes: 484940 487092
Changes:
adonthell-data (0.3.5-1) experimental; urgency=low
.
[ Gonéri Le Bouder ]
* Bump the standard version to 3.8.0, no change needed
.
[ Iain Lane ]
* New upstream release 0.3.5.
* debian/watch: Add watch file.
* debian/rules: Use quilt.make to apply/deapply quilt patches.
* debian/rules: Install upstream's .desktop file. (Closes: #487092)
* debian/adonthell-data.links: Symlink upstream's pixmap to the location
the desktop file references.
* debian/patches/01_do_not_ship_pyc_files: Refreshed.
* debian/patches/02_player_text_py.diff: Readded to series. Not fixed
upstream. Also fixed to work with -p1. (thanks to Raphael Hertzog)
(Closes: #484940)
.
[ Miriam Ruiz ]
* Added Iain Lane <[email protected]> to Uploaders
Checksums-Sha1:
8c96f16a5f5431804443763e147008222d2ef781 1445 adonthell-data_0.3.5-1.dsc
68db1307a2fb05c8473f649eb499c6893dcb657a 10749912
adonthell-data_0.3.5.orig.tar.gz
9fbe0a2d2837ffda3e11ef51c569f88ab1ee8ab3 5090 adonthell-data_0.3.5-1.diff.gz
10ae7af23a1caa51cb5ffcd4ede7e5d7afed686d 9970636 adonthell-data_0.3.5-1_all.deb
Checksums-Sha256:
03bc3a0bdbcefd5f690d84bfac4e400a535aa280938c669a532fb4255d159be7 1445
adonthell-data_0.3.5-1.dsc
f872a2dc89ca454523f5b55c7fc8b29986dae8bc72f52647a6e1dab3f2a30674 10749912
adonthell-data_0.3.5.orig.tar.gz
11d433f70cc739602f76d803f979f288b98d0ae063eae36bb583541fb1b49272 5090
adonthell-data_0.3.5-1.diff.gz
082f746347a39a1fc75fca30712cc5c6a5eb7a3aec0c1fea860c7fe52cc4c0e9 9970636
adonthell-data_0.3.5-1_all.deb
Files:
150aefb9cd6ead5fb962ea7c675f1a05 1445 games optional adonthell-data_0.3.5-1.dsc
6573ea42b47cba377a8ecc33db6b5866 10749912 games optional
adonthell-data_0.3.5.orig.tar.gz
bb3d295ca5c48d6282a8efdf77c226e1 5090 games optional
adonthell-data_0.3.5-1.diff.gz
48686ba1d59c70aa0bc36b8ceb8701fa 9970636 games optional
adonthell-data_0.3.5-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAklbxecACgkQfbltLjbuCGHqxACfRm9l0KwIQYXR9k5gg4ZwGKex
w+QAmgJR1ZC4YHaxPB6ozWbCtCAx5YyD
=XnQV
-----END PGP SIGNATURE-----
--- End Message ---
