Author: branden
Date: 2003-11-03 00:54:24 -0500 (Mon, 03 Nov 2003)
New Revision: 747
Modified:
branches/4.3.0/sid/debian/control
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/scripts/vars.alpha
branches/4.3.0/sid/debian/scripts/vars.i386
branches/4.3.0/sid/debian/scripts/vars.ia64
branches/4.3.0/sid/debian/scripts/vars.powerpc
branches/4.3.0/sid/debian/scripts/vars.sparc
Log:
Merge revision 746 from trunk.
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2003-11-03 05:46:31 UTC (rev 746)
+++ branches/4.3.0/sid/debian/control 2003-11-03 05:54:24 UTC (rev 747)
@@ -1170,7 +1170,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: branches/4.3.0/sid/debian/rules
===================================================================
--- branches/4.3.0/sid/debian/rules 2003-11-03 05:46:31 UTC (rev 746)
+++ branches/4.3.0/sid/debian/rules 2003-11-03 05:54:24 UTC (rev 747)
@@ -426,7 +426,9 @@
# 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)
-VF:Xlibmesa-gl-Special-Depends=$(XLIBMESA_GL_SPECIAL_DEPENDS)
+ dh_gencontrol -- -VF:XWSC-Special-Depends=$(XWSC_SPECIAL_DEPENDS) \
+ -VF:XWSD-Special-Depends=$(XWSD_SPECIAL_DEPENDS) \
+
-VF:Xlibmesa-gl-Special-Depends=$(XLIBMESA_GL_SPECIAL_DEPENDS)
dh_md5sums
dh_builddeb
touch $@
@@ -447,6 +449,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)\"
@echo '$$(XLIBMESA_GL_SPECIAL_DEPENDS)' is
\"$(XLIBMESA_GL_SPECIAL_DEPENDS)\"
ifdef NOT_BUILDING_X_SERVER
@echo '*** This architecture does not build any X server packages.'
Modified: branches/4.3.0/sid/debian/scripts/vars.alpha
===================================================================
--- branches/4.3.0/sid/debian/scripts/vars.alpha 2003-11-03 05:46:31 UTC
(rev 746)
+++ branches/4.3.0/sid/debian/scripts/vars.alpha 2003-11-03 05:54:24 UTC
(rev 747)
@@ -3,4 +3,5 @@
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, xlibosmesa-dev, "
XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, "
Modified: branches/4.3.0/sid/debian/scripts/vars.i386
===================================================================
--- branches/4.3.0/sid/debian/scripts/vars.i386 2003-11-03 05:46:31 UTC (rev
746)
+++ branches/4.3.0/sid/debian/scripts/vars.i386 2003-11-03 05:54:24 UTC (rev
747)
@@ -3,4 +3,5 @@
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, xlibosmesa-dev, "
XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, "
Modified: branches/4.3.0/sid/debian/scripts/vars.ia64
===================================================================
--- branches/4.3.0/sid/debian/scripts/vars.ia64 2003-11-03 05:46:31 UTC (rev
746)
+++ branches/4.3.0/sid/debian/scripts/vars.ia64 2003-11-03 05:54:24 UTC (rev
747)
@@ -3,4 +3,5 @@
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, xlibosmesa-dev, "
XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, "
Modified: branches/4.3.0/sid/debian/scripts/vars.powerpc
===================================================================
--- branches/4.3.0/sid/debian/scripts/vars.powerpc 2003-11-03 05:46:31 UTC
(rev 746)
+++ branches/4.3.0/sid/debian/scripts/vars.powerpc 2003-11-03 05:54:24 UTC
(rev 747)
@@ -3,4 +3,5 @@
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, xlibosmesa-dev, "
XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, "
Modified: branches/4.3.0/sid/debian/scripts/vars.sparc
===================================================================
--- branches/4.3.0/sid/debian/scripts/vars.sparc 2003-11-03 05:46:31 UTC
(rev 746)
+++ branches/4.3.0/sid/debian/scripts/vars.sparc 2003-11-03 05:54:24 UTC
(rev 747)
@@ -3,4 +3,5 @@
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
XWSC_SPECIAL_DEPENDS="xserver-xfree86, xlibmesa-dri, "
+XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, xlibosmesa-dev, "
XLIBMESA_GL_SPECIAL_DEPENDS="xlibmesa-dri, "
