debian/changelog | 7 +++++++
debian/libgl1-mesa-dri.install.linux | 1 -
debian/rules | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 7d8e7ee7270cbabf334580f9fdf1bba5146d9277
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Feb 17 15:44:27 2011 +0100
Revert "Time to ship r600g."
This reverts commit fca99e1a47894449210a76b9f15358f042812750.
Conflicts:
debian/changelog
Closes: #612609.
diff --git a/debian/changelog b/debian/changelog
index 2715fd7..b372781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.10-5) UNRELEASED; urgency=low
+
+ * Revert to r600 classic, r600 gallium doesn't seem ready yet, after all
+ (Closes: #612609).
+
+ -- Cyril Brulebois <k...@debian.org> Thu, 17 Feb 2011 15:43:30 +0100
+
mesa (7.10-4) unstable; urgency=low
* debian/not-installed: Ignore the same files on *i386.
diff --git a/debian/libgl1-mesa-dri.install.linux
b/debian/libgl1-mesa-dri.install.linux
index 1b1e4de..d724d6d 100644
--- a/debian/libgl1-mesa-dri.install.linux
+++ b/debian/libgl1-mesa-dri.install.linux
@@ -3,4 +3,3 @@ build/dri/lib/*_dri.so usr/lib/dri
# This part is Linux-specific:
build/dri/lib/gallium/r300_dri.so usr/lib/dri
-build/dri/lib/gallium/r600_dri.so usr/lib/dri
diff --git a/debian/rules b/debian/rules
index 3048dd3..cfe6d38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -204,6 +204,8 @@ build-stamp: $(BUILD_STAMPS)
# Remove gallium drivers which replace existing classic drivers.
# Intel gallium is significantly behind the classic mesa drivers...
rm -f build/dri/lib/gallium/i915_dri.so
+# r600g is not yet in a fit state to ship
+ rm -f build/dri/lib/gallium/r600_dri.so
>$@
$(STAMP)-build-%: configure
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pq55l-0006xl...@alioth.debian.org
