mesa: Changes to 'debian-experimental'
debian/changelog | 5 ++++-
debian/control | 5 +++--
debian/libglapi-mesa.lintian-overrides | 1 +
debian/patches/11-hurd-ftbfs-again.diff | 24 ++++++++++++------------
4 files changed, 20 insertions(+), 15 deletions(-)
New commits:
commit f42a126bb967a1a12d93dbf32253a7e6c9e75df4
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 00:42:09 2011 +0200
Use a package-name-doesnt-match-sonames override accordingly.
diff --git a/debian/changelog b/debian/changelog
index 0b47f95..dac6d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
(those files aren't in the released tarballs). Let's consider it's OK
to run “rm -f” on them: {,dri/}usr/include/GL/glut{,f90}.h
* Add libglapi-mesa{,-dbg} packages.
+ * Use a package-name-doesnt-match-sonames override accordingly.
* Update libegl1-mesa.symbols with new symbols.
* Update libgles{1,2}-mesa.symbols now that internal symbols (_glapi_*
and _glthread_GetID) moved to libglapi-mesa.
diff --git a/debian/libglapi-mesa.lintian-overrides b/debian/libglapi-mesa.lintian-overrides
new file mode 100644
index 0000000..3aa3d99
--- /dev/null
+++ b/debian/libglapi-mesa.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames libglapi0
commit db7db5679102b529300f929c7689aba0771f25e1
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 00:35:06 2011 +0200
Replace “The OpenGL utility library…” with “Mesa OpenGL utility library…” in the description of the libglu1-mesa* packages.
diff --git a/debian/changelog b/debian/changelog
index b3bbcfd..0b47f95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
* Update libgles{1,2}-mesa.symbols now that internal symbols (_glapi_*
and _glthread_GetID) moved to libglapi-mesa.
* Add a gentarball target, to generate tarballs for git snapshots.
+ * Replace “The OpenGL utility library…” with “Mesa OpenGL utility
+ library…” in the description of the libglu1-mesa* packages.
-- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
diff --git a/debian/control b/debian/control
index aaa45c9..ed61a52 100644
--- a/debian/control
+++ b/debian/control
@@ -658,7 +658,7 @@ Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
Replaces: libglu1
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: The OpenGL utility library (GLU)
+Description: Mesa OpenGL utility library (GLU)
GLU offers simple interfaces for building mipmaps; checking for the
presence of extensions in the OpenGL (or other libraries which follow
the same conventions for advertising extensions); drawing
@@ -682,7 +682,7 @@ Depends:
Provides: libglu-dev, xlibmesa-glu-dev
Conflicts: mesag-dev (<< 5.0.0-1), mesa-glide2-dev (<< 5.0.0-1), mesag3+ggi-dev (<< 5.0.0-1), xlibmesa-dev
Replaces: libglu-dev
-Description: The OpenGL utility library -- development files
+Description: Mesa OpenGL utility library -- development files
Includes headers and static libraries for compiling programs with GLU.
.
For a complete description of GLU, please look at the libglu1-mesa
commit 6f2e62a0b29ad95826b753dfcf612e3e7e62f1ec
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jun 18 23:49:53 2011 +0200
Fix priority for libglapi-mesa-dbg.
diff --git a/debian/control b/debian/control
index c2b664c..aaa45c9 100644
--- a/debian/control
+++ b/debian/control
@@ -413,6 +413,7 @@ Description: free implementation of the GL API -- shared library
Package: libglapi-mesa-dbg
Section: debug
+Priority: extra
Architecture: linux-any kfreebsd-any
Depends:
libglapi-mesa (= ${binary:Version}),
commit 65875e13d4de0ee9355091ec9fe0a51c4497405d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jun 18 23:05:50 2011 +0200
Refresh 11-hurd-ftbfs-again.diff after 4175010749 upstream.
diff --git a/debian/changelog b/debian/changelog
index 0902416..b3bbcfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
* Refresh 11-hurd-ftbfs-again.diff (adjust offsets and drop the
src/gallium/auxiliary/os/os_time.c hunk, which should be OK since
PIPE_OS_UNIX is used there, and should happily replace the use of
- PIPE_OS_HURD).
+ PIPE_OS_HURD; and adapt for the removal of the PIPE_OS_EMBEDDED check).
* debian/libegl1-mesa.install.in: Stop trying to install egl_dri2.so and
egl_glx.so, since they are now built-in (since c98ea26e16).
* debian/libgles{1,2}-mesa.install.in: Stop trying to install
diff --git a/debian/patches/11-hurd-ftbfs-again.diff b/debian/patches/11-hurd-ftbfs-again.diff
index 04438bb..1f6a3df 100644
--- a/debian/patches/11-hurd-ftbfs-again.diff
+++ b/debian/patches/11-hurd-ftbfs-again.diff
@@ -17,8 +17,8 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
#include "util/u_debug.h" /* for assert */
--#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN)
-+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
#include <pthread.h> /* POSIX threads headers */
#include <stdio.h> /* for perror() */
@@ -26,8 +26,8 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
* pipe_barrier
*/
--#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED)
-+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_HURD)
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_HURD)
typedef pthread_barrier_t pipe_barrier;
@@ -35,8 +35,8 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
*/
typedef struct {
--#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN)
-+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
pthread_key_t key;
#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
DWORD key;
@@ -44,8 +44,8 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
static INLINE void
pipe_tsd_init(pipe_tsd *tsd)
{
--#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN)
-+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
perror("pthread_key_create(): failed to allocate key for thread specific data");
exit(-1);
@@ -53,8 +53,8 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
pipe_tsd_init(tsd);
}
--#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN)
-+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
return pthread_getspecific(tsd->key);
#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
assert(0);
@@ -62,8 +62,8 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
if (tsd->initMagic != (int) PIPE_TSD_INIT_MAGIC) {
pipe_tsd_init(tsd);
}
--#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN)
-+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_EMBEDDED) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
+-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_HURD)
if (pthread_setspecific(tsd->key, value) != 0) {
perror("pthread_set_specific() failed");
exit(-1);
Reply to: