Debian Bug report logs - #485259
synfig: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches

Toggle useless messages

Message #5 received at maintonly@bugs.debian.org (full text, mbox, reply):

From: Raphael Hertzog <hertzog@debian.org>

To: maintonly@bugs.debian.org

Subject: synfig: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches

Date: Sun, 08 Jun 2008 21:08:43 +0200

Package: synfig
Version: 0.61.08-3
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, synfig failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :

$ apt-get source synfig
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' synfig-0.61.08/debian/control
$ dpkg-source -b synfig-0.61.08
$ dpkg-source -x synfig_0.61.08-3.dsc
$ cd synfig-0.61.08 && 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.61.08-3 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 synfig, 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 "synfig-0.61.08.orig" and
"b" by "synfig-0.61.08" 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

Message #10 received at 485259@bugs.debian.org (full text, mbox, reply):

From: Cyril Brulebois <kibi@debian.org>

To: Raphael Hertzog <hertzog@debian.org>, 485259@bugs.debian.org

Cc: control@bugs.debian.org

Subject: Re: Bug#485259: synfig: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches

Date: Mon, 9 Jun 2008 07:41:27 +0200

[Message part 1 (text/plain, inline)]

tag 485259 pending
thanks

Raphael Hertzog <hertzog@debian.org> (08/06/2008):
> Package: synfig
> Version: 0.61.08-3
> Severity: wishlist
> Usertags: 3.0-quilt-by-default

Thanks, fixed in svn. Not uploading right now due to the ongoing ffmpeg
transition. A reminder is welcome once it's achieved.

Mraw,
KiBi.

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 485259-close@bugs.debian.org (full text, mbox, reply):

From: Paul Wise <pabs@debian.org>

To: 485259-close@bugs.debian.org

Subject: Bug#485259: fixed in synfig 0.61.09-1

Date: Sun, 16 Nov 2008 07:32:05 +0000

Source: synfig
Source-Version: 0.61.09-1

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

libsynfig-dev_0.61.09-1_amd64.deb
  to pool/main/s/synfig/libsynfig-dev_0.61.09-1_amd64.deb
libsynfig0_0.61.09-1_amd64.deb
  to pool/main/s/synfig/libsynfig0_0.61.09-1_amd64.deb
synfig-dbg_0.61.09-1_amd64.deb
  to pool/main/s/synfig/synfig-dbg_0.61.09-1_amd64.deb
synfig-examples_0.61.09-1_all.deb
  to pool/main/s/synfig/synfig-examples_0.61.09-1_all.deb
synfig_0.61.09-1.diff.gz
  to pool/main/s/synfig/synfig_0.61.09-1.diff.gz
synfig_0.61.09-1.dsc
  to pool/main/s/synfig/synfig_0.61.09-1.dsc
synfig_0.61.09-1_amd64.deb
  to pool/main/s/synfig/synfig_0.61.09-1_amd64.deb
synfig_0.61.09.orig.tar.gz
  to pool/main/s/synfig/synfig_0.61.09.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 485259@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Paul Wise <pabs@debian.org> (supplier of updated synfig 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: Sun, 16 Nov 2008 15:36:08 +0900
Source: synfig
Binary: synfig libsynfig0 libsynfig-dev synfig-dbg synfig-examples
Architecture: source all amd64
Version: 0.61.09-1
Distribution: experimental
Urgency: low
Maintainer: Debian Synfig Maintainers <pkg-synfig-devel@lists.alioth.debian.org>
Changed-By: Paul Wise <pabs@debian.org>
Description: 
 libsynfig-dev - synfig library development files
 libsynfig0 - synfig library
 synfig     - vector-based 2D animation renderer
 synfig-dbg - synfig debugging symbols
 synfig-examples - synfig animation examples
Closes: 485259
Changes: 
 synfig (0.61.09-1) experimental; urgency=low
 .
   [ Paul Wise ]
   * New upstream release
     - drop merged fix-upstream-1877061-avformat-52-FTBFS.patch
       - drop quilt build-dep, no longer needed
     - bump the etl-dev build-depends
   * Drop upstream ChangeLog since it was empty for this release
   * Wrap the uploaders, depends, suggests and build-deps fields
   * Support parallel builds
   * Now compliant with policy 3.8.0
   * libsynfig-dev depends on etl-dev should be versioned
 .
   [ Cyril Brulebois ]
   * Fix FTBFS with new “3.0 (quilt)” source package format by using a
     strip level of 1 instead of 0 for the following patch, and by removing
     the “-p0” option from the series file. Thanks to Raphaël Hertzog for
     the notice (Closes: #485259).
      - fix-upstream-1877061-avformat-52-FTBFS.patch
   * Update my mail address.
Checksums-Sha1: 
 a467b33ddcf786825f2c1f962f763d284a71c4ad 1694 synfig_0.61.09-1.dsc
 0c72ae152898970ceb91e4d7d09f506c023bd490 2661889 synfig_0.61.09.orig.tar.gz
 88f254246fd76a5c0489bac2d49c67fb3e0ae85b 6488 synfig_0.61.09-1.diff.gz
 298407cc3eb450ad8b18fb2ded33eba5743f4cbb 1201596 synfig-examples_0.61.09-1_all.deb
 2686aac41db9933a038daa1d2f72f8b17cf23e30 54640 synfig_0.61.09-1_amd64.deb
 6963f934d813a72f217efe98ae455f7dae240c41 1513530 libsynfig0_0.61.09-1_amd64.deb
 dda6666285d8780e20c174bcae56d21cdc26845c 75976 libsynfig-dev_0.61.09-1_amd64.deb
 7be0eca7ec40f58167dc488edede338ca66bd75d 8032880 synfig-dbg_0.61.09-1_amd64.deb
Checksums-Sha256: 
 486d6cf66a0af1baaeb45d964fd7e309822af0409b42a2c4848a8161bb663054 1694 synfig_0.61.09-1.dsc
 942937e7498bc3c1a12b0ea42948f01445da3b94ab21be73ab49a7ef304300dd 2661889 synfig_0.61.09.orig.tar.gz
 672c0682e40f2a361f848d7818ec3aece36a74281bfbc9fc96a1acbfa84d6fac 6488 synfig_0.61.09-1.diff.gz
 f5da6c6834f9775a6066b7ec57102e3a142038f22925beaefcdece2ef548b329 1201596 synfig-examples_0.61.09-1_all.deb
 fcd1850934ae7be5a6e58a535977db879b4745a7cac2af3ad0db2375f40b8bbe 54640 synfig_0.61.09-1_amd64.deb
 314a8f2bb24364566e01c75f3fcf21539f8683f39b4519c5e1664521c0da353d 1513530 libsynfig0_0.61.09-1_amd64.deb
 cb8d88ecd1a4200e86052ccc609451a676f6da18ab1863b8d09526e2a0d9312b 75976 libsynfig-dev_0.61.09-1_amd64.deb
 4b197ebf0b2c0a01277ac49d2711d4ecffdc4cd0bcb80195dfadd8c21af68f7b 8032880 synfig-dbg_0.61.09-1_amd64.deb
Files: 
 7de0ef947103cc2e5b609731257a076c 1694 graphics optional synfig_0.61.09-1.dsc
 0330521fe46b9e8a39df7081ec64c5d5 2661889 graphics optional synfig_0.61.09.orig.tar.gz
 ca47380650096ecc0c50d8d1c9cd66da 6488 graphics optional synfig_0.61.09-1.diff.gz
 28e6a4068a8ce5bec3f8aea41967621c 1201596 graphics optional synfig-examples_0.61.09-1_all.deb
 7fbd2ff03a77ecb046f9584bd75a30d5 54640 graphics optional synfig_0.61.09-1_amd64.deb
 e1cfd285ef1cd18d4dfc3f9ebd58e3cc 1513530 libs optional libsynfig0_0.61.09-1_amd64.deb
 9f946f006c58669ab51740b98360a19a 75976 libdevel optional libsynfig-dev_0.61.09-1_amd64.deb
 3d039728b8d79d7d11f05badb35aca3f 8032880 libdevel extra synfig-dbg_0.61.09-1_amd64.deb

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

iEYEARECAAYFAkkfybcACgkQ5Sc9mGvjxCPODgCfVX7VQBP9Gb2RvGsK+PM7khKv
x/oAniQSAbOcENfZVieezVAL7KCR0X4+
=7PHD
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.