debian/changelog | 6 ++++++
debian/control | 24 ++++++++++++++++++------
2 files changed, 24 insertions(+), 6 deletions(-)
New commits:
commit bd285a84d4c3b03e77af60ef98b0c2e73f1f54b3
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Sep 29 21:59:06 2009 +0200
Add missing Conflicts on xserver-xorg-video-5 and xserver-xorg-input-4.
diff --git a/debian/changelog b/debian/changelog
index b8514ac..57aa91f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.6.99.903-2) UNRELEASED; urgency=low
+
+ * Add missing Conflicts on xserver-xorg-video-5 and xserver-xorg-input-4.
+
+ -- Julien Cristau <jcris...@debian.org> Tue, 29 Sep 2009 21:58:49 +0200
+
xorg-server (2:1.6.99.903-1) experimental; urgency=low
* New upstream snapshot.
diff --git a/debian/control b/debian/control
index 727e49b..6cfbc87 100644
--- a/debian/control
+++ b/debian/control
@@ -89,9 +89,11 @@ Conflicts:
xserver-xorg-video-1.9,
xserver-xorg-video-2,
xserver-xorg-video-4,
+ xserver-xorg-video-5,
xserver-xorg-input,
xserver-xorg-input-2,
xserver-xorg-input-2.1,
+ xserver-xorg-input-4,
xserver-xorg-input-wacom (<< 0.7.8),
Replaces:
xserver-xorg (<< 6.8.2-38),
commit fc3e667e51bb1ead98043f40936a449b5d735e52
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Sep 29 21:56:58 2009 +0200
Wrap xserver-xorg-core's Conflicts and Replaces control fields
diff --git a/debian/control b/debian/control
index 8a77196..727e49b 100644
--- a/debian/control
+++ b/debian/control
@@ -80,12 +80,22 @@ Architecture: any
Depends: xserver-common (>> 7), ${shlibs:Depends}, ${misc:Depends},
xserver-xorg
Recommends: xkb-data, libgl1-mesa-dri (>= 7.1~rc1)
Suggests: xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable
-Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
- xserver-xorg-video, xserver-common (<< 7), xserver-xorg-video-1.0,
xserver-xorg-input,
- xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8),
- xserver-xorg-video-2, xserver-xorg-input-2,
- xserver-xorg-video-4, xserver-xorg-input-2.1
-Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
+Conflicts:
+ xserver-xorg (<< 6.8.2-38),
+ xserver-xfree86 (<< 1:7.0.0),
+ xserver-common (<< 7),
+ xserver-xorg-video,
+ xserver-xorg-video-1.0,
+ xserver-xorg-video-1.9,
+ xserver-xorg-video-2,
+ xserver-xorg-video-4,
+ xserver-xorg-input,
+ xserver-xorg-input-2,
+ xserver-xorg-input-2.1,
+ xserver-xorg-input-wacom (<< 0.7.8),
+Replaces:
+ xserver-xorg (<< 6.8.2-38),
+ xserver-xfree86 (<< 1:7.0.0),
xserver-common (<< 7)
Provides: xserver
Description: Xorg X server - core server
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
