xorg: Changes to 'debian-experimental'
debian/changelog | 13 ++++++++++++-
debian/control | 7 ++++---
2 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 9db1cd098522055e86015320595618281f099452
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 18 20:10:35 2007 +0200
Bump driver ABI in xserver-xorg's Depends.
Also stop Recommending the -all driver packages in xserver-xorg.
The Depends on xserver-xorg-*-all | xserver-xorg-*-${abi} should be enough.
diff --git a/debian/changelog b/debian/changelog
index fff1b0b..7dbd466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3~rc1) experimental; urgency=low
+
+ * Bump driver ABI for xserver 1.3.99.0.
+ * xserver-xorg doesn't recommend the drivers anymore, the Depends should be
+ enough.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 18 Aug 2007 20:08:31 +0200
+
xorg (1:7.2.ds3-1) experimental; urgency=low
* Add xutils and xbase-clients transitional packages
diff --git a/debian/control b/debian/control
index 84663a3..07df310 100644
--- a/debian/control
+++ b/debian/control
@@ -82,8 +82,8 @@ Architecture: all
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core (>= 2:1.3.0.0.dfsg-3), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
-Recommends: xserver-xorg-video-all, xserver-xorg-input-all, libgl1-mesa-dri, laptop-detect, xresprobe, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
+Depends: xserver-xorg-core (>= 2:1.3.99.0), xserver-xorg-video-all | xserver-xorg-video-1.9, xserver-xorg-input-all | xserver-xorg-input-0.9, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
+Recommends: libgl1-mesa-dri, laptop-detect, xresprobe, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
commit ebfc3c771d82cb0ae11112123fff0a582db0c324
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 11 19:27:28 2007 +0200
Move xorg-docs from xorg Depends to Recommends
diff --git a/debian/changelog b/debian/changelog
index 8b8da3e..ac0f01e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
closes: #428090.
* Remove mdetect from xserver-xorg Recommends since it does not use
it anymore, thanks Joey Hess (closes: #435588).
+ * Move xorg-docs from xorg Depends to Recommends, closes: #427172.
[ Julien Cristau ]
* xserver-xorg-video-all: don't depend on the intel driver on alpha, arm,
diff --git a/debian/control b/debian/control
index f51853c..b779aa4 100644
--- a/debian/control
+++ b/debian/control
@@ -112,7 +112,8 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: all
-Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), xbase-clients (>= 1:1.0.1-1), xutils (>= 1:1.0.1-1), xkb-data, xterm | x-terminal-emulator, sparc-utils | not+sparc, xorg-docs
+Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), xbase-clients (>= 1:1.0.1-1), xutils (>= 1:1.0.1-1), xkb-data, xterm | x-terminal-emulator, sparc-utils | not+sparc
+Recommends: xorg-docs
Provides: x-window-system, x-window-system-core
Description: X.Org X Window System
This metapackage provides the components for a standalone
commit cdc00b6cf8ad73e3acdc7096b52e7e59dbbb3ab0
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 11 19:17:57 2007 +0200
Remove mdetect from xserver-xorg Recommends
diff --git a/debian/changelog b/debian/changelog
index 7a941c3..8b8da3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
with -xf86config as we do for -config, closes: #323107.
* Update xsfbs to fix displaying of patches applied by quilt,
closes: #428090.
+ * Remove mdetect from xserver-xorg Recommends since it does not use
+ it anymore, thanks Joey Hess (closes: #435588).
[ Julien Cristau ]
* xserver-xorg-video-all: don't depend on the intel driver on alpha, arm,
@@ -27,7 +29,7 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
makes it far more likely that people will actually have a working DRI.
Thanks Frans Pop. Closes: #433035
- -- Julien Cristau <jcristau@debian.org> Thu, 19 Jul 2007 18:08:51 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 11 Aug 2007 19:06:20 +0200
xorg (1:7.2-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e590222..f51853c 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
Depends: xserver-xorg-core (>= 2:1.3.0.0.dfsg-3), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
-Recommends: xserver-xorg-video-all, xserver-xorg-input-all, libgl1-mesa-dri, laptop-detect, xresprobe, mdetect, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
+Recommends: xserver-xorg-video-all, xserver-xorg-input-all, libgl1-mesa-dri, laptop-detect, xresprobe, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
Reply to: