xorg: Changes to 'debian-unstable'
debian/changelog | 6 ++++--
debian/control | 35 -----------------------------------
debian/local/xserver-wrapper.c | 2 +-
3 files changed, 5 insertions(+), 38 deletions(-)
New commits:
commit ade85effa21f9c9f353c587823046ec1b1a86c7f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 19 18:11:26 2007 +0200
Fix xserver-wrapper compile error.
Commit ccb9da383be42f87a29e8694d846f839ac05925a introduced a syntax error.
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 967dd67..08e3140 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -323,7 +323,7 @@ main(int argc, char **argv)
}
for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "-config" || !strcmp(argv[i], "-xf86config")) {
+ if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) {
if (setuid(getuid())) {
perror("X unable to drop setuid privileges for alternate config");
exit(1);
commit 1c8e0e225ca182db587ba7a9b870d62fcc8a341d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 2 18:12:53 2007 +0200
Remove a few transitional packages.
xserver-xfree86, xlibmesa-dri, x-window-system and x-window-system-core
were only needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index 9ebfbb7..7a941c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,18 +14,20 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
armeb, armel, m32r, m68k, mips and mipsel; drop alternative dependency on
the obsolete -modesetting drivers on other architectures, and prefer
-intel to -i810.
+ * Drop the xserver-xfree86, xlibmesa-dri, x-window-system and
+ x-window-system-core transitional packages.
[ David Nusinow ]
* Remove the code to migrate old XFree86 templates over to Xorg. You'll have
to install etch now if you're migrating from sarge for your settings to
transition over.
- * Add libgl1-mesa-dri to the xserver-xorg recommends.
+ * Add libgl1-mesa-dri to the xserver-xorg recommends.
Previously, this recommends was in the xorg package, but many people don't
have the xorg package installed (even though they should). Moving it here
makes it far more likely that people will actually have a working DRI.
Thanks Frans Pop. Closes: #433035
- -- David Nusinow <dnusinow@debian.org> Fri, 13 Jul 2007 19:31:00 -0400
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Jul 2007 18:08:51 +0200
xorg (1:7.2-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 09d094d..e590222 100644
--- a/debian/control
+++ b/debian/control
@@ -92,13 +92,6 @@ Description: the X.Org X server
# versioned dependency on xserver-xorg-core needed because xserver-xorg
# contains a patch to allow in-server module defaults in 2:1.2.99.905-3
-
-Package: xserver-xfree86
-Architecture: all
-Depends: xserver-xorg
-Description: transitional package for moving from XFree86 to X.Org
- This package smooths upgrades from Debian 3.1 by depending on xserver-xorg.
-
Package: xserver-xorg-video-all
Architecture: any
Depends: ${F:XServer-Xorg-Video-Depends}
@@ -168,14 +161,6 @@ Description: transitional metapackage
purposes to prevent disruptions during automated package builds, and my be
safely removed from your system.
-Package: xlibmesa-dri
-Section: libs
-Architecture: all
-Depends: libgl1-mesa-dri
-Description: transitional package for Debian etch
- This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
- Debian etch. It may be safely removed from your system.
-
Package: xlibmesa-gl
Section: libs
Architecture: all
@@ -215,23 +200,3 @@ Depends: libglu1-mesa-dev
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
Debian etch. It may be safely removed from your system.
-
-Package: x-window-system
-Section: x11
-Architecture: all
-Depends: xorg
-Description: transitional package for Debian etch
- This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
- Debian etch. It may be safely removed from your system. It depends on the
- xorg package which is the new metapackage for installing the X Window
- System in Debian.
-
-Package: x-window-system-core
-Section: x11
-Architecture: all
-Depends: xorg
-Description: transitional package for Debian etch
- This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
- Debian etch. It may be safely removed from your system. It depends on the
- xorg package which is the new metapackage for installing the X Window
- System in Debian.
Reply to: