Author: branden
Date: 2006-09-19 12:08:55 -0400 (Tue, 19 Sep 2006)
New Revision: 3375
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.config.in
Log:
In the config script, munge the source package version into the upstream
version so we can tell Discover what to look for. Discover's data is
based on the upstream version number, not the Debian package's, so strip
the Debian revision and the (ugh!) epoch. The introduction of the epoch
caused the config script to start passing Discover a data version that
wouldn't match anything, because the epoch is not part of the upstream
version number. Thanks to Thomas Lange for diagnosing this bug!
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-09-19 03:00:23 UTC (rev 3374)
+++ trunk/debian/xorg/debian/changelog 2006-09-19 16:08:55 UTC (rev 3375)
@@ -57,8 +57,17 @@
* Sync experimental version to unstable for X11R7.1 transition.
* Use dh_installman to install man pages. Closes: #368316, #375391, #376764.
- -- Drew Parsons <[EMAIL PROTECTED]> Mon, 18 Sep 2006 22:00:54 +1000
+ [ Branden Robinson ]
+ * In the config script, munge the source package version into the upstream
+ version so we can tell Discover what to look for. Discover's data is
+ based on the upstream version number, not the Debian package's, so strip
+ the Debian revision and the (ugh!) epoch. The introduction of the epoch
+ caused the config script to start passing Discover a data version that
+ wouldn't match anything, because the epoch is not part of the upstream
+ version number. Thanks to Thomas Lange for diagnosing this bug!
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 19 Sep 2006 12:03:25 -0400
+
xorg (1:7.1.0~1) experimental; urgency=low
[ Drew Parsons ]
Modified: trunk/debian/xorg/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.config.in 2006-09-19 03:00:23 UTC
(rev 3374)
+++ trunk/debian/xorg/debian/xserver-xorg.config.in 2006-09-19 16:08:55 UTC
(rev 3375)
@@ -1,6 +1,6 @@
#!/bin/sh
# Debian xserver-xorg package configuration script
-# Copyright 2000-2004 Branden Robinson.
+# Copyright 2000-2004, 2006 Branden Robinson.
# Copyright 2004-2005 Canonical Ltd.
# Authors: Branden Robinson, Fabio Massimo Di Nitto, Daniel Stone.
# Licensed under the GNU General Public License, version 2. See the file
@@ -152,13 +152,21 @@
SERVER_FILE=$(tempfile)
DRIVER_FILE=$(tempfile)
+ # Munge the source package version into the upstream version so we can
+ # tell Discover what to look for. Discover's data is based on the
+ # upstream version number, not the Debian package's, so strip the Debian
+ # revision and the (ugh!) epoch. Note: do *not* do greedy matching.
+ # Also, parameter expansions aren't nestable. No respect, I tell ya.
+ _JUNK=${SOURCE_VERSION%-*}
+ UPSTREAM_VERSION=${_JUNK#*:}
+
CMD="discover --type-summary display"
eval $CMD >>$VENDOR_MODEL_FILE || debug_report_status "$CMD" "$?"
CMD="discover --data-path=xfree86/server/name \
- --data-version=${SOURCE_VERSION%-*} display"
+ --data-version=$UPSTREAM_VERSION display"
eval $CMD >>$SERVER_FILE || debug_report_status "$CMD" "$?"
CMD="discover --data-path=xfree86/server/device/driver \
- --data-version=${SOURCE_VERSION%-*} display"
+ --data-version=$UPSTREAM_VERSION display"
eval $CMD >>$DRIVER_FILE || debug_report_status "$CMD" "$?"
DISCOVERED_VIDEO=$(paste $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
