debian/changelog | 29 +++++++++++++++++++++++++++--
debian/control | 19 ++++++++++++++++++-
2 files changed, 45 insertions(+), 3 deletions(-)
New commits:
commit 02da17a21d4ca01a916444de4a191caaafa41eb8
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Thu Sep 9 13:05:16 2010 +1000
Merge upgrade-fixing uploads into git
diff --git a/debian/changelog b/debian/changelog
index 5d2d8e7..c89967e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,36 @@
-xorg-server (2:1.9.0-0ubuntu3) UNRELEASED; urgency=low
-
+xorg-server (2:1.9.0-0ubuntu6) UNRELEASED; urgency=low
+
* Fix udev USB product ID parsing (LP: #628214)
- debian/patches:
+ 205_udev-product-ids.patch
-- Chase Douglas <chase.doug...@ubuntu.com> Wed, 01 Sep 2010 16:28:23 -0400
+xorg-server (2:1.9.0-0ubuntu5) maverick; urgency=low
+
+ * debian/control:
+ - fix duplicated breaks for xserver-xorg-video-v4l
+
+ -- Michael Vogt <michael.v...@ubuntu.com> Wed, 08 Sep 2010 10:57:49 +0200
+
+xorg-server (2:1.9.0-0ubuntu4) maverick; urgency=low
+
+ * debian/control:
+ - add more "breaks" for leftover drivers that have no
+ xserver 1.9 abi version, thanks to Jean-Baptiste Lallement
+ (LP: #614993)
+
+ -- Michael Vogt <michael.v...@ubuntu.com> Tue, 31 Aug 2010 10:52:29 +0200
+
+xorg-server (2:1.9.0-0ubuntu3) maverick; urgency=low
+
+ * debian/control:
+ - add additional breaks for video drivers that have no ABI for
+ xserver 1.9 (LP: #614993)
+ - merge the "breaks" list from the debian git tree
+
+ -- Michael Vogt <michael.v...@ubuntu.com> Tue, 31 Aug 2010 10:04:01 +0200
+
xorg-server (2:1.9.0-0ubuntu2) maverick; urgency=low
* debian/control:
diff --git a/debian/control b/debian/control
index c1e2aee..b8828be 100644
--- a/debian/control
+++ b/debian/control
@@ -111,7 +111,24 @@ Breaks:
xserver-xorg-input-tslib (<= 0.0.6-3),
xserver-xorg-input-vmmouse (<= 1:12.6.5-4ubuntu2),
xserver-xorg-input-wacom (<= 0.10.5+20100415-1),
- xserver-xorg-video-v4l (<< 1:0.2.0-4ubuntu1)
+# from the debian-git
+ xserver-xorg-video-cyrix (<= 1:1.1.0-8),
+ xserver-xorg-video-i810 (<< 2:2.4),
+ xserver-xorg-video-imstt (<= 1:1.1.0-7),
+ xserver-xorg-video-nsc (<= 1:2.8.3-4),
+ xserver-xorg-video-sunbw2 (<= 1:1.1.0-5),
+ xserver-xorg-video-vga (<= 1:4.1.0-8),
+# unavailable for abi-8 in ubuntu
+ xserver-xorg-video-v4l (<< 1:0.2.0-4ubuntu1),
+ xserver-xorg-video-dummy (<= 1:0.3.3-2build1),
+ xserver-xorg-video-radeonhd (<= 1.3.0-2),
+ xserver-xorg-video-glamo (<= 0.0.0+20091108.git9918e082-1),
+ xserver-xorg-video-glide (<= 1.0.3-2),
+# leftovers from hardy
+ xserver-xorg-video-newport (<= 1:0.2.1-4ubuntu1),
+ xserver-xorg-video-psb (<= 0.2.1-1ubuntu3),
+ xserver-xorg-video-tga (<= 1:1.1.0-9ubuntu1),
+ xserver-xorg-video-unichrome (<= 1:0.2.6.99-0ubuntu1),
Provides:
xserver,
${videoabi},
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1otxwk-0000fz...@alioth.debian.org
