debian/changelog | 12 ++++++++++++
debian/control | 9 ++++++++-
debian/xserver-xorg.postinst.in | 2 +-
3 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit d51464418d3bfca1253feb88ab9ea4a83cbd03e0
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Thu Dec 6 19:37:00 2007 +0200
xserver-xorg.postinst.in: Narrow down the drivers to filter from the list,
because otherwise radeonhd would not be selectable
https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/174311
diff --git a/debian/changelog b/debian/changelog
index 7c707ad..5ba3a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,11 @@ xorg (1:7.3+7ubuntu3) UNRELEASED; urgency=low
* Add "xserver-xorg-driver-all" transitional package to make
dapper->hardy upgrades work.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 06 Dec 2007 00:06:06 +0200
+ [ Tormod Volden ]
+ * xserver-xorg.postinst.in: Narrow down the drivers to filter from the list,
+ because otherwise radeonhd would not be selectable. (LP: #174311)
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 06 Dec 2007 19:33:18 +0200
xorg (1:7.3+7ubuntu2) hardy; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index b7b8a1c..6818583 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -742,7 +742,7 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
# v4l is not a display driver, and dummy is for advanced users.
DRIVER_LIST="$(find $REAL_DRIVER_DIRS -name '*_drv.*' \
| sed 's|^.*/\([^/]*\)_drv\.[^\._]*|\1|g' \
- | egrep -v '(atimisc|dummy|r128|radeon|v4l)' | sort -u
| xargs \
+ | egrep -v '^(atimisc|dummy|r128|radeon|v4l)$' | sort
-u | xargs \
| sed 's/ /, /g' 2>/dev/null) "
fi
commit 95a951cf86d46d164dba0ca105687123c09e7cfb
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Thu Dec 6 00:08:19 2007 +0200
Add "xserver-xorg-driver-all" transitional package to make dapper->hardy
upgrades work.
diff --git a/debian/changelog b/debian/changelog
index 8147d0b..7c707ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3+7ubuntu3) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * Add "xserver-xorg-driver-all" transitional package to make
+ dapper->hardy upgrades work.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 06 Dec 2007 00:06:06 +0200
+
xorg (1:7.3+7ubuntu2) hardy; urgency=low
* dexconf: purge unneeded cruft. Restricted-manager no longer needs
diff --git a/debian/control b/debian/control
index 6dfdba8..c7f9a66 100644
--- a/debian/control
+++ b/debian/control
@@ -95,12 +95,19 @@ Package: xserver-xorg-video-all
Architecture: any
Depends: ${F:XServer-Xorg-Video-Depends}, x11-common
Replaces: xserver-xorg-driver-all
-Conflicts: xserver-xorg-driver-all
Description: the X.Org X server -- output driver metapackage
This package depends on the full suite of output drivers for the X.Org X
server
(Xorg). It does not provide any drivers itself, and may be removed if you
wish
to only have certain drivers installed.
+Package: xserver-xorg-driver-all
+Architecture: any
+Depends: ${F:XServer-Xorg-Video-Depends}
+Description: the X.Org X server -- output driver transitional metapackage
+ This package depends on the full suite of output drivers for the X.Org X
server
+ (Xorg). It does not provide any drivers itself, and may be removed if you
wish
+ to only have certain drivers installed.
+
Package: xserver-xorg-input-all
Architecture: any
Depends: ${F:XServer-Xorg-Input-Depends}, x11-common
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
