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

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

Your message dated Tue, 09 Sep 2008 00:32:09 +0000
with message-id <E1Kcr9N-0003tq-KQ@ries.debian.org>
and subject line Bug#485360: fixed in xterm 236-1
has caused the Debian Bug report #485360,
regarding xterm: 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.)


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

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

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

xterm_236-1.diff.gz
  to pool/main/x/xterm/xterm_236-1.diff.gz
xterm_236-1.dsc
  to pool/main/x/xterm/xterm_236-1.dsc
xterm_236-1_i386.deb
  to pool/main/x/xterm/xterm_236-1_i386.deb
xterm_236.orig.tar.gz
  to pool/main/x/xterm/xterm_236.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 485360@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julien Cristau <jcristau@debian.org> (supplier of updated xterm 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: Tue, 09 Sep 2008 01:21:27 +0100
Source: xterm
Binary: xterm
Architecture: source i386
Version: 236-1
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Julien Cristau <jcristau@debian.org>
Description: 
 xterm      - X terminal emulator
Closes: 454202 485360
Changes: 
 xterm (236-1) unstable; urgency=low
 .
   [ Brice Goglin ]
   * Update patches to not use -p0, closes: #485360.
 .
   [ Julien Cristau ]
   * New upstream release.
     + fixes for vt100-style character sets in UTF-8 mode (LP: #230919)
   * Handle parallel=n in DEB_BUILD_OPTIONS.
   * Don't call dh_makeshlibs.
   * Configure with --enable-dabbrev (closes: #454202).
   * Update copyright date to 2008 in debian/copyright for Thomas E. Dickey's
     contributions.
Checksums-Sha1: 
 0f549766dcccd9e9e4a50782b6afde9e2bc13911 1344 xterm_236-1.dsc
 5219f67149d223b214c4e2353fb970ed95e58c76 859451 xterm_236.orig.tar.gz
 a995986d98be9931086491213ba69e1975d3767f 62378 xterm_236-1.diff.gz
 9e1f6aa34c7209d8667e8acf979ffb8a6f8fe42f 473276 xterm_236-1_i386.deb
Checksums-Sha256: 
 68d55d170679b4fee221f50a7919f679a7e8d3c2e101a20910265e9286449143 1344 xterm_236-1.dsc
 80a2e78ba7dfe39326697be5dc9e7cd840b6053c6cb9687d67479dd6e9c2ee13 859451 xterm_236.orig.tar.gz
 93d90cc359ce4a2dc99a826f9865d7968b6afeba279a0ebdabdd96185648da08 62378 xterm_236-1.diff.gz
 f00a16b99d7185289f9872a9ad9534bb864f36e8459e8eb82436eb71d099e41e 473276 xterm_236-1_i386.deb
Files: 
 450f1c727fceda140ab093283a070d4c 1344 x11 optional xterm_236-1.dsc
 204288c9de867679fc8201f4fb153772 859451 x11 optional xterm_236.orig.tar.gz
 f89e501067bdb4291d3f1d1b8b216e8b 62378 x11 optional xterm_236-1.diff.gz
 a4a2dde42b420cea1e71686800055cdf 473276 x11 optional xterm_236-1_i386.deb

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

iEYEARECAAYFAkjFwwUACgkQmEvTgKxfcAwLpgCeKNtLo56Q8fqhfDfgEBkU+7W9
qWMAoKlv4gSuWr8uMN2OEFE5iJh3wjNy
=QP0s
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: