X Strike Force X.Org X11 SVN commit: r1010 - branches/modular/xserver/xorg/debian
Author: dnusinow
Date: 2006-01-04 23:01:39 -0500 (Wed, 04 Jan 2006)
New Revision: 1010
Modified:
branches/modular/xserver/xorg/debian/changelog
branches/modular/xserver/xorg/debian/control
Log:
Add debian packaging changes I had lying around
Modified: branches/modular/xserver/xorg/debian/changelog
===================================================================
--- branches/modular/xserver/xorg/debian/changelog 2006-01-05 03:25:49 UTC (rev 1009)
+++ branches/modular/xserver/xorg/debian/changelog 2006-01-05 04:01:39 UTC (rev 1010)
@@ -3,8 +3,13 @@
* First upload to Debian
* Add bison and flex to the build-depends
* Define INSTALL in debian/rules
+ * Add xserver-xorg-core dependency xf86-video-drivers-all |
+ xf86-video-driver. 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.
- -- David Nusinow <dnusinow@debian.org> Wed, 9 Nov 2005 23:55:02 -0500
+ -- David Nusinow <dnusinow@debian.org> Thu, 22 Dec 2005 13:11:38 -0500
xorg-server (1:0.99.2+cvs.20051025-3) dapper; urgency=low
Modified: branches/modular/xserver/xorg/debian/control
===================================================================
--- branches/modular/xserver/xorg/debian/control 2006-01-05 03:25:49 UTC (rev 1009)
+++ branches/modular/xserver/xorg/debian/control 2006-01-05 04:01:39 UTC (rev 1010)
@@ -12,7 +12,7 @@
Package: xserver-xorg-core
Architecture: any
-Depends: xorg-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: xorg-common, xf86-video-drivers-all | xf86-video-driver, ${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: