Bug#485272: marked as done (xfonts-cyrillic: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches)
Your message dated Sun, 15 Jun 2008 18:17:05 +0000
with message-id <E1K7wmn-0005To-ND@ries.debian.org>
and subject line Bug#485272: fixed in xfonts-cyrillic 1:1.0.0-6
has caused the Debian Bug report #485272,
regarding xfonts-cyrillic: 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.)
--
485272: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485272
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: xfonts-cyrillic
Version: 1:1.0.0-5
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, xfonts-cyrillic failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :
$ apt-get source xfonts-cyrillic
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' xfonts-cyrillic-1.0.0/debian/control
$ dpkg-source -b xfonts-cyrillic-1.0.0
$ dpkg-source -x xfonts-cyrillic_1.0.0-5.dsc
$ cd xfonts-cyrillic-1.0.0 && 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.0-5 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 xfonts-cyrillic, 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 "xfonts-cyrillic-1.0.0.orig" and
"b" by "xfonts-cyrillic-1.0.0" 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: xfonts-cyrillic
Source-Version: 1:1.0.0-6
We believe that the bug you reported is fixed in the latest version of
xfonts-cyrillic, which is due to be installed in the Debian FTP archive:
xfonts-cyrillic_1.0.0-6.diff.gz
to pool/main/x/xfonts-cyrillic/xfonts-cyrillic_1.0.0-6.diff.gz
xfonts-cyrillic_1.0.0-6.dsc
to pool/main/x/xfonts-cyrillic/xfonts-cyrillic_1.0.0-6.dsc
xfonts-cyrillic_1.0.0-6_all.deb
to pool/main/x/xfonts-cyrillic/xfonts-cyrillic_1.0.0-6_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 485272@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 xfonts-cyrillic 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:57:17 +0200
Source: xfonts-cyrillic
Binary: xfonts-cyrillic
Architecture: source all
Version: 1:1.0.0-6
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Brice Goglin <bgoglin@debian.org>
Description:
xfonts-cyrillic - Cyrillic fonts for X
Closes: 485272
Changes:
xfonts-cyrillic (1:1.0.0-6) unstable; urgency=low
.
* Update patches to not use -p0, closes: #485272.
* Add myself to uploaders.
* Bump Standards-Version to 3.7.3, no change needed.
* Add Vcs-Browser and Vcs-Git fields to debian/control.
Checksums-Sha1:
84bf8bdad172d3a3bd975c2e1fdd2ab57cde2bbc 1323 xfonts-cyrillic_1.0.0-6.dsc
c5c33f43181dfeb69dfd557ffea2573434d855f0 190971 xfonts-cyrillic_1.0.0-6.diff.gz
7a10518c98e2ab7a9836a39e938c3ff21af33e62 397632 xfonts-cyrillic_1.0.0-6_all.deb
Checksums-Sha256:
a8eb086851a4737d32fbdbf1715017ae32cb824500319459bcbea8f8bf662258 1323 xfonts-cyrillic_1.0.0-6.dsc
821c609e89f84ab77ed5f83a8bb177da30fca529d76177dab3102bfdc2441a87 190971 xfonts-cyrillic_1.0.0-6.diff.gz
a80c70fd62e606ecf17f46f98aeb9e71e756ee0ab56400a23d700b0d0be8f374 397632 xfonts-cyrillic_1.0.0-6_all.deb
Files:
62abb63c4fc73b64337e118f25ad3410 1323 x11 optional xfonts-cyrillic_1.0.0-6.dsc
c37bfb84fe00b31c336e6882b39ff75a 190971 x11 optional xfonts-cyrillic_1.0.0-6.diff.gz
5c8b0dd7484ed193a706393e7dcd2a08 397632 x11 optional xfonts-cyrillic_1.0.0-6_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFIU/tGRh88F8PcWfoRAnoIAJ47FgKO/wQICxkTSBiXAtp9sJYZCQCgmlga
3H1hFAawq2bY+fG7RxsevIM=
=LdDH
-----END PGP SIGNATURE-----
--- End Message ---
Reply to: