xorg: Changes to 'debian-unstable'
debian/changelog | 8 ++++++--
debian/control | 8 ++++----
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 36a1514e636c8b96d30d638b958927601ee1bd03
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 5 20:26:14 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index bfc6ecc..9875bbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.3+18) UNRELEASED; urgency=low
+xorg (1:7.3+18) unstable; urgency=low
[ Debconf translations ]
* Wolof. Closes: #500669
@@ -7,7 +7,7 @@ xorg (1:7.3+18) UNRELEASED; urgency=low
* Version the Replaces/Conflicts on xserver-common, so we can reintroduce it
later if needed.
- -- Christian Perrier <bubulle@debian.org> Tue, 30 Sep 2008 20:24:47 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 05 Oct 2008 20:26:08 +0200
xorg (1:7.3+17) unstable; urgency=low
commit 99224fac737261ac394c4d9fdbce8d12bf0670d2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 5 20:25:07 2008 +0200
Version the Replaces/Conflicts on xserver-common
This should make it easier to reintroduce it later if needed.
diff --git a/debian/changelog b/debian/changelog
index 64ec66d..bfc6ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xorg (1:7.3+18) UNRELEASED; urgency=low
[ Debconf translations ]
* Wolof. Closes: #500669
+ [ Julien Cristau ]
+ * Version the Replaces/Conflicts on xserver-common, so we can reintroduce it
+ later if needed.
+
-- Christian Perrier <bubulle@debian.org> Tue, 30 Sep 2008 20:24:47 +0200
xorg (1:7.3+17) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b448a78..c49fc75 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Package: x11-common
Architecture: all
Depends: ${misc:Depends}, debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2)
Pre-Depends: debconf | debconf-2.0
-Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
+Conflicts: xfree86-common, xorg-common, xserver-common (<< 7), x-common,
xserver-xorg (<< 1:7.3+11), xserver-xfree86 (<< 1:7.0),
libxft-dev (<= 2.1.8.2-5), aee (<= 2.2.15b-1), ascd (<= 0.13.2-3),
bibview (<= 2.2-8), fvwm1 (<= 1.24r-46), grace (<= 1:5.1.18-1),
@@ -64,7 +64,7 @@ Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
ucbmpeg-play (<< 2.3p-13), netscape-base-4, communicator-smotif-477, epan,
navigator-smotif-477, stella (<< 2.2-1), xfractint (<< 20.3.01-1), xgobi,
xpostitplus, xisp, vide (<= 1.21-3)
-Replaces: xfree86-common, xorg-common, xserver-common, x-common
+Replaces: xfree86-common, xorg-common, xserver-common (<< 7), x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
@@ -79,8 +79,8 @@ Description: X Window System (X.Org) infrastructure
Package: xserver-xorg
Architecture: any
-Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common, x11-common (<< 1:7.3+11)
-Replaces: xserver-common, x11-common (<< 1:7.3+11)
+Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-common (<< 1:7.3+11)
+Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all | xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2, ${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
Reply to: