xorg: Changes to 'debian-experimental'
debian/changelog | 3 +++
debian/control | 3 +--
debian/x11-common.install | 1 -
debian/xserver-xorg.install | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 0d32d36b2eb9f8ab85bcd19c7199fa9dac0e73f3
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 18 14:35:27 2008 +0100
Move dexconf from x11-common to xserver-xorg.
* Move dexconf from x11-common to xserver-xorg.
* Remove pre-dependency on x11-common from xserver-xorg.
* Bump x11-common's conflict with xserver-xorg to << 1:7.4~.
diff --git a/debian/changelog b/debian/changelog
index c90eb6b..67eadfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ xorg (1:7.4~1) UNRELEASED; urgency=low
* Bump videoabi to 2.9, inputabi to 2.1.
* xserver 1.5 doesn't use an external rgb database, don't bother installing
it.
+ * Move dexconf from x11-common to xserver-xorg.
+ * Remove pre-dependency on x11-common from xserver-xorg.
+ * Bump x11-common's conflict with xserver-xorg to << 1:7.4~.
-- Julien Cristau <jcristau@debian.org> Sat, 08 Mar 2008 05:25:16 +0100
diff --git a/debian/control b/debian/control
index c134071..84d7e17 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ 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,
- xserver-xorg (<< 1:7.3+11), xserver-xfree86 (<< 1:7.0),
+ xserver-xorg (<< 1:7.4~), 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),
groff (<= 1.18.1.1-7), hfsutils-tcltk (<= 3.2.6-7), login.app (<= 1.2.1-18),
@@ -81,7 +81,6 @@ 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)
-Pre-Depends: x11-common (>= 1:7.3+3)
Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all | xserver-xorg-video-2.9, xserver-xorg-input-all | xserver-xorg-input-2.1, ${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
diff --git a/debian/x11-common.install b/debian/x11-common.install
index c509195..8753b84 100644
--- a/debian/x11-common.install
+++ b/debian/x11-common.install
@@ -1,4 +1,3 @@
-debian/local/dexconf usr/bin
debian/local/Xsession etc/X11
debian/local/Xsession.d/* etc/X11/Xsession.d
debian/local/Xsession.options etc/X11
diff --git a/debian/xserver-xorg.install b/debian/xserver-xorg.install
index 3e06580..6b050ed 100644
--- a/debian/xserver-xorg.install
+++ b/debian/xserver-xorg.install
@@ -1 +1,2 @@
debian/local/X usr/bin
+debian/local/dexconf usr/bin
Reply to: