Your message dated Thu, 26 Jun 2008 01:02:07 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#485185: fixed in xorg-server 2:1.4.2-1
has caused the Debian Bug report #485185,
regarding xorg-server: 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 [EMAIL PROTECTED]
immediately.)
--
485185: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485185
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: xorg-server
Version: 2:1.4.1~git20080517-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, xorg-server failed, you can try yourself with those
commands (and dpkg-dev >= 1.14.19 [2]) :
$ apt-get source xorg-server
$ sed -i -e '/^Source:/ aFormat: 3.0 (quilt)'
xorg-server-1.4.1~git20080517/debian/control
$ dpkg-source -b xorg-server-1.4.1~git20080517
$ dpkg-source -x xorg-server_1.4.1~git20080517-1.dsc
$ cd xorg-server-1.4.1~git20080517 && 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-2:1.4.1~git20080517-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 xorg-server, 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 "xorg-server-1.4.1~git20080517.orig" and
"b" by "xorg-server-1.4.1~git20080517" 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: xorg-server
Source-Version: 2:1.4.2-1
We believe that the bug you reported is fixed in the latest version of
xorg-server, which is due to be installed in the Debian FTP archive:
xdmx-tools_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xdmx-tools_1.4.2-1_i386.deb
xdmx_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xdmx_1.4.2-1_i386.deb
xnest_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xnest_1.4.2-1_i386.deb
xorg-server_1.4.2-1.diff.gz
to pool/main/x/xorg-server/xorg-server_1.4.2-1.diff.gz
xorg-server_1.4.2-1.dsc
to pool/main/x/xorg-server/xorg-server_1.4.2-1.dsc
xorg-server_1.4.2.orig.tar.gz
to pool/main/x/xorg-server/xorg-server_1.4.2.orig.tar.gz
xprint-common_1.4.2-1_all.deb
to pool/main/x/xorg-server/xprint-common_1.4.2-1_all.deb
xprint_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xprint_1.4.2-1_i386.deb
xserver-xephyr_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xserver-xephyr_1.4.2-1_i386.deb
xserver-xorg-core-dbg_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xserver-xorg-core-dbg_1.4.2-1_i386.deb
xserver-xorg-core_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xserver-xorg-core_1.4.2-1_i386.deb
xserver-xorg-dev_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xserver-xorg-dev_1.4.2-1_i386.deb
xvfb_1.4.2-1_i386.deb
to pool/main/x/xorg-server/xvfb_1.4.2-1_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 [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Julien Cristau <[EMAIL PROTECTED]> (supplier of updated xorg-server 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: Thu, 26 Jun 2008 01:57:18 +0200
Source: xorg-server
Binary: xserver-xorg-core xserver-xorg-dev xdmx xdmx-tools xnest xvfb
xserver-xephyr xprint xprint-common xserver-xorg-core-dbg
Architecture: source all i386
Version: 2:1.4.2-1
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Julien Cristau <[EMAIL PROTECTED]>
Description:
xdmx - distributed multihead X server
xdmx-tools - Distributed Multihead X tools
xnest - Nested X server
xprint - X11 print system (binary)
xprint-common - Xprint - the X11 print system (configuration files)
xserver-xephyr - nested X server
xserver-xorg-core - Xorg X server - core server
xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols)
xserver-xorg-dev - Xorg X server - development files
xvfb - Virtual Framebuffer 'fake' X server
Closes: 404885 433331 466526 473260 478277 485185
Changes:
xorg-server (2:1.4.2-1) unstable; urgency=low
.
[ Julien Cristau ]
* New upstream release.
* Security fixes from the previous upload are included upstream.
* Cherry-pick patches from upstream git to make the LeftOf and Above options
in xorg.conf actually work (closes: #466526).
* 48_xaa_nooffscreenpixmaps.diff: disable XAA offscreen pixmaps by default;
they can be enabled with Option "XaaOffscreenPixmaps" (closes: #478277,
#433331).
* Cherry-pick various patches from upstream for Xorg's modes code:
- add quirks for monitors with broken EDID (closes: #473260)
- fix max clock computation
- inherit the preferred mode from the global configuration (so if you have
Modes "800x600" in the Display subsection the server will honor it
instead of ignoring it)
* Backport patch from upstream git to fix emulation of int1A PCI BIOS
services (closes: #404885). Thanks, Robert de Bath!
.
[ Brice Goglin ]
* Update patches to not require -p0, closes: #485185.
Checksums-Sha1:
a4455c8bd943b3da065f1f8a2b0abdb85da32483 2867 xorg-server_1.4.2-1.dsc
8032716600b649a0c6ca9383af0613614e5cedc2 8246561 xorg-server_1.4.2.orig.tar.gz
7b3f8a80fd7ae092fb61aabbd5d6fd7188585056 655070 xorg-server_1.4.2-1.diff.gz
964c772ca33e34fae869eddd5cb0c120970f32c8 644484 xprint-common_1.4.2-1_all.deb
42ce8beabc601b1aeac54bd3a5a865e1f28aff3b 4113290
xserver-xorg-core_1.4.2-1_i386.deb
91b6f022c500e40925b6495d186c14c2a99b55c9 692016
xserver-xorg-dev_1.4.2-1_i386.deb
053ce34870f201366da653b94deb76814b3387c6 1150412 xdmx_1.4.2-1_i386.deb
f08308082147f09c61e6bb7727539e82716116f0 465694 xdmx-tools_1.4.2-1_i386.deb
1f7cbb7d6509f4e948b35ddd6c3b1a547a0fcb9b 1774238 xnest_1.4.2-1_i386.deb
a3eca4e5e3b0946c8b2084a8a8920724b6b28c4b 1889608 xvfb_1.4.2-1_i386.deb
b5a2eb34a314044faddd4501c00949a3bf0232e9 1926352
xserver-xephyr_1.4.2-1_i386.deb
bd6ef234fe1580f5175874cd0307d3b300d2399d 1570938 xprint_1.4.2-1_i386.deb
6568faab838d27b9601cb32f7b3f0ed5f5998425 12559840
xserver-xorg-core-dbg_1.4.2-1_i386.deb
Checksums-Sha256:
4c33f7b9c7229ab8e6c0d3d03c446637bcf9c5c2166e6dee093b0ae1bad8f182 2867
xorg-server_1.4.2-1.dsc
632df2c8d9a4f9fe3183beda736d2381af6feb861d5df077edea94002f96eeec 8246561
xorg-server_1.4.2.orig.tar.gz
17480a3d80077bd666176dfbdfe3429ce348b0c380ae8e45218f8a1780c287a0 655070
xorg-server_1.4.2-1.diff.gz
3eae8a4e190b6d596ee0f83fc7c9b20bd04a057aa5fcdc211e9e56c7e272e4c1 644484
xprint-common_1.4.2-1_all.deb
6ad689c3b54ae228d40ac9289907cd0e94f34d8299a082b05c9c7aa102f0fbf5 4113290
xserver-xorg-core_1.4.2-1_i386.deb
9ba426c087313d8efabb1dea25c6a18c3bc8f40143492c1abb7c20512b11b321 692016
xserver-xorg-dev_1.4.2-1_i386.deb
15930012b9e0fb60de7345f7938c287b6cbeae132dc423fb782e30cfcf7621a9 1150412
xdmx_1.4.2-1_i386.deb
633ca4e69f6302917a00634033c5adbf1deba323a94eb81a3679e41d37fc851b 465694
xdmx-tools_1.4.2-1_i386.deb
ef5da7fd1ea89673241742b029476b8d801416ec5dbd5d9294241c984e2f6008 1774238
xnest_1.4.2-1_i386.deb
ff0805823513d2032f137bc77a5a46ea8ebb8f817269e3edd34c93a721958536 1889608
xvfb_1.4.2-1_i386.deb
458d4ae48d1af8d854ef358abd6425e875e75952de32623bf2fa7cd93d9906ee 1926352
xserver-xephyr_1.4.2-1_i386.deb
199161220e869611c1d1e218ad602c9b21e5101fb41723261cd6512fb104d6c4 1570938
xprint_1.4.2-1_i386.deb
3550e5ddf36bf5a6ea1374e75afa6caa2135b0d9b84608351ed051033a038b58 12559840
xserver-xorg-core-dbg_1.4.2-1_i386.deb
Files:
f31aafd1b808cf6f84ffd07e7e2bb367 2867 x11 optional xorg-server_1.4.2-1.dsc
5f2f5e23bac5b8a1dfd9462768618021 8246561 x11 optional
xorg-server_1.4.2.orig.tar.gz
a11731fea0e22e51ea90a87be99e1358 655070 x11 optional
xorg-server_1.4.2-1.diff.gz
b51034865db06c55a8c1dfb952065250 644484 x11 optional
xprint-common_1.4.2-1_all.deb
8ea8e621aed13b790e6966fc67d455b0 4113290 x11 optional
xserver-xorg-core_1.4.2-1_i386.deb
c6c710ddda7984044fa652f309ba29a3 692016 x11 optional
xserver-xorg-dev_1.4.2-1_i386.deb
7f07571ac292503abf77b4b81d97623a 1150412 x11 optional xdmx_1.4.2-1_i386.deb
d89add36e467568c73d8272442f2bc44 465694 x11 optional
xdmx-tools_1.4.2-1_i386.deb
f85416ad7a4724604852ab6a953737dd 1774238 x11 optional xnest_1.4.2-1_i386.deb
23c10cceb7cfbbaf6e37f659c7a4cbba 1889608 x11 optional xvfb_1.4.2-1_i386.deb
874bf75ef03e2eb8920774494436d089 1926352 x11 optional
xserver-xephyr_1.4.2-1_i386.deb
33a26332ef87d8063354b76ed53217cc 1570938 x11 optional xprint_1.4.2-1_i386.deb
db104157fc5512d04e142981e5886ecc 12559840 x11 extra
xserver-xorg-core-dbg_1.4.2-1_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkhi44kACgkQmEvTgKxfcAymiACcDXmQR8/LXyeNfplm7FVHivPi
JXwAnRRYB4jgh2NkwHPly+vWqi6LDYKJ
=o+TL
-----END PGP SIGNATURE-----
--- End Message ---