Your message dated Tue, 21 Apr 2009 23:51:48 -0700
with message-id <[email protected]>
and subject line Re: bibledit: FTBFS when converted to new source format 3.0
(quilt): require -p0 for some patches
has caused the Debian Bug report #485242,
regarding bibledit: 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 [email protected]
immediately.)
--
485242: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485242
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: bibledit
Version: 2.2-2.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, bibledit failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :
$ apt-get source bibledit
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' bibledit-2.2/debian/control
$ dpkg-source -b bibledit-2.2
$ dpkg-source -x bibledit_2.2-2.1.dsc
$ cd bibledit-2.2 && 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-2.2-2.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 bibledit, 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 "bibledit-2.2.orig" and
"b" by "bibledit-2.2" 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 ---
Raphael Hertzog wrote:
> There are no instructions in #457345 as far as I can see.
I thought:
$ apt-get source bibledit
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' bibledit-2.2/debian/control
$ dpkg-source -b bibledit-2.2
$ dpkg-source -x bibledit_2.2-2.1.dsc
$ cd bibledit-2.2 && debuild -us -uc
were instructions! Anyway:
> $ mkdir -p debian/source
> $ echo "3.0 (quilt)" >debian/source/format
> $ dpkg-buildpackage -S
>
> Then remove the source directory and try to extract the new source package
> and do a normal rebuild. If it works, the bug is fixed.
Great! That works fine, except that lintian complains:
E: bibledit source: unsupported source format 3.0 (quilt)
We can consider this bug to be fixed in the bibledit 3.7-1 packages
which are now in unstable.
Thanks,
Jonathan
--- End Message ---
