xorg-server: Changes to 'ubuntu'
debian/changelog | 9 +++++++++
debian/control | 6 ++++--
2 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 979c3f10e68d444d0f91dccba7cc4c52131717ae
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Dec 9 13:31:17 2011 +0200
control: Move input & video virtual package Breaks as Conflicts
because some of the old drivers were demoted to universe which might
not be available on upgrade.
Add Conflicts on -nv and -v4l as well, since they are gone from the
archive. (LP: #902077)
diff --git a/debian/changelog b/debian/changelog
index 5afbb13..f275da3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.10.4-1ubuntu6) precise; urgency=low
+
+ * control: Move input & video virtual package Breaks as Conflicts,
+ because some of the old drivers were demoted to universe which might
+ not be available on upgrade. Add Conflicts on -nv and -v4l as well,
+ since they are gone from the archive. (LP: #902077)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 09 Dec 2011 12:46:55 +0200
+
xorg-server (2:1.10.4-1ubuntu5) precise; urgency=low
* debian/patches/511_Update_border_clip_in_compAllocPixmap.patch:
diff --git a/debian/control b/debian/control
index 88cde28..ec38808 100644
--- a/debian/control
+++ b/debian/control
@@ -93,7 +93,7 @@ Depends:
${misc:Depends},
Recommends: libgl1-mesa-dri (>= 7.10.2-4)
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
-Breaks:
+Conflicts:
xserver-xorg-video,
xserver-xorg-video-1.0,
xserver-xorg-video-1.9,
@@ -106,6 +106,9 @@ Breaks:
xserver-xorg-input-2.1,
xserver-xorg-input-4,
xserver-xorg-input-7,
+ xserver-xorg-video-nv,
+ xserver-xorg-video-v4l,
+Breaks:
xserver-xorg-input-wacom (<< 0.7.8),
xserver-xorg-input-joystick (<= 1:1.5.0-3),
xserver-xorg-input-synaptics (<= 1.2.2-1ubuntu4),
@@ -117,7 +120,6 @@ Breaks:
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-v4l (<< 1:0.2.0),
xserver-xorg-video-vga (<= 1:4.1.0-8),
libgl1-mesa-dri (<< 7.10.2-4),
libgl1-mesa-dri-experimental (<< 7.10.2-4),
Reply to: