Author: dnusinow
Date: 2006-02-09 22:10:41 -0500 (Thu, 09 Feb 2006)
New Revision: 1182
Modified:
branches/modular/debian/xorg/debian/changelog
branches/modular/debian/xorg/debian/control
branches/modular/debian/xorg/debian/rules
branches/modular/debian/xorg/debian/scripts/vars
branches/modular/debian/xorg/debian/scripts/vars.amd64
branches/modular/debian/xorg/debian/scripts/vars.hppa
branches/modular/debian/xorg/debian/scripts/vars.i386
branches/modular/debian/xorg/debian/scripts/vars.ia64
branches/modular/debian/xorg/debian/scripts/vars.powerpc
branches/modular/debian/xorg/debian/scripts/vars.sparc
Log:
* After consultation with Daniels, since we're going to have multiple X
servers in the repo soon enough, we need to differentiate the drivers for
them. As such, the drivers will be named
xserver-<servername>-<drivertype>. So we'll have xserver-xorg-video and
xserver-xorg-input, with the metapackages being xserver-xorg-video-all
and xserver-xorg-input-all. Ideally we'd have -driver- in there too, but
it's way too long. This change implements this in the xorg package.
Modified: branches/modular/debian/xorg/debian/changelog
===================================================================
--- branches/modular/debian/xorg/debian/changelog 2006-02-09 16:08:24 UTC
(rev 1181)
+++ branches/modular/debian/xorg/debian/changelog 2006-02-10 03:10:41 UTC
(rev 1182)
@@ -7,12 +7,11 @@
+ shell-lib.sh deleted in favor of xsfbs/xsfbs.sh
+ use targets for script generation and such from xsfbs/xsfbs.mk
* Change driver metapackage naming to match individual packages:
- + xserver-xorg-driver -> xorg-video-driver
- + xserver-xorg-input -> xorg-input-driver
+ + xserver-xorg-driver -> xserver-xorg-video
+ Update the packaging variables that define arch-specific drivers to
include in the metapackage as well to match these names
- -- David Nusinow <[EMAIL PROTECTED]> Wed, 8 Feb 2006 21:18:23 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Thu, 9 Feb 2006 22:05:20 -0500
xorg (7.0.0-0ubuntu14) dapper; urgency=low
Modified: branches/modular/debian/xorg/debian/control
===================================================================
--- branches/modular/debian/xorg/debian/control 2006-02-09 16:08:24 UTC (rev
1181)
+++ branches/modular/debian/xorg/debian/control 2006-02-10 03:10:41 UTC (rev
1182)
@@ -26,22 +26,22 @@
Package: xserver-xorg
Architecture: all
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core, xorg-video-drivers-all | xorg-video-driver,
xorg-input-drivers-all | xorg-input-driver, x11-common, laptop-detect,
xresprobe, mdetect, discover1
+Depends: xserver-xorg-core, xserver-xorg-video-all | xserver-xorg-video,
xserver-xorg-input-all | xserver-xorg-input, x11-common, laptop-detect,
xresprobe, mdetect, discover1
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
xorg.conf. It does not provide the actual server itself, but removing it
is strongly discouraged.
-Package: xorg-video-drivers-all
+Package: xserver-xorg-video-all
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel
powerpc sparc
-Depends: ${F:XServer-Xorg-Driver-Depends}
+Depends: ${F:XServer-Xorg-Video-Depends}
Description: the X.Org X server -- output driver metapackage
This package depends on the full suite of output drivers for the X.Org X
server
(Xorg). It does not provide any drivers itself, and may be removed if you
wish
to only have certain drivers installed.
-Package: xorg-input-drivers-all
+Package: xserver-xorg-input-all
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel
powerpc sparc
Depends: ${F:XServer-Xorg-Input-Depends}
Description: the X.Org X server -- input driver metapackage
Modified: branches/modular/debian/xorg/debian/rules
===================================================================
--- branches/modular/debian/xorg/debian/rules 2006-02-09 16:08:24 UTC (rev
1181)
+++ branches/modular/debian/xorg/debian/rules 2006-02-10 03:10:41 UTC (rev
1182)
@@ -107,8 +107,8 @@
dh_fixperms
dh_installdeb
dh_shlibdeps
- dh_gencontrol --
-VF:XServer-Xorg-Driver-Depends=$(XORG_VIDEO_DRIVER_DEPENDS) \
-
-VF:XServer-Xorg-Input-Depends=$(XORG_INPUT_DRIVER_DEPENDS) \
+ dh_gencontrol --
-VF:XServer-Xorg-Driver-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \
+
-VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \
-VServer-ABI-Version=$(SERVERABIBUMP)
dh_md5sums
dh_builddeb
Modified: branches/modular/debian/xorg/debian/scripts/vars
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars 2006-02-09 16:08:24 UTC
(rev 1181)
+++ branches/modular/debian/xorg/debian/scripts/vars 2006-02-10 03:10:41 UTC
(rev 1182)
@@ -12,6 +12,6 @@
# STAMP_DIR is where to place all the 'stamp' files that allows
# debian/rules to know when certain targets are done.
-XORG_INPUT_DRIVER_DEPENDS="xorg-input-driver-evdev, xorg-input-driver-kbd,
xorg-input-driver-mouse"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd,
xserver-xorg-input-mouse"
-# , xorg-input-driver-wacom
+# , xserver-xorg-input-wacom
Modified: branches/modular/debian/xorg/debian/scripts/vars.amd64
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.amd64 2006-02-09
16:08:24 UTC (rev 1181)
+++ branches/modular/debian/xorg/debian/scripts/vars.amd64 2006-02-10
03:10:41 UTC (rev 1182)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XORG_VIDEO_DRIVER_DEPENDS="xorg-video-driver-apm, xorg-video-driver-ark,
xorg-video-driver-ati, xorg-video-driver-chips, xorg-video-driver-cirrus,
xorg-video-driver-cyrix, xorg-video-driver-dummy, xorg-video-driver-fbdev,
xorg-video-driver-glint, xorg-video-driver-i128, xorg-video-driver-i810,
xorg-video-driver-mga, xorg-video-driver-neomagic, xorg-video-driver-nv,
xorg-video-driver-rendition, xorg-video-driver-s3, xorg-video-driver-s3virge,
xorg-video-driver-savage, xorg-video-driver-siliconmotion,
xorg-video-driver-sis, xorg-video-driver-sisusb, xorg-video-driver-tdfx,
xorg-video-driver-tga, xorg-video-driver-trident, xorg-video-driver-tseng,
xorg-video-driver-vesa, xorg-video-driver-via, xorg-video-driver-voodoo,
xorg-video-driver-vga"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark,
xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus,
xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev,
xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i810,
xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv,
xserver-xorg-video-rendition, xserver-xorg-video-s3,
xserver-xorg-video-s3virge, xserver-xorg-video-savage,
xserver-xorg-video-siliconmotion, xserver-xorg-video-sis,
xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga,
xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa,
xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vga"
-# xorg-video-driver-v4l,
+# xserver-xorg-video-v4l,
Modified: branches/modular/debian/xorg/debian/scripts/vars.hppa
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.hppa 2006-02-09
16:08:24 UTC (rev 1181)
+++ branches/modular/debian/xorg/debian/scripts/vars.hppa 2006-02-10
03:10:41 UTC (rev 1182)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XORG_VIDEO_DRIVER_DEPENDS="xorg-video-driver-ati, xorg-video-driver-chips,
xorg-video-driver-fbdev, xorg-video-driver-glint, xorg-video-driver-imstt,
xorg-video-driver-mga, xorg-video-driver-nv, xorg-video-driver-s3,
xorg-video-driver-s3virge, xorg-video-driver-savage, xorg-video-driver-sis,
xorg-video-driver-tdfx, xorg-video-driver-trident, xorg-video-driver-vga"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, xserver-xorg-video-chips,
xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-imstt,
xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-s3,
xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis,
xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-vga"
-# xorg-video-driver-v4l,
+# xserver-xorg-video-v4l,
Modified: branches/modular/debian/xorg/debian/scripts/vars.i386
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.i386 2006-02-09
16:08:24 UTC (rev 1181)
+++ branches/modular/debian/xorg/debian/scripts/vars.i386 2006-02-10
03:10:41 UTC (rev 1182)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XORG_VIDEO_DRIVER_DEPENDS="xorg-video-driver-apm, xorg-video-driver-ark,
xorg-video-driver-ati, xorg-video-driver-chips, xorg-video-driver-cirrus,
xorg-video-driver-cyrix, xorg-video-driver-dummy, xorg-video-driver-fbdev,
xorg-video-driver-glint, xorg-video-driver-i128, xorg-video-driver-i740,
xorg-video-driver-i810, xorg-video-driver-imstt, xorg-video-driver-mga,
xorg-video-driver-neomagic, xorg-video-driver-newport, xorg-video-driver-nsc,
xorg-video-driver-nv, xorg-video-driver-rendition, xorg-video-driver-s3,
xorg-video-driver-s3virge, xorg-video-driver-savage,
xorg-video-driver-siliconmotion, xorg-video-driver-sis,
xorg-video-driver-sisusb, xorg-video-driver-tdfx, xorg-video-driver-tga,
xorg-video-driver-trident, xorg-video-driver-tseng, xorg-video-driver-vesa,
xorg-video-driver-vga, xorg-video-driver-via, xorg-video-driver-voodoo,
xorg-video-driver-vmware"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark,
xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus,
xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev,
xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740,
xserver-xorg-video-i810, xserver-xorg-video-imstt, xserver-xorg-video-mga,
xserver-xorg-video-neomagic, xserver-xorg-video-newport,
xserver-xorg-video-nsc, xserver-xorg-video-nv, xserver-xorg-video-rendition,
xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage,
xserver-xorg-video-siliconmotion, xserver-xorg-video-sis,
xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-tga,
xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa,
xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo,
xserver-xorg-video-vmware"
-# xorg-video-driver-v4l, xorg-video-driver-glide,
+# xserver-xorg-video-v4l, xserver-xorg-video-glide,
Modified: branches/modular/debian/xorg/debian/scripts/vars.ia64
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.ia64 2006-02-09
16:08:24 UTC (rev 1181)
+++ branches/modular/debian/xorg/debian/scripts/vars.ia64 2006-02-10
03:10:41 UTC (rev 1182)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XORG_VIDEO_DRIVER_DEPENDS="xorg-video-driver-apm, xorg-video-driver-ark,
xorg-video-driver-ati, xorg-video-driver-chips, xorg-video-driver-cirrus,
xorg-video-driver-cyrix, xorg-video-driver-dummy, xorg-video-driver-fbdev,
xorg-video-driver-glint, xorg-video-driver-i128, xorg-video-driver-i740,
xorg-video-driver-imstt, xorg-video-driver-mga, xorg-video-driver-neomagic,
xorg-video-driver-newport, xorg-video-driver-nv, xorg-video-driver-rendition,
xorg-video-driver-s3, xorg-video-driver-s3virge, xorg-video-driver-savage,
xorg-video-driver-siliconmotion, xorg-video-driver-sis, xorg-video-driver-tdfx,
xorg-video-driver-tga, xorg-video-driver-trident, xorg-video-driver-tseng,
xorg-video-driver-vesa, xorg-video-driver-vga, xorg-video-driver-via,
xorg-video-driver-vmware"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark,
xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus,
xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev,
xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740,
xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic,
xserver-xorg-video-newport, xserver-xorg-video-nv,
xserver-xorg-video-rendition, xserver-xorg-video-s3,
xserver-xorg-video-s3virge, xserver-xorg-video-savage,
xserver-xorg-video-siliconmotion, xserver-xorg-video-sis,
xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident,
xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga,
xserver-xorg-video-via, xserver-xorg-video-vmware"
-# xorg-video-driver-v4l,
+# xserver-xorg-video-v4l,
Modified: branches/modular/debian/xorg/debian/scripts/vars.powerpc
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.powerpc 2006-02-09
16:08:24 UTC (rev 1181)
+++ branches/modular/debian/xorg/debian/scripts/vars.powerpc 2006-02-10
03:10:41 UTC (rev 1182)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XORG_VIDEO_DRIVER_DEPENDS="xorg-video-driver-ati, xorg-video-driver-chips,
xorg-video-driver-fbdev, xorg-video-driver-glint, xorg-video-driver-imstt,
xorg-video-driver-mga, xorg-video-driver-nv, xorg-video-driver-s3,
xorg-video-driver-s3virge, xorg-video-driver-savage, xorg-video-driver-sis,
xorg-video-driver-sisusb, xorg-video-driver-tdfx, xorg-video-driver-trident,
xorg-video-driver-vga"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, xserver-xorg-video-chips,
xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-imstt,
xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-s3,
xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis,
xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-trident,
xserver-xorg-video-vga"
-# xorg-video-driver-v4l,
+# xserver-xorg-video-v4l,
Modified: branches/modular/debian/xorg/debian/scripts/vars.sparc
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.sparc 2006-02-09
16:08:24 UTC (rev 1181)
+++ branches/modular/debian/xorg/debian/scripts/vars.sparc 2006-02-10
03:10:41 UTC (rev 1182)
@@ -3,5 +3,5 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XORG_VIDEO_DRIVER_DEPENDS="xorg-video-driver-apm, xorg-video-driver-ark,
xorg-video-driver-ati, xorg-video-driver-chips, xorg-video-driver-cirrus,
xorg-video-driver-dummy, xorg-video-driver-fbdev, xorg-video-driver-glint,
xorg-video-driver-i128, xorg-video-driver-i740, xorg-video-driver-imstt,
xorg-video-driver-mga, xorg-video-driver-neomagic, xorg-video-driver-newport,
xorg-video-driver-nv, xorg-video-driver-rendition, xorg-video-driver-s3virge,
xorg-video-driver-savage, xorg-video-driver-siliconmotion,
xorg-video-driver-sunbw2, xorg-video-driver-suncg14, xorg-video-driver-suncg3,
xorg-video-driver-suncg6, xorg-video-driver-sunffb, xorg-video-driver-sunleo,
xorg-video-driver-suntcx, xorg-video-driver-tdfx, xorg-video-driver-tga,
xorg-video-driver-trident, xorg-video-driver-vesa, xorg-video-driver-vga,
xorg-video-driver-vmware"
-# xorg-video-driver-v4l,
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark,
xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus,
xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint,
xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt,
xserver-xorg-video-mga, xserver-xorg-video-neomagic,
xserver-xorg-video-newport, xserver-xorg-video-nv,
xserver-xorg-video-rendition, xserver-xorg-video-s3virge,
xserver-xorg-video-savage, xserver-xorg-video-siliconmotion,
xserver-xorg-video-sunbw2, xserver-xorg-video-suncg14,
xserver-xorg-video-suncg3, xserver-xorg-video-suncg6,
xserver-xorg-video-sunffb, xserver-xorg-video-sunleo,
xserver-xorg-video-suntcx, xserver-xorg-video-tdfx, xserver-xorg-video-tga,
xserver-xorg-video-trident, xserver-xorg-video-vesa, xserver-xorg-video-vga,
xserver-xorg-video-vmware"
+# xserver-xorg-video-v4l,
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
