mesa: Changes to 'debian-unstable'
debian/changelog | 5 +-
debian/patches/03_optional-progs-and-install.patch | 38 ++++++++-------------
2 files changed, 18 insertions(+), 25 deletions(-)
New commits:
commit 31e9d9d4f85740613a828452a2f2beb801de7878
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 23 18:18:42 2008 +0100
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index c348a3e..c31d561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (7.0.3~rc2-1) UNRELEASED; urgency=low
+mesa (7.0.3~rc2-1) unstable; urgency=low
* New upstream release candidate.
+ 03_optional-progs-and-install.patch: partly applied upstream, fixed up
* Stop building with -O0 on hppa. Bug #451047 should be fixed in recent gcc
versions.
- -- Julien Cristau <jcristau@debian.org> Thu, 24 Jan 2008 22:51:04 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 23 Feb 2008 18:18:29 +0100
mesa (7.0.2-4) unstable; urgency=low
commit ea9c6d3d9e9d27c8ba90c98ca671cff6e333c620
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 23 16:08:53 2008 +0100
03_optional-progs-and-install.patch: partly applied upstream, fixed up
diff --git a/debian/changelog b/debian/changelog
index 34fbf40..c348a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (7.0.3~rc2-1) UNRELEASED; urgency=low
* New upstream release candidate.
+ + 03_optional-progs-and-install.patch: partly applied upstream, fixed up
* Stop building with -O0 on hppa. Bug #451047 should be fixed in recent gcc
versions.
diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch
index f802a42..c002803 100644
--- a/debian/patches/03_optional-progs-and-install.patch
+++ b/debian/patches/03_optional-progs-and-install.patch
@@ -10,39 +10,31 @@ Also remove references to GLU library since it is not required
and we don't actually build it at this point.
-Index: mesa/progs/xdemos/Makefile
-===================================================================
---- mesa.orig/progs/xdemos/Makefile 2007-11-11 00:34:12.000000000 +0100
-+++ mesa/progs/xdemos/Makefile 2007-11-11 02:07:52.000000000 +0100
-@@ -6,11 +6,11 @@
+--- mesa.orig/progs/xdemos/Makefile
++++ mesa/progs/xdemos/Makefile
+@@ -10,7 +10,7 @@
- INCDIR = $(TOP)/include
+ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
--LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
-+LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
-
--LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
-
--PROGS = glthreads \
-+PROGS ?= glthreads \
+-PROGS = \
++PROGS ?= \
+ glthreads \
glxdemo \
glxgears \
- glxgears_fbconfig \
-@@ -46,6 +46,9 @@
+@@ -55,6 +55,11 @@
+ extra: $(EXTRA_PROGS)
- default: $(PROGS)
+install: $(PROGS)
+ $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin
+ $(INSTALL) -m 755 $(PROGS) $(DESTDIR)$(INSTALL_DIR)/bin
-
++
++
clean:
- -rm -f $(PROGS)
-Index: mesa/progs/Makefile
-===================================================================
---- mesa.orig/progs/Makefile 2007-11-11 00:34:12.000000000 +0100
-+++ mesa/progs/Makefile 2007-11-11 02:06:48.000000000 +0100
+ -rm -f $(PROGS) $(EXTRA_PROGS)
+ -rm -f *.o *~
+--- mesa.orig/progs/Makefile
++++ mesa/progs/Makefile
@@ -21,8 +21,12 @@
fi \
done
Reply to: