X Strike Force X.Org X11 SVN commit: r1180 - in branches/modular/debian/xorg/debian: . scripts
Author: dnusinow
Date: 2006-02-08 21:19:18 -0500 (Wed, 08 Feb 2006)
New Revision: 1180
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:
* Change driver metapackage naming to match individual packages:
+ xserver-xorg-driver -> xorg-video-driver
+ xserver-xorg-input -> xorg-input-driver
+ Update the packaging variables that define arch-specific drivers to
include in the metapackage as well to match these names
Modified: branches/modular/debian/xorg/debian/changelog
===================================================================
--- branches/modular/debian/xorg/debian/changelog 2006-02-09 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/changelog 2006-02-09 02:19:18 UTC (rev 1180)
@@ -6,8 +6,13 @@
* Convert to xsfbs
+ 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
+ + Update the packaging variables that define arch-specific drivers to
+ include in the metapackage as well to match these names
- -- David Nusinow <dnusinow@debian.org> Wed, 8 Feb 2006 21:06:11 -0500
+ -- David Nusinow <dnusinow@debian.org> Wed, 8 Feb 2006 21:18:23 -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 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/control 2006-02-09 02:19:18 UTC (rev 1180)
@@ -26,14 +26,14 @@
Package: xserver-xorg
Architecture: all
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core, xserver-xorg-driver-all | xserver-xorg-driver, xserver-xorg-input-all | xserver-xorg-input, x11-common, laptop-detect, xresprobe, mdetect, discover1
+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
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: xserver-xorg-driver-all
+Package: xorg-video-drivers-all
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
Depends: ${F:XServer-Xorg-Driver-Depends}
Description: the X.Org X server -- output driver metapackage
@@ -41,7 +41,7 @@
(Xorg). It does not provide any drivers itself, and may be removed if you wish
to only have certain drivers installed.
-Package: xserver-xorg-input-all
+Package: xorg-input-drivers-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 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/rules 2006-02-09 02:19:18 UTC (rev 1180)
@@ -107,8 +107,8 @@
dh_fixperms
dh_installdeb
dh_shlibdeps
- dh_gencontrol -- -VF:XServer-Xorg-Driver-Depends=$(XSERVER_XORG_DRIVER_DEPENDS) \
- -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \
+ dh_gencontrol -- -VF:XServer-Xorg-Driver-Depends=$(XORG_VIDEO_DRIVER_DEPENDS) \
+ -VF:XServer-Xorg-Input-Depends=$(XORG_INPUT_DRIVER_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 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/scripts/vars 2006-02-09 02:19:18 UTC (rev 1180)
@@ -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.
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse"
+XORG_INPUT_DRIVER_DEPENDS="xorg-input-driver-evdev, xorg-input-driver-kbd, xorg-input-driver-mouse"
-# , xserver-xorg-input-wacom
\ No newline at end of file
+# , xorg-input-driver-wacom
Modified: branches/modular/debian/xorg/debian/scripts/vars.amd64
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.amd64 2006-02-09 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/scripts/vars.amd64 2006-02-09 02:19:18 UTC (rev 1180)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_DRIVER_DEPENDS="xserver-xorg-driver-apm, xserver-xorg-driver-ark, xserver-xorg-driver-ati, xserver-xorg-driver-chips, xserver-xorg-driver-cirrus, xserver-xorg-driver-cyrix, xserver-xorg-driver-dummy, xserver-xorg-driver-fbdev, xserver-xorg-driver-glint, xserver-xorg-driver-i128, xserver-xorg-driver-i810, xserver-xorg-driver-mga, xserver-xorg-driver-neomagic, xserver-xorg-driver-nv, xserver-xorg-driver-rendition, xserver-xorg-driver-s3, xserver-xorg-driver-s3virge, xserver-xorg-driver-savage, xserver-xorg-driver-siliconmotion, xserver-xorg-driver-sis, xserver-xorg-driver-sisusb, xserver-xorg-driver-tdfx, xserver-xorg-driver-tga, xserver-xorg-driver-trident, xserver-xorg-driver-tseng, xserver-xorg-driver-vesa, xserver-xorg-driver-via, xserver-xorg-driver-voodoo, xserver-xorg-driver-vga"
+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-driver-v4l,
\ No newline at end of file
+# xorg-video-driver-v4l,
Modified: branches/modular/debian/xorg/debian/scripts/vars.hppa
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.hppa 2006-02-09 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/scripts/vars.hppa 2006-02-09 02:19:18 UTC (rev 1180)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_DRIVER_DEPENDS="xserver-xorg-driver-ati, xserver-xorg-driver-chips, xserver-xorg-driver-fbdev, xserver-xorg-driver-glint, xserver-xorg-driver-imstt, xserver-xorg-driver-mga, xserver-xorg-driver-nv, xserver-xorg-driver-s3, xserver-xorg-driver-s3virge, xserver-xorg-driver-savage, xserver-xorg-driver-sis, xserver-xorg-driver-tdfx, xserver-xorg-driver-trident, xserver-xorg-driver-vga"
+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-driver-v4l,
+# xorg-video-driver-v4l,
Modified: branches/modular/debian/xorg/debian/scripts/vars.i386
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.i386 2006-02-09 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/scripts/vars.i386 2006-02-09 02:19:18 UTC (rev 1180)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_DRIVER_DEPENDS="xserver-xorg-driver-apm, xserver-xorg-driver-ark, xserver-xorg-driver-ati, xserver-xorg-driver-chips, xserver-xorg-driver-cirrus, xserver-xorg-driver-cyrix, xserver-xorg-driver-dummy, xserver-xorg-driver-fbdev, xserver-xorg-driver-glint, xserver-xorg-driver-i128, xserver-xorg-driver-i740, xserver-xorg-driver-i810, xserver-xorg-driver-imstt, xserver-xorg-driver-mga, xserver-xorg-driver-neomagic, xserver-xorg-driver-newport, xserver-xorg-driver-nsc, xserver-xorg-driver-nv, xserver-xorg-driver-rendition, xserver-xorg-driver-s3, xserver-xorg-driver-s3virge, xserver-xorg-driver-savage, xserver-xorg-driver-siliconmotion, xserver-xorg-driver-sis, xserver-xorg-driver-sisusb, xserver-xorg-driver-tdfx, xserver-xorg-driver-tga, xserver-xorg-driver-trident, xserver-xorg-driver-tseng, xserver-xorg-driver-vesa, xserver-xorg-driver-vga, xserver-xorg-driver-via, xserver-xorg-driver-voodoo, xserver-xorg-driver-vmware"
+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-driver-v4l, xserver-xorg-driver-glide,
\ No newline at end of file
+# xorg-video-driver-v4l, xorg-video-driver-glide,
Modified: branches/modular/debian/xorg/debian/scripts/vars.ia64
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.ia64 2006-02-09 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/scripts/vars.ia64 2006-02-09 02:19:18 UTC (rev 1180)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_DRIVER_DEPENDS="xserver-xorg-driver-apm, xserver-xorg-driver-ark, xserver-xorg-driver-ati, xserver-xorg-driver-chips, xserver-xorg-driver-cirrus, xserver-xorg-driver-cyrix, xserver-xorg-driver-dummy, xserver-xorg-driver-fbdev, xserver-xorg-driver-glint, xserver-xorg-driver-i128, xserver-xorg-driver-i740, xserver-xorg-driver-imstt, xserver-xorg-driver-mga, xserver-xorg-driver-neomagic, xserver-xorg-driver-newport, xserver-xorg-driver-nv, xserver-xorg-driver-rendition, xserver-xorg-driver-s3, xserver-xorg-driver-s3virge, xserver-xorg-driver-savage, xserver-xorg-driver-siliconmotion, xserver-xorg-driver-sis, xserver-xorg-driver-tdfx, xserver-xorg-driver-tga, xserver-xorg-driver-trident, xserver-xorg-driver-tseng, xserver-xorg-driver-vesa, xserver-xorg-driver-vga, xserver-xorg-driver-via, xserver-xorg-driver-vmware"
+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-driver-v4l,
\ No newline at end of file
+# xorg-video-driver-v4l,
Modified: branches/modular/debian/xorg/debian/scripts/vars.powerpc
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.powerpc 2006-02-09 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/scripts/vars.powerpc 2006-02-09 02:19:18 UTC (rev 1180)
@@ -3,6 +3,6 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_DRIVER_DEPENDS="xserver-xorg-driver-ati, xserver-xorg-driver-chips, xserver-xorg-driver-fbdev, xserver-xorg-driver-glint, xserver-xorg-driver-imstt, xserver-xorg-driver-mga, xserver-xorg-driver-nv, xserver-xorg-driver-s3, xserver-xorg-driver-s3virge, xserver-xorg-driver-savage, xserver-xorg-driver-sis, xserver-xorg-driver-sisusb, xserver-xorg-driver-tdfx, xserver-xorg-driver-trident, xserver-xorg-driver-vga"
+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-driver-v4l,
\ No newline at end of file
+# xorg-video-driver-v4l,
Modified: branches/modular/debian/xorg/debian/scripts/vars.sparc
===================================================================
--- branches/modular/debian/xorg/debian/scripts/vars.sparc 2006-02-09 02:09:24 UTC (rev 1179)
+++ branches/modular/debian/xorg/debian/scripts/vars.sparc 2006-02-09 02:19:18 UTC (rev 1180)
@@ -3,6 +3,5 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_DRIVER_DEPENDS="xserver-xorg-driver-apm, xserver-xorg-driver-ark, xserver-xorg-driver-ati, xserver-xorg-driver-chips, xserver-xorg-driver-cirrus, xserver-xorg-driver-dummy, xserver-xorg-driver-fbdev, xserver-xorg-driver-glint, xserver-xorg-driver-i128, xserver-xorg-driver-i740, xserver-xorg-driver-imstt, xserver-xorg-driver-mga, xserver-xorg-driver-neomagic, xserver-xorg-driver-newport, xserver-xorg-driver-nv, xserver-xorg-driver-rendition, xserver-xorg-driver-s3virge, xserver-xorg-driver-savage, xserver-xorg-driver-siliconmotion, xserver-xorg-driver-sunbw2, xserver-xorg-driver-suncg14, xserver-xorg-driver-suncg3, xserver-xorg-driver-suncg6, xserver-xorg-driver-sunffb, xserver-xorg-driver-sunleo, xserver-xorg-driver-suntcx, xserver-xorg-driver-tdfx, xserver-xorg-driver-tga, xserver-xorg-driver-trident, xserver-xorg-driver-vesa, xserver-xorg-driver-vga, xserver-xorg-driver-vmware"
-
-# xserver-xorg-driver-v4l,
\ No newline at end of file
+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,
Reply to: