X Strike Force XFree86 SVN commit: rev 823 - branches/4.3.0/woody/debian
Author: branden
Date: 2003-12-05 20:34:25 -0500 (Fri, 05 Dec 2003)
New Revision: 823
Modified:
branches/4.3.0/woody/debian/changelog
branches/4.3.0/woody/debian/control
branches/4.3.0/woody/debian/rules
Log:
Merge changes from revision 816 to HEAD on branches/4.3.0/sid.
Modified: branches/4.3.0/woody/debian/changelog
===================================================================
--- branches/4.3.0/woody/debian/changelog 2003-12-06 00:49:11 UTC (rev 822)
+++ branches/4.3.0/woody/debian/changelog 2003-12-06 01:34:25 UTC (rev 823)
@@ -63,7 +63,7 @@
explain why they use cpp in general, and why cpp-3.2 in particular.
- debian/control
- * Move unstripped versions of the Mesa DRI modules from the (now defunct)
+ * Move unstripped versions of the Mesa DRI modules from the (renamed)
xlibmesa3-gl-dbg package to the new package xlibmesa-dri-dbg.
- debian/control
- debian/xlibmesa-dri-dbg.install.alpha
@@ -190,7 +190,8 @@
+ xlibs is now a transitional package depending on the packages into
which it split
+ sanitize xlibs's conflicts and replaces relationships by removing
- versioned conflicts on withdrawn packages
+ versioned conflicts on withdrawn packages (except where they continue
+ to be Provided by still-existing packages)
+ xlibs is now an architecture-independent package
+ xlibs no longer provides libxpm4
+ rewrite xlibs's short and extended descriptions
@@ -215,6 +216,10 @@
it split
+ update x-window-system-dev to depend on the packages split from
xlibs-dbg instead of xlibs-dbg itself
+ - debian/rules:
+ + don't dh_strip new -dbg packages
+ + let dh_strip have its wicked way with xlibs-dbg, which no longer has a
+ payload
* Split xlibs-dev package into one package per shared library, plus separate
packages for Proxy Management protocol headers (pm-dev), X protocol
@@ -266,8 +271,17 @@
shipped in Debian. (Closes: #138883)
- debian/control
- -- Branden Robinson <branden@debian.org> Thu, 4 Dec 2003 16:06:55 -0500
+ * Make x-window-system-dev depend on xlibmesa-gl-dbg and xlibmesa-glu-dbg,
+ not xlibmesa3-gl-dbg and xlibmesa3-glu-dbg.
+ - debian/control
+ * Make the xlibmesa3 pseudopackage "Architecture: any" instead of
+ "Architecture: all", because its dependencies vary depending on what
+ architecture it is compiled for (thanks to F:Xlibmesa-gl-Depends).
+ - debian/control
+
+ -- Branden Robinson <branden@debian.org> Fri, 5 Dec 2003 17:48:40 -0500
+
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
* Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
Modified: branches/4.3.0/woody/debian/control
===================================================================
--- branches/4.3.0/woody/debian/control 2003-12-06 00:49:11 UTC (rev 822)
+++ branches/4.3.0/woody/debian/control 2003-12-06 01:34:25 UTC (rev 823)
@@ -1414,8 +1414,8 @@
Section: libs
Architecture: all
Depends: libice6, libsm6, libx11-6, libxext6, libxft1, libxi6, libxmu6, libxmuu1, libxp6, libxpm4, libxrandr2, libxt6, libxtrap6, libxtst6, xlibs-data, ${misc:Depends}
-Conflicts: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xcontrib, xsm, xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients (<< 4.0)
-Replaces: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xcontrib, xsm, xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients (<< 4.0)
+Conflicts: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
+Replaces: xbase, xlib, xlib6, xlib6g, xlib6g-dev, xpm4g, fvwm-common, qcad (<< 1.4.6-1), xbase-clients (<< 4.0), xcontrib (<< 4.0), xsm (<< 4.0)
Description: X Window System client libraries metapackage and XKB data
This package smooths upgrades from Debian 3.0 by depending on the individual
library packages into which each shared object formerly contained in this
@@ -1817,7 +1817,7 @@
Package: x-window-system-dev
Architecture: any
-Depends: libdps-dev, libdps1-dbg, libice-dev, libice6-dbg, libsm-dev, libsm6-dbg, libx11-6-dbg, libx11-dev, libxaw7-dbg, libxaw7-dev, libxext-dev, libxext6-dbg, libxi-dev, libxi6-dbg, libxmu-dev, libxmu6-dbg, libxmuu-dev, libxmuu1-dbg, libxp-dev, libxp6-dbg, libxpm-dev, libxpm4-dbg, libxrandr-dev, libxrandr2-dbg, libxt-dev, libxt6-dbg, libxtrap-dev, libxtrap6-dbg, libxtst-dev, libxtst6-dbg, libxv-dev, libxv1-dbg, pm-dev, x-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, xlibmesa3-gl-dbg, xlibmesa3-glu-dbg, ${F:XWSD-Special-Depends}xlibs-static-dev, xlibs-static-pic, xspecs
+Depends: libdps-dev, libdps1-dbg, libice-dev, libice6-dbg, libsm-dev, libsm6-dbg, libx11-6-dbg, libx11-dev, libxaw7-dbg, libxaw7-dev, libxext-dev, libxext6-dbg, libxi-dev, libxi6-dbg, libxmu-dev, libxmu6-dbg, libxmuu-dev, libxmuu1-dbg, libxp-dev, libxp6-dbg, libxpm-dev, libxpm4-dbg, libxrandr-dev, libxrandr2-dbg, libxt-dev, libxt6-dbg, libxtrap-dev, libxtrap6-dbg, libxtst-dev, libxtst6-dbg, libxv-dev, libxv1-dbg, pm-dev, x-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, xlibmesa-gl-dbg, xlibmesa-glu-dbg, ${F:XWSD-Special-Depends}xlibs-static-dev, xlibs-static-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.
@@ -1841,7 +1841,7 @@
Package: xlibmesa3
Section: oldlibs
-Architecture: all
+Architecture: any
Depends: ${F:Xlibmesa-gl-Special-Depends}xlibmesa-gl, xlibmesa-glu
Description: XFree86 Mesa libraries pseudopackage
This package smooths upgrades from Debian 3.0 by depending on xlibmesa-gl and
Modified: branches/4.3.0/woody/debian/rules
===================================================================
--- branches/4.3.0/woody/debian/rules 2003-12-06 00:49:11 UTC (rev 822)
+++ branches/4.3.0/woody/debian/rules 2003-12-06 01:34:25 UTC (rev 823)
@@ -401,12 +401,26 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip \
-Nlibdps1-dbg \
+ -Nlibice6-dbg \
+ -Nlibsm6-dbg \
+ -Nlibx11-6-dbg \
-Nlibxaw6-dbg \
-Nlibxaw7-dbg \
+ -Nlibxext6-dbg \
+ -Nlibxft1-dbg \
+ -Nlibxi6-dbg \
+ -Nlibxmu6-dbg \
+ -Nlibxmuu1-dbg \
+ -Nlibxp6-dbg \
+ -Nlibxpm4-dbg \
+ -Nlibxrandr2-dbg \
+ -Nlibxt6-dbg \
+ -Nlibxtrap6-dbg \
+ -Nlibxtst6-dbg \
+ -Nlibxv1-dbg \
-Nxlibmesa-gl-dbg \
-Nxlibmesa-glu-dbg \
-Nxlibosmesa4-dbg \
- -Nxlibs-dbg \
-Nxserver-xfree86-dbg
find debian/xserver-xfree86/usr/X11R6/lib/modules -name "*.o" | \
xargs --no-run-if-empty \
Reply to: