X Strike Force SVN commit: rev 521 - in branches/4.3.0/sid/debian: . local local/xlibmesa-drm-source/debian
Author: daniel
Date: 2003-09-13 00:57:58 -0500 (Sat, 13 Sep 2003)
New Revision: 521
Added:
branches/4.3.0/sid/debian/local/xlibmesa-drm-source/
Removed:
branches/4.3.0/sid/debian/local/xlibmesa-drm-src/
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/buildpkg
branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/control.m4
branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/module-changelog.m4
branches/4.3.0/sid/debian/rules
Log:
* Address xlibmesa* package upgrade issues from woody and 4.2.1 packages in
sarge/sid.
[...]
+ debian/control:
[...]
- rename xlibmesa-drm-src to xlibmesa-drm-source, for consistency, and
make modules built with it depend on xlibmesa-dri
(thanks, David B. Harris)
+ debian/local/xlibmesa-drm-source/debian/buildpkg
- replace entirely bogus reference to /usr/src/modules/device3dfx
* debian/control:
+ add small stanza to xdm and xbase-clients long descriptions, explaining
why they dep on gcc-3.2 (you can stop reporting bugs now. yes, you).
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-12 23:01:39 UTC (rev 520)
+++ branches/4.3.0/sid/debian/changelog 2003-09-13 05:57:58 UTC (rev 521)
@@ -14,7 +14,7 @@
- add xlibmesa-dri to dependencies of x-window-system-core on
architectures where xlibmesa-dri exists
- add new variable, XLIBMESA_GL_SPECIAL_DEPENDS, which adds xlibmesa-dri
- to dependencies of xlibmesa3 on architectures where xlibmesa-dri exists
+ to dependencies of xlibmesa on architectures where xlibmesa-dri exists
+ debian/rules:
- pass expansion of XLIBMESA_GL_SPECIAL_DEPENDS to dpkg-gencontrol
- report expansion of XLIBMESA_GL_SPECIAL_DEPENDS in "environment"
@@ -42,6 +42,11 @@
- update xlibmesa-glu-dev's description to refer to itself correctly
- add xlibmesa3, xlibmesa3-dbg, and xlibmesa-dev pseudopackages (merged
from trunk and updated) to smooth upgrades from woody
+ - rename xlibmesa-drm-src to xlibmesa-drm-source, for consistency, and
+ make modules built with it depend on xlibmesa-dri
+ (thanks, David B. Harris)
+ + debian/local/xlibmesa-drm-source/debian/buildpkg
+ - replace entirely bogus reference to /usr/src/modules/device3dfx
* debian/xserver-xfree86.install.*: ship keyboard(4x) manpage (thanks,
Michel D�er)
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2003-09-12 23:01:39 UTC (rev 520)
+++ branches/4.3.0/sid/debian/control 2003-09-13 05:57:58 UTC (rev 521)
@@ -268,6 +268,9 @@
X server configuration programs xf86cfg and xf86config, but in general the
Debconf interface to the xserver-xfree86 package should be used instead of
these tools.
+ .
+ This package requires cpp version 3.2 to function, as text processing is
+ broken in version 3.3.
Package: xdm
Architecture: any
@@ -287,6 +290,9 @@
If the xutils package is installed, xdm can use the sessreg utility to
register login sessions to the system utmp file; this, however, is not
necessary for xdm to function.
+ .
+ This package requires cpp version 3.2 to function, as text processing is
+ broken in version 3.3.
Package: xfonts-100dpi
Architecture: all
@@ -539,9 +545,12 @@
the xserver-xfree86 package, the DRI modules are loaded by the Mesa library,
not by the X server itself.)
-Package: xlibmesa-drm-src
+Package: xlibmesa-drm-source
Architecture: all
Suggests: kernel-source-2.4
+Conflicts: xlibmesa-drm-src
+Replaces: xlibmesa-drm-src
+Provides: xlibmesa-drm-src
Description: XFree86 4.3 DRM Linux kernel module source snapshot
This package contains a source archive for Linux kernel direct rendering
modules (DRM), which are the kernel side of DRI. DRI is the Direct Rendering
@@ -549,15 +558,18 @@
in a safe and efficient manner. The source code in this package enables the
compilation of kernel-side direct rendering modules which correspond to the
DRI implementation in XFree86 4.3.
+ .
+ This package is only required for 2.4-series kernels; the necessary support
+ is already included in 2.6-series kernels.
Package: xlibmesa-gl
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: xlibmesa-dri
Conflicts: libgl1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
Provides: libgl1
Replaces: mesag3, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
+Suggests: xlibmesa-dri
Description: Mesa 3D graphics library [XFree86]
Mesa is a 3D graphics library which presents an API intended to be compatible
with OpenGL. XFree86 maintains its own version of the Mesa library (which is
@@ -1104,7 +1116,10 @@
Installation of an rsh or ssh daemon (server) is necessary if rstartd is
to be used, and installation of an rsh or ssh client is necessary if
rstart is to be used.
-
+ .
+ This package requires cpp version 3.2 to function, as text processing is
+ broken in version 3.3.
+
Package: xvfb
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Copied: branches/4.3.0/sid/debian/local/xlibmesa-drm-source (from rev 520, branches/4.3.0/sid/debian/local/xlibmesa-drm-src)
Modified: branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/buildpkg
===================================================================
--- branches/4.3.0/sid/debian/local/xlibmesa-drm-src/debian/buildpkg 2003-09-12 23:01:39 UTC (rev 520)
+++ branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/buildpkg 2003-09-13 05:57:58 UTC (rev 521)
@@ -75,9 +75,9 @@
# Where are we?
if [ ! -f debian/rules ]; then
# No debian/rules file, try standard place
- if [ -f /usr/src/modules/device3dfx/debian/rules ]; then
- dprint "Entering directory \"/usr/src/modules/device3dfx\""
- cd /usr/src/modules/device3dfx || die "Unable to chdir to /usr/src/modules/device3dfx"
+ if [ -f /usr/src/modules/xlibmesa-drm/debian/rules ]; then
+ dprint "Entering directory \"/usr/src/modules/xlibmesa-drm\""
+ cd /usr/src/modules/xlibmesa-drm || die "Unable to chdir to /usr/src/modules/xlibmesa-drm"
fi
fi
Modified: branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/control.m4
===================================================================
--- branches/4.3.0/sid/debian/local/xlibmesa-drm-src/debian/control.m4 2003-09-12 23:01:39 UTC (rev 520)
+++ branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/control.m4 2003-09-13 05:57:58 UTC (rev 521)
@@ -6,6 +6,7 @@
Package: xlibmesa-drm-module-KVERS
Architecture: any
Provides: xlibmesa-drm-module
+Depends: xlibmesa-dri
Description: XFree86 4.3 DRM modules
This package provides the DRM modules for kernel version KVERS
required for 3D hardware acceleration.
Modified: branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/module-changelog.m4
===================================================================
--- branches/4.3.0/sid/debian/local/xlibmesa-drm-src/debian/module-changelog.m4 2003-09-12 23:01:39 UTC (rev 520)
+++ branches/4.3.0/sid/debian/local/xlibmesa-drm-source/debian/module-changelog.m4 2003-09-13 05:57:58 UTC (rev 521)
@@ -1,6 +1,6 @@
xlibmesa-drm-module-KVERS (OURVERSION+KDREV) unstable; urgency=low
- * Built from xlibmesa-drm-src.
+ * Built from xlibmesa-drm-source.
-- KMAINT <KEMAIL> DEBDATE
Modified: branches/4.3.0/sid/debian/rules
===================================================================
--- branches/4.3.0/sid/debian/rules 2003-09-12 23:01:39 UTC (rev 520)
+++ branches/4.3.0/sid/debian/rules 2003-09-13 05:57:58 UTC (rev 521)
@@ -117,7 +117,7 @@
# DRM_SRC_DIR is our original DRM module dir, and DRM_DST_DIR is the one that
# ends up as xlibmesa-drm.tar.gz.
-DRM_SRC_DIR:=debian/local/xlibmesa-drm-src
+DRM_SRC_DIR:=debian/local/xlibmesa-drm-source
DRM_DST_DIR=$(DRM_SRC_DIR)/modules/xlibmesa-drm
# Because of the stampdir magic, when you actually want to run a rule
@@ -146,7 +146,7 @@
dh_testdir
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
perl $(SCRIPT_DIR)/dbs_split clean
- rm -rf debian/local/exports debian/local/xlibmesa-drm-src/modules
+ rm -rf debian/local/exports debian/local/xlibmesa-drm-source/modules
dh_clean debian/local/xserver-wrapper debian/local/xterm.faq.text.gz debian/MANIFEST.$(ARCH).new
# All 'important' targets have 2 lines. The one that is run by
@@ -282,7 +282,7 @@
mkdir -p $(DEBTREEDIR)/etc/X11/cursors
install -m 644 debian/local/cursors/*.theme $(DEBTREEDIR)/etc/X11/cursors
- # Create the xlibmesa-drm-src package.
+ # Create the xlibmesa-drm-source package.
mkdir $(DEBTREEDIR)/usr/src
mkdir -p $(DRM_DST_DIR)
-cp -R $(DRM_SRC_DIR)/* $(DRM_DST_DIR)
Reply to: