summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Aaltonen <tjaalton@cc.hut.fi>2008-09-23 16:09:00 +0300
committerTimo Aaltonen <tjaalton@cc.hut.fi>2008-09-23 16:09:00 +0300
commite700c5ad99fddb5908313f0d02cd0f22fa135cc3 (patch)
treec3b10bb4ce0c2ffdad537d3f66f0295147f4dbb5
parent08c0ec7a89d4e2f739ac2be3d3d50b179bd74720 (diff)
Update the changelog, refresh patch 04.
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/04_osmesa_version.diff10
2 files changed, 12 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index c875cd61219..b5e1f2701c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-mesa (7.1-2) UNRELEASED; urgency=low
+mesa (7.2-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Fix grammar and punctuation in glxinfo(1), thanks Sam Hocevar,
closes: #498595.
- -- Brice Goglin <bgoglin@debian.org> Thu, 11 Sep 2008 19:12:45 +0200
+ [ Timo Aaltonen ]
+ * New upstream release.
+ * Refresh patch 04_osmesa_version.diff
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 23 Sep 2008 16:08:48 +0300
mesa (7.1-1) experimental; urgency=low
diff --git a/debian/patches/04_osmesa_version.diff b/debian/patches/04_osmesa_version.diff
index 6cc11d17b0d..573439702cd 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -1,7 +1,7 @@
Index: mesa/src/mesa/drivers/osmesa/Makefile
===================================================================
---- mesa.orig/src/mesa/drivers/osmesa/Makefile
-+++ mesa/src/mesa/drivers/osmesa/Makefile
+--- mesa.orig/src/mesa/drivers/osmesa/Makefile 2008-09-12 10:44:02.000000000 +0300
++++ mesa/src/mesa/drivers/osmesa/Makefile 2008-09-23 16:07:40.000000000 +0300
@@ -46,7 +46,7 @@
$(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
@@ -9,14 +9,14 @@ Index: mesa/src/mesa/drivers/osmesa/Makefile
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS)
-
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
# with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
osmesa16: $(OBJECTS) $(CORE_MESA)
$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
-