Your message dated Wed, 31 Dec 2008 19:32:03 +0000
with message-id <[email protected]>
and subject line Bug#484977: fixed in adonthell 0.3.5-1
has caused the Debian Bug report #484977,
regarding adonthell: FTBFS when converted to new source format 3.0 (quilt): 
patches file created by .diff.gz
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.)


-- 
484977: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=484977
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: adonthell
Version: 0.3.4.cvs.20050813-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 failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :

$ apt-get source adonthell
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' 
adonthell-0.3.4.cvs.20050813/debian/control
$ dpkg-source -b adonthell-0.3.4.cvs.20050813
$ dpkg-source -x adonthell_0.3.4.cvs.20050813-4.dsc
$ cd adonthell-0.3.4.cvs.20050813 && 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.20050813-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, it already uses quilt but the patch
02_use_libsdl-ttf.diff modifies a file (src/py_adonthell_wrap.cc)
that doesn't exist in the original tarball. That file is created by the
Debian .diff.gz.

You should thus simply create the full file within the patch 
02_use_libsdl-ttf.diff instead of having the change split in two
places. The conversion of the package fails when dpkg-source
tries to apply the quilt series on top of the plain upstream
directory (precisely when it tries to convert the local changes
to a new patch at the _end_ of the quilt 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:
- all your patches must be applicable with the "-p1" option of patch
  (and you shouldn't use options in the series file to override this)
- 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
Source-Version: 0.3.5-1

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

adonthell_0.3.5-1.diff.gz
  to pool/main/a/adonthell/adonthell_0.3.5-1.diff.gz
adonthell_0.3.5-1.dsc
  to pool/main/a/adonthell/adonthell_0.3.5-1.dsc
adonthell_0.3.5-1_amd64.deb
  to pool/main/a/adonthell/adonthell_0.3.5-1_amd64.deb
adonthell_0.3.5.orig.tar.gz
  to pool/main/a/adonthell/adonthell_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 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 14:23:46 +0000
Source: adonthell
Binary: adonthell
Architecture: source amd64
Version: 0.3.5-1
Distribution: experimental
Urgency: low
Maintainer: Debian Games Team <[email protected]>
Changed-By: Iain Lane <[email protected]>
Description: 
 adonthell  - A 2D graphical roleplaying game
Closes: 484977
Changes: 
 adonthell (0.3.5-1) experimental; urgency=low
 .
   [ Gonéri Le Bouder ]
   * add the missing -p1 in debian/patches/series so the package doesn't
     FTBFS with the quilt source format (Closes: #484977)
   * Bump the standard version to 3.8.0, no change needed.
 .
   [ Ansgar Burchardt ]
   * Add watch file
 .
   [ Iain Lane ]
   * New upstream version 0.3.5
   * debian/rules: Use quilt.make to apply patches.
   * debian/patches: Delete obsolete patches.
   * debian/patches/04_do_not_ship_pyc.diff: Refreshed.
   * debian/watch: Updated to look at savannah.nongnu.org
 .
   [ Miriam Ruiz ]
   * Added Iain Lane <[email protected]> to Uploaders
Checksums-Sha1: 
 47c6c1295c10a759c35f153a12b8164518f83648 1510 adonthell_0.3.5-1.dsc
 8e913173225b351b79db45124f627b436794f845 877439 adonthell_0.3.5.orig.tar.gz
 3e97cf6e72d0f390cab22aaf2251b6aaf57f8b17 4885 adonthell_0.3.5-1.diff.gz
 866910a109cfda50090027990708f9b38216d4ca 308022 adonthell_0.3.5-1_amd64.deb
Checksums-Sha256: 
 4d7383a710903b4cada689edb19790df29c9334a18774827ebf5532c4588d7c6 1510 
adonthell_0.3.5-1.dsc
 b1b24f26b9f32782793b222c687943442be83fc0d7f5dbb4928a61074be36dd7 877439 
adonthell_0.3.5.orig.tar.gz
 170bc6895375651d0becfe3dfce46ac24d997af94f019f4c44c8149325220fe7 4885 
adonthell_0.3.5-1.diff.gz
 1771b920d8f236918af96718cc022713606ea8737bdb815a928dee11971ed09e 308022 
adonthell_0.3.5-1_amd64.deb
Files: 
 7b2ae6cf610be539fce5b7526c201519 1510 games optional adonthell_0.3.5-1.dsc
 64a344b1ed8a7808d7adafa337120a00 877439 games optional 
adonthell_0.3.5.orig.tar.gz
 4e7e735f6d7d4cb0deb6e458c1db20e2 4885 games optional adonthell_0.3.5-1.diff.gz
 52d52050f93f4cf383b3cdd50a679c81 308022 games optional 
adonthell_0.3.5-1_amd64.deb

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

iEYEARECAAYFAklbxfUACgkQfbltLjbuCGHLGQCeL/EStqKF24loiSlu5IUS568i
Fv4Anja/U7x4FKELA7/83195pCG1sEll
=LNu/
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to