[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: rev 746 - in trunk/debian: . scripts



Author: branden
Date: 2003-11-03 00:46:31 -0500 (Mon, 03 Nov 2003)
New Revision: 746

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
   trunk/debian/scripts/vars.alpha
   trunk/debian/scripts/vars.i386
   trunk/debian/scripts/vars.ia64
   trunk/debian/scripts/vars.powerpc
   trunk/debian/scripts/vars.sparc
Log:
Make x-window-system-dev installable on architectures that do not ship the
offscreen Mesa libraries.  Use the same technique as is used for populating
x-window-system-core's dependencies on a per-architecture basis: define an
architecture-specific Make variable, then use its value for a dpkg
substvar.

- debian/control
- debian/rules
- debian/scripts/vars.alpha
- debian/scripts/vars.i386
- debian/scripts/vars.ia64
- debian/scripts/vars.powerpc
- debian/scripts/vars.sparc


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-11-03 05:41:08 UTC (rev 745)
+++ trunk/debian/changelog	2003-11-03 05:46:31 UTC (rev 746)
@@ -9,8 +9,21 @@
     (Closes: #218788)
     - debian/po/ca.po
 
- -- Branden Robinson <branden@debian.org>  Mon,  3 Nov 2003 00:39:38 -0500
+  * Make x-window-system-dev installable on architectures that do not ship the
+    offscreen Mesa libraries.  Use the same technique as is used for populating
+    x-window-system-core's dependencies on a per-architecture basis: define an
+    architecture-specific Make variable, then use its value for a dpkg
+    substvar.
+    - debian/control
+    - debian/rules
+    - debian/scripts/vars.alpha
+    - debian/scripts/vars.i386
+    - debian/scripts/vars.ia64
+    - debian/scripts/vars.powerpc
+    - debian/scripts/vars.sparc
 
+ -- Branden Robinson <branden@debian.org>  Mon,  3 Nov 2003 00:43:29 -0500
+
 xfree86 (4.2.1-13) unstable; urgency=low
 
   * Acknowledge bug fixed in NMU.  Thanks, LaMont! (Closes: #213774)
@@ -2400,7 +2413,7 @@
   * patch #000_post_xf-4_2_0:
     - include DPMS fix for r128 driver (thanks to Stuart Anderson for pulling
       the patch over to xf-4_2-branch)
-  * patch #000_stolen_from_HEAD:
+  * patch #000_stolen_from_HEAD:
     - Fix SEGV in 3dfx DRI driver. (Alan Hourihane)
     - Fix enabling of i810 DRI when XvMC is disabled (#5208, Matthew Sottek,
       Intel).
@@ -2410,7 +2423,7 @@
       (Mark Vojkovich)
 
   * patch #001: turn off modular XFree86 server for MIPS architectures since
-    the ELF loader isn't yet working on those platforms, per Guido Guenther
+    the ELF loader isn't yet working on those platforms, per Guido Guenther
   * patch #075: new; don't ship the XIE headers if we're not building the
     library
   * patch #076: new; xterm now works around hateful lies from GNU libc's

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2003-11-03 05:41:08 UTC (rev 745)
+++ trunk/debian/control	2003-11-03 05:46:31 UTC (rev 746)
@@ -1118,7 +1118,7 @@
 
 Package: x-window-system-dev
 Architecture: any
-Depends: libdps1-dbg, libdps-dev, libxaw7-dbg, libxaw7-dev, xlibmesa3-gl-dbg, xlibmesa-gl-dev, xlibmesa3-glu-dbg, xlibmesa-glu-dev, xlibosmesa3-dbg, xlibosmesa-dev, xlibs-dbg, xlibs-dev, xlibs-pic, xspecs
+Depends: libdps1-dbg, libdps-dev, libxaw7-dbg, libxaw7-dev, xlibmesa3-gl-dbg, xlibmesa-gl-dev, xlibmesa3-glu-dbg, xlibmesa-glu-dev, ${F:XWSD-Special-Depends}xlibs-dbg, xlibs-dev, xlibs-pic, xspecs
 Description: X Window System development components
  This metapackage provides the components of the X Window System as developed
  by the XFree86 Project which are most interesting to programmers.

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2003-11-03 05:41:08 UTC (rev 745)
+++ trunk/debian/rules	2003-11-03 05:46:31 UTC (rev 746)
@@ -399,7 +399,8 @@
 	# xlibs needs to be given a special shlibs file so that dpkg-shlibdeps
 	# doesn't try to make it depend on itself
 	DH_OPTIONS= dh_shlibdeps -l$(DEBTREEDIR)/usr/X11R6/lib -pxlibs --exclude=libxrx.so -- -Ldebian/xlibs.shlibs.dummy
-	dh_gencontrol -- -VF:XWSC-Special-Depends=$(XWSC_SPECIAL_DEPENDS)
+	dh_gencontrol -- -VF:XWSC-Special-Depends=$(XWSC_SPECIAL_DEPENDS) \
+	                 -VF:XWSD-Special-Depends=$(XWSD_SPECIAL_DEPENDS)
 	dh_md5sums
 	dh_builddeb
 	touch $@
@@ -420,6 +421,7 @@
 	@echo '$$(BUILD_ARCH)' is \"$(BUILD_ARCH)\"
 	@echo '$$(CURDIR)' is \"$(CURDIR)\"
 	@echo '$$(XWSC_SPECIAL_DEPENDS)' is \"$(XWSC_SPECIAL_DEPENDS)\"
+	@echo '$$(XWSD_SPECIAL_DEPENDS)' is \"$(XWSD_SPECIAL_DEPENDS)\"
 ifdef NOT_BUILDING_X_SERVER
 	@echo '*** This architecture does not build any X server packages.'
 else

Modified: trunk/debian/scripts/vars.alpha
===================================================================
--- trunk/debian/scripts/vars.alpha	2003-11-03 05:41:08 UTC (rev 745)
+++ trunk/debian/scripts/vars.alpha	2003-11-03 05:46:31 UTC (rev 746)
@@ -3,3 +3,4 @@
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
 XWSC_SPECIAL_DEPENDS="xserver-xfree86, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa3-dbg, xlibosmesa-dev, "

Modified: trunk/debian/scripts/vars.i386
===================================================================
--- trunk/debian/scripts/vars.i386	2003-11-03 05:41:08 UTC (rev 745)
+++ trunk/debian/scripts/vars.i386	2003-11-03 05:46:31 UTC (rev 746)
@@ -3,3 +3,4 @@
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
 XWSC_SPECIAL_DEPENDS="xserver-xfree86, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa3-dbg, xlibosmesa-dev, "

Modified: trunk/debian/scripts/vars.ia64
===================================================================
--- trunk/debian/scripts/vars.ia64	2003-11-03 05:41:08 UTC (rev 745)
+++ trunk/debian/scripts/vars.ia64	2003-11-03 05:46:31 UTC (rev 746)
@@ -3,3 +3,4 @@
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
 XWSC_SPECIAL_DEPENDS="xserver-xfree86, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa3-dbg, xlibosmesa-dev, "

Modified: trunk/debian/scripts/vars.powerpc
===================================================================
--- trunk/debian/scripts/vars.powerpc	2003-11-03 05:41:08 UTC (rev 745)
+++ trunk/debian/scripts/vars.powerpc	2003-11-03 05:46:31 UTC (rev 746)
@@ -3,3 +3,4 @@
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
 XWSC_SPECIAL_DEPENDS="xserver-xfree86, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa3-dbg, xlibosmesa-dev, "

Modified: trunk/debian/scripts/vars.sparc
===================================================================
--- trunk/debian/scripts/vars.sparc	2003-11-03 05:41:08 UTC (rev 745)
+++ trunk/debian/scripts/vars.sparc	2003-11-03 05:46:31 UTC (rev 746)
@@ -3,3 +3,4 @@
 # This file gets included by both debian/rules (make) AND the scripts in
 # debian/scripts (Bourne shell).
 XWSC_SPECIAL_DEPENDS="xserver-xfree86, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa3-dbg, xlibosmesa-dev, "



Reply to: