X Strike Force X.Org X11 SVN commit: r1186 - branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian
Author: dnusinow
Date: 2006-02-09 22:44:21 -0500 (Thu, 09 Feb 2006)
New Revision: 1186
Modified:
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/control
Log:
Implement driver name change in the xserver so it actually depends on the right packages
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-02-10 03:40:14 UTC (rev 1185)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-02-10 03:44:21 UTC (rev 1186)
@@ -3,8 +3,8 @@
* First upload to Debian
* Add bison and flex to the build-depends
* Define INSTALL in debian/rules
- * Add xserver-xorg-core dependency xorg-video-drivers-all |
- xorg-video-driver. The former is a metapackage that depends on all the
+ * Add xserver-xorg-core dependency xserver-xorg-video-all |
+ xserver-xorg-video. The former is a metapackage that depends on all the
video drivers we ship and the latter is a virtual package that each video
driver provides. This scheme will install the metapackage by default but
will permit any single video driver to satsify the dependency. Do the same
@@ -13,7 +13,7 @@
* Deal with mesa packaging rename: build-dep on mesa-swrast-source ->
mesa-swx11-source
- -- David Nusinow <dnusinow@debian.org> Sun, 29 Jan 2006 15:20:28 -0500
+ -- David Nusinow <dnusinow@debian.org> Thu, 9 Feb 2006 22:42:56 -0500
xorg-server (1:0.99.2+cvs.20051025-3) dapper; urgency=low
Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/control
===================================================================
--- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/control 2006-02-10 03:40:14 UTC (rev 1185)
+++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/control 2006-02-10 03:44:21 UTC (rev 1186)
@@ -12,7 +12,7 @@
Package: xserver-xorg-core
Architecture: any
-Depends: xorg-common, xorg-video-drivers-all | xorg-video-driver, xorg-input-drivers-all | xorg-input-driver, ${shlibs:Depends}, ${misc:Depends}
+Depends: xorg-common, xserver-xorg-video-all | xserver-xorg-video, xserver-xorg-input-all | xserver-xorg-input, ${shlibs:Depends}, ${misc:Depends}
Recommends: xkeyboard-config
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86
Reply to: