Author: branden
Date: 2003-09-26 17:07:04 -0500 (Fri, 26 Sep 2003)
New Revision: 589
Removed:
branches/4.3.0/sid/debian/local/xlibmesa-drm-source/
branches/4.3.0/sid/debian/xlibmesa-drm-src.install
Modified:
branches/4.3.0/sid/debian/MANIFEST.alpha
branches/4.3.0/sid/debian/MANIFEST.arm
branches/4.3.0/sid/debian/MANIFEST.hppa
branches/4.3.0/sid/debian/MANIFEST.hurd-i386
branches/4.3.0/sid/debian/MANIFEST.i386
branches/4.3.0/sid/debian/MANIFEST.ia64
branches/4.3.0/sid/debian/MANIFEST.mips
branches/4.3.0/sid/debian/MANIFEST.mipsel
branches/4.3.0/sid/debian/MANIFEST.powerpc
branches/4.3.0/sid/debian/MANIFEST.sparc
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
branches/4.3.0/sid/debian/rules
Log:
Drop xlibmesa-drm-source package.
- debian/MANIFEST.*: remove usr/src/xlibmesa-drm.tar.gz from list
- debian/control: drop control stanza for package
- debian/local/xlibmesa-drm-source: delete package infrastructure
directory
- debian/rules: stop constructing package
- debian/xlibmesa-drm-src.install: deleted
Modified: branches/4.3.0/sid/debian/MANIFEST.alpha
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.alpha 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.alpha 2003-09-26 22:07:04 UTC (rev
589)
@@ -7840,5 +7840,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.arm
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.arm 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.arm 2003-09-26 22:07:04 UTC (rev
589)
@@ -7828,5 +7828,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.hppa
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.hppa 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.hppa 2003-09-26 22:07:04 UTC (rev
589)
@@ -7722,5 +7722,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.hurd-i386 2003-09-26 21:16:38 UTC
(rev 588)
+++ branches/4.3.0/sid/debian/MANIFEST.hurd-i386 2003-09-26 22:07:04 UTC
(rev 589)
@@ -7693,5 +7693,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.i386
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-26 22:07:04 UTC (rev
589)
@@ -7882,5 +7882,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.ia64
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.ia64 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.ia64 2003-09-26 22:07:04 UTC (rev
589)
@@ -7877,5 +7877,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.mips
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.mips 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.mips 2003-09-26 22:07:04 UTC (rev
589)
@@ -7723,5 +7723,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.mipsel
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.mipsel 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.mipsel 2003-09-26 22:07:04 UTC (rev
589)
@@ -7723,5 +7723,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.powerpc
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.powerpc 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.powerpc 2003-09-26 22:07:04 UTC (rev
589)
@@ -7839,5 +7839,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/MANIFEST.sparc
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.sparc 2003-09-26 21:16:38 UTC (rev
588)
+++ branches/4.3.0/sid/debian/MANIFEST.sparc 2003-09-26 22:07:04 UTC (rev
589)
@@ -7867,5 +7867,4 @@
usr/share/man/man8/update-fonts-alias.8
usr/share/man/man8/update-fonts-dir.8
usr/share/man/man8/update-fonts-scale.8
-usr/src/xlibmesa-drm.tar.gz
var/lib/xkb/README
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-26 21:16:38 UTC (rev 588)
+++ branches/4.3.0/sid/debian/changelog 2003-09-26 22:07:04 UTC (rev 589)
@@ -4,8 +4,16 @@
pam_strerror().
- debian/patches/002_xdm_fixes.diff
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 25 Sep 2003 00:55:11 -0500
+ * Drop xlibmesa-drm-source package.
+ - debian/MANIFEST.*: remove usr/src/xlibmesa-drm.tar.gz from list
+ - debian/control: drop control stanza for package
+ - debian/local/xlibmesa-drm-source: delete package infrastructure
+ directory
+ - debian/rules: stop constructing package
+ - debian/xlibmesa-drm-src.install: deleted
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 23 Sep 2003 15:00:38 -0500
+
xfree86 (4.3.0-0pre1v2) experimental; urgency=low
* debian/patches/911_debian_XF86Config_to_XF86Config-4.diff: merge this
@@ -326,7 +334,6 @@
libstdc++5-dev | libstdc++-dev, allowing libstdc++5-3.3-dev to satisfy
the dependency, and thus allowing gcc3.2 to be removed.
(Closes: #194136)
- - new xlibmesa-drm-src package (Closes: #139817)
* debian/xlibosmesa4-dbg.install: install the unstripped library in
/usr/X11R6/lib/debug, not /usr/X11R6/lib
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2003-09-26 21:16:38 UTC (rev 588)
+++ branches/4.3.0/sid/debian/control 2003-09-26 22:07:04 UTC (rev 589)
@@ -540,23 +540,6 @@
the xserver-xfree86 package, the DRI modules are loaded by the Mesa library,
not by the X server itself.)
-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
- Infrastructure, a framework for allowing direct access to graphics hardware
- 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
Modified: branches/4.3.0/sid/debian/rules
===================================================================
--- branches/4.3.0/sid/debian/rules 2003-09-26 21:16:38 UTC (rev 588)
+++ branches/4.3.0/sid/debian/rules 2003-09-26 22:07:04 UTC (rev 589)
@@ -111,11 +111,6 @@
# This is where the upstream install rules will put their stuff.
DEBTREEDIR:=$(CURDIR)/debian/tmp
-# 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-source
-DRM_DST_DIR=$(DRM_SRC_DIR)/modules/xlibmesa-drm
-
# Because of the stampdir magic, when you actually want to run a rule
# over, you would have to remove the stamp manually. Now, just do
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
@@ -282,17 +277,6 @@
debian/tmp/usr/X11R6/bin/XFree86-debug
mkdir -p $(DEBTREEDIR)/etc/X11/cursors
install -m 644 debian/local/cursors/*.theme
$(DEBTREEDIR)/etc/X11/cursors
-
- # Create the xlibmesa-drm-source package.
- mkdir $(DEBTREEDIR)/usr/src
- mkdir -p $(DRM_DST_DIR)
- -cp -R $(DRM_SRC_DIR)/* $(DRM_DST_DIR)
- $(M4) -DOURVERSION="$(SOURCE_VERSION)"
$(DRM_DST_DIR)/debian/module-changelog.m4 > $(DRM_DST_DIR)/debian/changelog.m4
- rm $(DRM_DST_DIR)/debian/module-changelog.m4
- chmod +x $(DRM_DST_DIR)/debian/rules
- -cp -L
build-tree/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/*
$(DRM_DST_DIR)/
- rm -f $(DRM_DST_DIR)/Makefile $(DRM_DST_DIR)/Imakefile
$(DRM_DST_DIR)/Makefile.kernel
- cd $(DRM_SRC_DIR) && tar -zcvf
$(DEBTREEDIR)/usr/src/xlibmesa-drm.tar.gz modules/xlibmesa-drm
endif
rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
# remove the upstream symlink X -> XFree86
Deleted: branches/4.3.0/sid/debian/xlibmesa-drm-src.install
===================================================================
--- branches/4.3.0/sid/debian/xlibmesa-drm-src.install 2003-09-26 21:16:38 UTC
(rev 588)
+++ branches/4.3.0/sid/debian/xlibmesa-drm-src.install 2003-09-26 22:07:04 UTC
(rev 589)
@@ -1 +0,0 @@
-usr/src/xlibmesa-drm.tar.gz
