[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#485364: marked as done (tzdata: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches)

Your message dated Fri, 25 Jul 2008 14:02:09 +0000
with message-id <E1KMNs1-00077A-LL@ries.debian.org>
and subject line Bug#485364: fixed in tzdata 2008d-1
has caused the Debian Bug report #485364,
regarding tzdata: 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.)


-- 
485364: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485364
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: tzdata
Version: 2008c-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, tzdata failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :

$ apt-get source tzdata
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' tzdata-2008c/debian/control
$ dpkg-source -b tzdata-2008c
$ dpkg-source -x tzdata_2008c-1.dsc
$ cd tzdata-2008c && 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-2008c-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 tzdata, 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 "tzdata-2008c.orig" and
"b" by "tzdata-2008c" 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: tzdata
Source-Version: 2008d-1

We believe that the bug you reported is fixed in the latest version of
tzdata, which is due to be installed in the Debian FTP archive:

tzdata_2008d-1.diff.gz
  to pool/main/t/tzdata/tzdata_2008d-1.diff.gz
tzdata_2008d-1.dsc
  to pool/main/t/tzdata/tzdata_2008d-1.dsc
tzdata_2008d-1_all.deb
  to pool/main/t/tzdata/tzdata_2008d-1_all.deb
tzdata_2008d.orig.tar.gz
  to pool/main/t/tzdata/tzdata_2008d.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 485364@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Clint Adams <schizo@debian.org> (supplier of updated tzdata 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: Fri, 25 Jul 2008 09:41:04 -0400
Source: tzdata
Binary: tzdata
Architecture: source all
Version: 2008d-1
Distribution: unstable
Urgency: medium
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Changed-By: Clint Adams <schizo@debian.org>
Description: 
 tzdata     - time zone and daylight-saving time data
Closes: 483917 485364 486867 490674 490685 490692 490709 490713 490726 490731 490773 490783 490807 490942 490993 491047 491207 491339 491444
Changes: 
 tzdata (2008d-1) unstable; urgency=medium
 .
   [ Clint Adams ]
   * New upstream release.
   * Bump to Standards-Version 3.8.0.
   * debian/po/en.po: translation of "Santarem".
   * Add Italian translations from David Paleino.  closes: #483917.
 .
   [ Christian Perrier ]
   * Debconf translations (credits are in PO files):
     - French
     - Gujarati. Closes: #490674
     - Malayalam. Closes: #490685
     - Galician. Closes: #490692
     - Catalan. Closes: #490709
     - German. Closes: #490713, #486867
     - Bulgarian. Closes: #490726
     - Basque. Closes: #490731
     - Lithuanian. Closes: #490773
     - Swedish. Closes: #490783
     - Japanese. Closes: #490807
     - Thai. Closes: #490942
     - Finnish. Closes: #490993
     - Vietnamese. Closes: #491047
     - Turkish. Closes: #491207
     - Russian. Closes: #491339
     - Belarusian. Closes: #491444
 .
   [ Aurelien Jarno ]
   * patches/systemv.diff: convert to -p1.  Closes: #485364.
Checksums-Sha1: 
 6fcf35dffc9e3598841723f9af4593c6af04646a 1090 tzdata_2008d-1.dsc
 e580e8b121becba62b53e64bf7137045047e80ce 170117 tzdata_2008d.orig.tar.gz
 bef7264fbcf51c2eab924770384256420b24d61c 198987 tzdata_2008d-1.diff.gz
 cf80fe9b43e98effbc442bc0db91a8b989c9a229 730744 tzdata_2008d-1_all.deb
Checksums-Sha256: 
 3053decdeceb1fc68e63b171ae3808c6d4e8ca7fc8545fb9cf6c5e8872a2b824 1090 tzdata_2008d-1.dsc
 01037d73b2da69cf595d790fa7e23da12c45a54b0b8253394938be01f3e2bb8b 170117 tzdata_2008d.orig.tar.gz
 029b5717c9968b82b89d68ab94cef16a7980f9c2e002741c724bb07885361398 198987 tzdata_2008d-1.diff.gz
 367d8a3aad97e37e5d5b4a5bd382249f1f31c22c73b3421167bd77eb1ec089bc 730744 tzdata_2008d-1_all.deb
Files: 
 68c9c492fc81e270a52e9df79edaf7d8 1090 libs required tzdata_2008d-1.dsc
 81a34b6b85ebfcf9f9c8fa8aaf1fc601 170117 libs required tzdata_2008d.orig.tar.gz
 0918fee3485d5797cc7625be049b4aa4 198987 libs required tzdata_2008d-1.diff.gz
 cb626618e20a0fdc5a2dfd2cc3741826 730744 libs required tzdata_2008d-1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Debian!

iD8DBQFIidpF5m0u66uWM3ARAs3BAJwMOmPR2izb6xBn6+Y0U5UeYKxVkwCgjRde
rtCPpb2a3MhOZB5bEEzXpis=
=ynUJ
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: