X Strike Force X.Org X11 SVN commit: r1768 - in trunk/debian/xorg/debian: . scripts
Author: dnusinow
Date: 2006-04-13 19:34:14 -0400 (Thu, 13 Apr 2006)
New Revision: 1768
Added:
trunk/debian/xorg/debian/scripts/vars.s390
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/control
Log:
* Make various metapackages arch: any rather than arch: all
* Add s390 vars script source to allow the package to build on that arch.
Provides only the dummy video driver currently.
(closes: #361908, #361909)
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-13 23:21:05 UTC (rev 1767)
+++ trunk/debian/xorg/debian/changelog 2006-04-13 23:34:14 UTC (rev 1768)
@@ -2,8 +2,12 @@
* Have xserver-xorg depend on xkb-data | xkb-data-legacy. Not a recommends
any more. Thanks to a lot of people. (closes: #362112, #362105)
+ * Make various metapackages arch: any rather than arch: all
+ * Add s390 vars script source to allow the package to build on that arch.
+ Provides only the dummy video driver currently.
+ (closes: #361908, #361909)
- -- David Nusinow <dnusinow@debian.org> Wed, 12 Apr 2006 20:26:53 -0400
+ -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 19:30:03 -0400
xorg (1:7.0.10) unstable; urgency=low
Modified: trunk/debian/xorg/debian/control
===================================================================
--- trunk/debian/xorg/debian/control 2006-04-13 23:21:05 UTC (rev 1767)
+++ trunk/debian/xorg/debian/control 2006-04-13 23:34:14 UTC (rev 1768)
@@ -37,13 +37,13 @@
Package: xserver-xfree86
-Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc sparc
+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: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
+Architecture: all
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
@@ -51,7 +51,7 @@
to only have certain drivers installed.
Package: xserver-xorg-input-all
-Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
+Architecture: all
Depends: ${F:XServer-Xorg-Input-Depends}
Description: the X.Org X server -- input driver metapackage
This package depends on the full suite of input drivers for the X.Org X server
@@ -59,7 +59,7 @@
to only have certain drivers installed.
Package: xorg
-Architecture: any
+Architecture: all
Depends: xserver-xorg, libgl1-mesa-glx, libgl1-mesa-dri, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), xbase-clients (>= 1:1.0.1-1), xutils (>= 1:1.0.1-1), xkb-data, xterm
Provides: x-window-system, x-window-system-core
Description: X.Org X Window System
@@ -74,7 +74,7 @@
be installed to ensure a comfortable X experience.
Package: xorg-dev
-Architecture: any
+Architecture: all
Depends: libdmx-dev, libfontenc-dev, libfs-dev, libice-dev, libsm-dev, libx11-dev, libx11-dev, libxau-dev, libxaw7-dev, libxcomposite-dev, libxcursor-dev, libxdamage-dev, libxdmcp-dev, libxevie-dev, libxext-dev, libxfixes-dev, libxfont-dev, libxft-dev, libxi-dev, libxinerama-dev, libxkbfile-dev, libxkbui-dev, libxmu-dev, libxmuu-dev, libxpm-dev, libxrandr-dev, libxrender-dev, libxres-dev, libxss-dev, libxt-dev, libxtrap-dev, libxtst-dev, libxv-dev, libxvmc-dev, libxxf86dga-dev, libxxf86misc-dev, libxxf86vm-dev, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev, x11proto-damage-dev, x11proto-dmx-dev, x11proto-evie-dev, x11proto-fixes-dev, x11proto-fontcache-dev, x11proto-fonts-dev, x11proto-gl-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86dri-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, x11proto-xinerama-dev, xserver-xorg-dev, xtrans-dev
Description: the X.Org development libraries
This metapackage provides the development libraries for the X.Org X Window
@@ -90,7 +90,7 @@
Debian developers to have their package depend on.
Package: xlibs-data
-Architecture:any
+Architecture: all
Depends: xbitmaps, xcursor-themes, libx11-6 (>= 2:1.0.0-2)
Description: transitional package for X11 client data
This package is provided to ease upgrades from Debian 3.1 ("sarge"). It
@@ -109,7 +109,7 @@
Package: xlibmesa-dri
Section: libdevel
-Architecture: any
+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
@@ -117,7 +117,7 @@
Package: xlibmesa-gl
Section: libdevel
-Architecture: any
+Architecture: all
Depends: libgl1-mesa-glx
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
@@ -125,7 +125,7 @@
Package: xlibmesa-gl-dev
Section: libdevel
-Architecture: any
+Architecture: all
Depends: libgl1-mesa-dev
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
@@ -133,7 +133,7 @@
Package: libglu1-xorg
Section: libdevel
-Architecture: any
+Architecture: all
Depends: libglu1-mesa
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
@@ -141,7 +141,7 @@
Package: libglu1-xorg-dev
Section: libdevel
-Architecture: any
+Architecture: all
Depends: libglu1-mesa-dev
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
Copied: trunk/debian/xorg/debian/scripts/vars.s390 (from rev 1764, trunk/debian/xorg/debian/scripts/vars.i386)
===================================================================
--- trunk/debian/xorg/debian/scripts/vars.i386 2006-04-13 05:21:42 UTC (rev 1764)
+++ trunk/debian/xorg/debian/scripts/vars.s390 2006-04-13 23:34:14 UTC (rev 1768)
@@ -0,0 +1,8 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-dummy"
+
+# xserver-xorg-video-v4l, xserver-xorg-video-glide,
Reply to: