debian/changelog | 12 ++++++++++++ debian/control | 3 +++ debian/rules | 15 +++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-)
New commits: commit 5971e1c999009b51cc7baa72fe869def8bea7e5c Author: Cyril Brulebois <[email protected]> Date: Fri Jun 17 11:24:32 2011 +0200 Add bug closure (#630710). diff --git a/debian/changelog b/debian/changelog index 0e97eea..57e410d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ mesa (7.10.3-2) UNRELEASED; urgency=low * Add Breaks against nvidia and fglrx packages, since they are also affected by the multiarch changes, and need fixing. Until fixed packages reach the archive, nvidia and fglrx users should stick to - mesa 7.10.2-3 packages, currently available in testing. + mesa 7.10.2-3 packages, currently available in testing. Thanks to + Andreas and Patrick for the version strings (Closes: #630710). * Set CXXFLAGS along with CFLAGS (Closes: #630602). Thanks for the report and the patch, Fabio Pedretti! commit 0aab0d719bad882e9cb55125ee33554fe433b9df Author: Cyril Brulebois <[email protected]> Date: Fri Jun 17 11:22:25 2011 +0200 Set CXXFLAGS along with CFLAGS (Closes: #630602). Thanks for the report and the patch, Fabio Pedretti! diff --git a/debian/changelog b/debian/changelog index 8354ddb..0e97eea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ mesa (7.10.3-2) UNRELEASED; urgency=low affected by the multiarch changes, and need fixing. Until fixed packages reach the archive, nvidia and fglrx users should stick to mesa 7.10.2-3 packages, currently available in testing. + * Set CXXFLAGS along with CFLAGS (Closes: #630602). Thanks for the + report and the patch, Fabio Pedretti! -- Cyril Brulebois <[email protected]> Fri, 17 Jun 2011 11:09:10 +0200 diff --git a/debian/rules b/debian/rules index a10a792..843c4bf 100755 --- a/debian/rules +++ b/debian/rules @@ -6,10 +6,13 @@ #export DH_VERBOSE=1 CFLAGS = -Wall -g +CXXFLAGS = -Wall -g ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 + CXXFLAGS += -O0 else CFLAGS += -O2 + CXXFLAGS += -O2 endif ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -58,7 +61,8 @@ confflags-common = \ --disable-glu \ --disable-glut \ --disable-glw \ - CFLAGS="$(CFLAGS)" + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" DRI_DRIVERS = swrast @@ -164,7 +168,8 @@ confflags-swx11+glu = \ --disable-egl \ --disable-glut \ --enable-motif \ - CFLAGS="$(CFLAGS)" + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" confflags-swx11+glu-static = \ --disable-egl \ @@ -175,7 +180,8 @@ confflags-swx11+glu-static = \ --disable-egl \ --disable-glut \ --enable-motif \ - CFLAGS="$(CFLAGS)" + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" confflags-swx11+glu-i386-i686 = \ --disable-egl \ @@ -186,7 +192,8 @@ confflags-swx11+glu-i386-i686 = \ --disable-egl \ --enable-motif \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \ - CFLAGS="$(CFLAGS) -march=i686" + CFLAGS="$(CFLAGS) -march=i686" \ + CXXFLAGS="$(CXXFLAGS) -march=i686" configure: $(QUILT_STAMPFN) configure.ac autoreconf -vfi commit 3707424038f425fbcd1a529ff892231523022f6e Author: Cyril Brulebois <[email protected]> Date: Fri Jun 17 11:18:04 2011 +0200 Add Breaks against nvidia and fglrx packages. They are also affected by the multiarch changes, and need fixing. Until fixed packages reach the archive, nvidia and fglrx users should stick to mesa 7.10.2-3 packages, currently available in testing. diff --git a/debian/changelog b/debian/changelog index 7b7e6f5..8354ddb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mesa (7.10.3-2) UNRELEASED; urgency=low + + * Add Breaks against nvidia and fglrx packages, since they are also + affected by the multiarch changes, and need fixing. Until fixed + packages reach the archive, nvidia and fglrx users should stick to + mesa 7.10.2-3 packages, currently available in testing. + + -- Cyril Brulebois <[email protected]> Fri, 17 Jun 2011 11:09:10 +0200 + mesa (7.10.3-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 950b438..b37337d 100644 --- a/debian/control +++ b/debian/control @@ -406,6 +406,9 @@ Recommends: libgl1-mesa-dri (>= 7.2) Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0) Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0) Provides: libgl1 +Breaks: + libgl1-nvidia-alternatives (<= 275.09.07-1), + fglrx-glx (<< 1:11-6-1), Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: free implementation of the OpenGL API -- GLX runtime -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
