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

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

Your message dated Sun, 22 Jun 2008 03:17:03 +0000
with message-id <E1KAG4d-0005rd-BA@ries.debian.org>
and subject line Bug#485249: fixed in freebsd-sendpr 3.113+5.3-9
has caused the Debian Bug report #485249,
regarding freebsd-sendpr: 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

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

$ apt-get source freebsd-sendpr
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' freebsd-sendpr-3.113+5.3/debian/control
$ dpkg-source -b freebsd-sendpr-3.113+5.3
$ dpkg-source -x freebsd-sendpr_3.113+5.3-8.dsc
$ cd freebsd-sendpr-3.113+5.3 && 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-3.113+5.3-8 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 freebsd-sendpr, 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 "freebsd-sendpr-3.113+5.3.orig" and
"b" by "freebsd-sendpr-3.113+5.3" 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
- 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)


[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:
Raphael Hertzog

--- End Message ---
--- Begin Message ---
Source: freebsd-sendpr
Source-Version: 3.113+5.3-9

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

  to pool/main/f/freebsd-sendpr/freebsd-sendpr_3.113+5.3-9.diff.gz
  to pool/main/f/freebsd-sendpr/freebsd-sendpr_3.113+5.3-9.dsc
  to pool/main/f/freebsd-sendpr/freebsd-sendpr_3.113+5.3-9_all.deb

A summary of the changes between this version and the previous one is

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 485249@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
Guillem Jover <guillem@debian.org> (supplier of updated freebsd-sendpr 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)

Hash: SHA1

Format: 1.8
Date: Sun, 22 Jun 2008 05:56:28 +0300
Source: freebsd-sendpr
Binary: freebsd-sendpr
Architecture: source all
Version: 3.113+5.3-9
Distribution: unstable
Urgency: low
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd@lists.debian.org>
Changed-By: Guillem Jover <guillem@debian.org>
 freebsd-sendpr - FreeBSD fork of send-pr (from GNU GNATS)
Closes: 485249
 freebsd-sendpr (3.113+5.3-9) unstable; urgency=low
   * Switch all patches from -p0 to -pab. (Closes: #485249)
   * Improve debian/copyright.
     - Add Copyright Holders.
     - Add other Upstream Authors.
     - Use UTF-8 copyright symbol.
     - Refer to GPL-2, and add the minimal GPL license snippet.
   * Add Vcs-Browser and Vcs-Svn fields.
   * Add a README.source.
   * Now using Standards-Version 3.8.0.
   * Replace obsolete Depends on mailx with bsd-mailx.
 ff1cafd5d2b306b6ffcf9f3b8e44a91582d326e6 1338 freebsd-sendpr_3.113+5.3-9.dsc
 8145a35652c5d273272aa1f9cdc6d798f39198d1 4771 freebsd-sendpr_3.113+5.3-9.diff.gz
 a7f09f2805a638cbcf4410fec5d9028ff136b724 33126 freebsd-sendpr_3.113+5.3-9_all.deb
 41f76b70ced2eda58b3a568b2b2065b77d7de1eb51b8ceb41dddf1c8e52bb34a 1338 freebsd-sendpr_3.113+5.3-9.dsc
 d9c583215ae1fad8de3dc4a05fb243193095031df686eff00c02d49a8fb7d75c 4771 freebsd-sendpr_3.113+5.3-9.diff.gz
 5b89044d4a787c747e7877cca642eae0dc8c380d1f0335431dd8ba2dea232359 33126 freebsd-sendpr_3.113+5.3-9_all.deb
 e6fa0af89927b5e875aceea1b996f9cb 1338 utils extra freebsd-sendpr_3.113+5.3-9.dsc
 1b121e9feb36bff854260457a0be3371 4771 utils extra freebsd-sendpr_3.113+5.3-9.diff.gz
 b28d8880aee7223cb160cb33574e1243 33126 utils extra freebsd-sendpr_3.113+5.3-9_all.deb

Version: GnuPG v1.4.9 (GNU/Linux)


--- End Message ---

Reply to: