summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTimo Aaltonen <tjaalton@cc.hut.fi>2008-12-09 01:57:44 +0200
committerTimo Aaltonen <tjaalton@cc.hut.fi>2008-12-09 01:57:44 +0200
commit7593023f0b1be0648edb15986d559744483f3c8c (patch)
tree17e4c2f79825e3a2f9b23812de7b77bf266027d7 /debian
parent92d9a71f602a68364cbd2ee67a946d9bdc8bea65 (diff)
Update the changelog for the snapshot
also drop 01_disable-intel-classic-warn.diff since it's obsolete now.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/01_disable-intel-classic-warn.diff14
-rw-r--r--debian/patches/series1
3 files changed, 8 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog
index 9adcd91a723..488b461f880 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.2+git20081209.a0d5c3cf-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Remove debian/patches/01_disable-intel-classic-warn.diff, the
+ warning is gone now.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 09 Dec 2008 01:38:42 +0200
+
mesa (7.2-1) experimental; urgency=low
[ Brice Goglin ]
diff --git a/debian/patches/01_disable-intel-classic-warn.diff b/debian/patches/01_disable-intel-classic-warn.diff
deleted file mode 100644
index 0725ffe09f7..00000000000
--- a/debian/patches/01_disable-intel-classic-warn.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: mesa/src/mesa/drivers/dri/intel/intel_context.c
-===================================================================
---- mesa.orig/src/mesa/drivers/dri/intel/intel_context.c
-+++ mesa/src/mesa/drivers/dri/intel/intel_context.c
-@@ -490,9 +490,6 @@
- if (intel->bufmgr == NULL) {
- if (ttm_disable) {
- fprintf(stderr, "TTM buffer manager disabled. Using classic.\n");
-- } else {
-- fprintf(stderr, "Failed to initialize TTM buffer manager. "
-- "Falling back to classic.\n");
- }
-
- if (intelScreen->tex.size == 0) {
diff --git a/debian/patches/series b/debian/patches/series
index f7ae6157a68..86f17dca4fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_disable-intel-classic-warn.diff
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
04_osmesa_version.diff