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

Bug#485274: marked as done (xserver-xorg-video-rendition: FTBFS when converted to new source format 3.0 (quilt): require -p0 for some patches)



Your message dated Sun, 15 Jun 2008 18:17:08 +0000
with message-id <E1K7wmq-0005Uk-DN@ries.debian.org>
and subject line Bug#485274: fixed in xserver-xorg-video-rendition 1:4.2.0.dfsg.1-2
has caused the Debian Bug report #485274,
regarding xserver-xorg-video-rendition: 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.)


-- 
485274: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485274
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: xserver-xorg-video-rendition
Version: 1:4.1.3.dfsg.1-4
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, xserver-xorg-video-rendition failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :

$ apt-get source xserver-xorg-video-rendition
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)' xserver-xorg-video-rendition-4.1.3.dfsg.1/debian/control
$ dpkg-source -b xserver-xorg-video-rendition-4.1.3.dfsg.1
$ dpkg-source -x xserver-xorg-video-rendition_4.1.3.dfsg.1-4.dsc
$ cd xserver-xorg-video-rendition-4.1.3.dfsg.1 && 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-1:4.1.3.dfsg.1-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 xserver-xorg-video-rendition, 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 "xserver-xorg-video-rendition-4.1.3.dfsg.1.orig" and
"b" by "xserver-xorg-video-rendition-4.1.3.dfsg.1" 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: xserver-xorg-video-rendition
Source-Version: 1:4.2.0.dfsg.1-2

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

xserver-xorg-video-rendition_4.2.0.dfsg.1-2.diff.gz
  to pool/main/x/xserver-xorg-video-rendition/xserver-xorg-video-rendition_4.2.0.dfsg.1-2.diff.gz
xserver-xorg-video-rendition_4.2.0.dfsg.1-2.dsc
  to pool/main/x/xserver-xorg-video-rendition/xserver-xorg-video-rendition_4.2.0.dfsg.1-2.dsc
xserver-xorg-video-rendition_4.2.0.dfsg.1-2_i386.deb
  to pool/main/x/xserver-xorg-video-rendition/xserver-xorg-video-rendition_4.2.0.dfsg.1-2_i386.deb



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 485274@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Brice Goglin <bgoglin@debian.org> (supplier of updated xserver-xorg-video-rendition 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: Sat, 14 Jun 2008 18:35:23 +0200
Source: xserver-xorg-video-rendition
Binary: xserver-xorg-video-rendition
Architecture: source i386
Version: 1:4.2.0.dfsg.1-2
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Brice Goglin <bgoglin@debian.org>
Description: 
 xserver-xorg-video-rendition - X.Org X server -- Rendition display driver
Closes: 485274
Changes: 
 xserver-xorg-video-rendition (1:4.2.0.dfsg.1-2) unstable; urgency=low
 .
   * Update patches to not use -p0, closes: #485274.
   * Add myself to Uploaders.
Checksums-Sha1: 
 510a7d89b2d00250230f7cee3ea35a3f64c8de8b 1631 xserver-xorg-video-rendition_4.2.0.dfsg.1-2.dsc
 c193fc81182fcc81f831f2c761d121088f64be81 46640 xserver-xorg-video-rendition_4.2.0.dfsg.1-2.diff.gz
 2599b32617073fe2012ccc23d93039418d613bbf 32026 xserver-xorg-video-rendition_4.2.0.dfsg.1-2_i386.deb
Checksums-Sha256: 
 2febecfdec5731d020c2df6566675daa4e2d7a6b2d60ee73957b279d775d94d0 1631 xserver-xorg-video-rendition_4.2.0.dfsg.1-2.dsc
 bd654f47289c126d8669da31af19552761823370a5e3cf5d952223d0ac78ceb7 46640 xserver-xorg-video-rendition_4.2.0.dfsg.1-2.diff.gz
 54a5d5ab3eaba8fbc6208648a1d393956aa8b868870f72311a8ae827b29b0f55 32026 xserver-xorg-video-rendition_4.2.0.dfsg.1-2_i386.deb
Files: 
 be23a765fbfede1f2a9dc8e63a82b176 1631 x11 optional xserver-xorg-video-rendition_4.2.0.dfsg.1-2.dsc
 1a8857ae4c7086c425d2298e1f4719ee 46640 x11 optional xserver-xorg-video-rendition_4.2.0.dfsg.1-2.diff.gz
 c29d86089f2ef37e37fbd34a45b7023c 32026 x11 optional xserver-xorg-video-rendition_4.2.0.dfsg.1-2_i386.deb

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

iD8DBQFIU/RtRh88F8PcWfoRAiC3AKCMKv798mfRu4DohnwAyRlpFT3jswCgy5jH
NxOhM2OTabbvLBiEJb53dhY=
=LHwK
-----END PGP SIGNATURE-----



--- End Message ---

Reply to: