debian/changelog | 5 +++-- debian/control | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit b29906f981e97cfb7ec04b7da731a8ce64108ac3 Author: Timo Aaltonen <[email protected]> Date: Thu Sep 6 18:10:11 2012 +0300 release to quantal diff --git a/debian/changelog b/debian/changelog index 208228d..2134713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -mesa (9.0~git20120903.e1673d20-0ubuntu1) UNRELEASED; urgency=low +mesa (9.0~git20120903.e1673d20-0ubuntu1) quantal; urgency=low * Merge from unreleased debian git. * Remove 118-remove-assertion.diff, included upstream. - -- Timo Aaltonen <[email protected]> Tue, 04 Sep 2012 17:25:27 +0300 + -- Timo Aaltonen <[email protected]> Thu, 06 Sep 2012 18:09:56 +0300 mesa (9.0~git20120821.c1114c61-0ubuntu2) quantal; urgency=low commit 25eaee1c979657c6132e2fc511b873a126249d35 Author: Sven Joachim <[email protected]> Date: Tue Sep 4 21:08:55 2012 +0200 rules: Rename swx11-i686 target No glu here anymore. diff --git a/debian/rules b/debian/rules index 4346b68..248e7a0 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,7 @@ CONFIGS = swx11 \ dri ifeq ($(DEB_HOST_ARCH_CPU), i386) - CONFIGS += swx11+glu-i386-i686 + CONFIGS += swx11-i386-i686 endif STAMP_DIR = debian/stamp @@ -149,7 +149,7 @@ confflags-swx11-static = \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" -confflags-swx11+glu-i386-i686 = \ +confflags-swx11-i386-i686 = \ --disable-dri \ --disable-egl \ --with-gallium-drivers= \ commit c4fee2980b5b4f4656f56c4b0c00ca3a687be3c2 Author: Sven Joachim <[email protected]> Date: Tue Sep 4 21:04:33 2012 +0200 not-installed: Update i386-specific list An i686-optimized osmesa library is apparently no longer built. diff --git a/debian/not-installed b/debian/not-installed index 5ff192f..8fdb25b 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -22,11 +22,7 @@ NOT_INSTALLED := \ # Architecture-specific additional files: NOT_INSTALLED_i386 = \ usr/lib/*/i686/cmov/libGL.so \ - usr/lib/*/i686/cmov/libOSMesa.so \ - usr/lib/*/i686/cmov/libOSMesa.so.6 \ - usr/lib/*/i686/cmov/libOSMesa.so.6.* \ - usr/lib/*/i686/cmov/pkgconfig/gl.pc \ - usr/lib/*/i686/cmov/pkgconfig/osmesa.pc + usr/lib/*/i686/cmov/pkgconfig/gl.pc # Same for linux, kfreebsd, and hurd on i386: NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386) commit 29621fba47e76e8d0c94eecbfa3f27fb80c287a1 Author: Timo Aaltonen <[email protected]> Date: Tue Sep 4 17:22:38 2012 +0300 control: Add libdrm-dev to mesa-common-dev Depends. diff --git a/debian/changelog b/debian/changelog index 34428f0..c9b9f16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low * not-installed: Updated. * Update symbols for libgles2-mesa * libegl1-mesa-drivers.install.linux: Bump libwayland-egl.so version + * control: Add libdrm-dev to mesa-common-dev Depends. [ Steve Langasek ] * Install all dri drivers from the DESTDIR tree, instead of copying them diff --git a/debian/control b/debian/control index 5477756..e9eefb6 100644 --- a/debian/control +++ b/debian/control @@ -734,6 +734,7 @@ Architecture: any Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), libgl1-mesa-dev (<< 7.5~rc4-2) Depends: libx11-dev, + libdrm-dev [!hurd-any], ${misc:Depends}, Description: Developer documentation for Mesa This package includes the specifications for the Mesa-specific OpenGL commit 99b54968abf02eb14ef4289bd30d1a3b6966bf38 Author: Timo Aaltonen <[email protected]> Date: Tue Sep 4 17:20:38 2012 +0300 remove bin/install-sh on clean diff --git a/debian/rules b/debian/rules index 0319d2f..4346b68 100755 --- a/debian/rules +++ b/debian/rules @@ -222,7 +222,7 @@ clean: unpatch rm -rf configure bin/config.guess bin/config.sub config.h.in rm -rf $$(find -name Makefile.in) rm -rf aclocal.m4 bin/missing bin/depcomp install-sh bin/ltmain.sh - rm -f bin/ar-lib bin/compile bin/ylwrap + rm -f bin/ar-lib bin/compile bin/ylwrap bin/install-sh rm -rf $(STAMP_DIR) for file in debian/*.in; do rm -f $${file%%.in}; done rm -f src/glsl/builtins/tools/texture_builtins.pyc -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
