debian/changelog | 8 + debian/control | 159 +++++++++++++++++++++++-------- debian/libegl1-mesa.lintian-overrides | 1 debian/libgles1-mesa.lintian-overrides | 1 debian/libgles2-mesa.lintian-overrides | 1 debian/libopenvg1-mesa.lintian-overrides | 1 6 files changed, 135 insertions(+), 36 deletions(-)
New commits: commit 615a21af82b43b2cebce700e3dccc195f1b92418 Author: Julien Cristau <jcris...@debian.org> Date: Fri Jun 11 15:38:28 2010 +0200 Add new lintian overrides for the package-name-doesnt-match-sonames stuff. diff --git a/debian/changelog b/debian/changelog index 17595b1..5c098e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ mesa (7.8.1-3) UNRELEASED; urgency=low * libc6-dev is build-essential, no need to depend on it. * Replace nonsensical dependency of libglw1-mesa-dev on libxext6 with a dependency on libxt-dev and lesstif2-dev. + * Add new lintian overrides for the package-name-doesnt-match-sonames stuff. -- Robert Hooker <sarv...@ubuntu.com> Fri, 11 Jun 2010 09:46:20 -0400 diff --git a/debian/libegl1-mesa.lintian-overrides b/debian/libegl1-mesa.lintian-overrides new file mode 100644 index 0000000..2f45998 --- /dev/null +++ b/debian/libegl1-mesa.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames libEGL1 diff --git a/debian/libgles1-mesa.lintian-overrides b/debian/libgles1-mesa.lintian-overrides new file mode 100644 index 0000000..93b6615 --- /dev/null +++ b/debian/libgles1-mesa.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames libGLESv1-CM1 diff --git a/debian/libgles2-mesa.lintian-overrides b/debian/libgles2-mesa.lintian-overrides new file mode 100644 index 0000000..98749e2 --- /dev/null +++ b/debian/libgles2-mesa.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames libGLESv2-2 diff --git a/debian/libopenvg1-mesa.lintian-overrides b/debian/libopenvg1-mesa.lintian-overrides new file mode 100644 index 0000000..8195176 --- /dev/null +++ b/debian/libopenvg1-mesa.lintian-overrides @@ -0,0 +1 @@ +package-name-doesnt-match-sonames libOpenVG1 commit cbaaac08807f50e0e0bbbd2f1442bc3c5c7a988e Author: Julien Cristau <jcris...@debian.org> Date: Fri Jun 11 15:32:45 2010 +0200 Fix libglw1-mesa-dev Depends Replace nonsensical dependency of libglw1-mesa-dev on libxext6 with a dependency on libxt-dev and lesstif2-dev. diff --git a/debian/changelog b/debian/changelog index 2209f6d..17595b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ mesa (7.8.1-3) UNRELEASED; urgency=low [ Julien Cristau ] * Add ${misc:Depends} to all packages. * libc6-dev is build-essential, no need to depend on it. + * Replace nonsensical dependency of libglw1-mesa-dev on libxext6 with a + dependency on libxt-dev and lesstif2-dev. -- Robert Hooker <sarv...@ubuntu.com> Fri, 11 Jun 2010 09:46:20 -0400 diff --git a/debian/control b/debian/control index 6351899..1c9e48a 100644 --- a/debian/control +++ b/debian/control @@ -666,7 +666,8 @@ Architecture: any Depends: libglw1-mesa (= ${binary:Version}), libx11-dev, - libxext6, + libxt-dev, + lesstif2-dev, mesa-common-dev (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, commit 4d0f39c062a71067da35ef7069db5d17ed914c2c Author: Julien Cristau <jcris...@debian.org> Date: Fri Jun 11 15:25:37 2010 +0200 libc6-dev is build-essential, no need to depend on it. diff --git a/debian/changelog b/debian/changelog index f335e30..2209f6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ mesa (7.8.1-3) UNRELEASED; urgency=low [ Julien Cristau ] * Add ${misc:Depends} to all packages. + * libc6-dev is build-essential, no need to depend on it. -- Robert Hooker <sarv...@ubuntu.com> Fri, 11 Jun 2010 09:46:20 -0400 diff --git a/debian/control b/debian/control index 496c709..6351899 100644 --- a/debian/control +++ b/debian/control @@ -100,7 +100,6 @@ Priority: extra Architecture: any Depends: libgl1-mesa-swx11 (= ${binary:Version}), - libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${binary:Version}), @@ -542,7 +541,6 @@ Package: libgl1-mesa-dev Section: libdevel Architecture: any Depends: - libc6-dev, mesa-common-dev (= ${binary:Version}), libgl1-mesa-glx (= ${binary:Version}), ${misc:Depends}, @@ -667,7 +665,6 @@ Section: libdevel Architecture: any Depends: libglw1-mesa (= ${binary:Version}), - libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${binary:Version}), commit 5223c913a561319cba78607261bfcdc3514ec53b Author: Julien Cristau <jcris...@debian.org> Date: Fri Jun 11 15:25:00 2010 +0200 Add ${misc:Depends} to all packages. Also move libegl1-mesa-drivers-kms-dbg to the proper priority and section. diff --git a/debian/changelog b/debian/changelog index 89e2d48..f335e30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ mesa (7.8.1-3) UNRELEASED; urgency=low + [ Robert Hooker ] * Adjust the build system to install the dri target in a seperate DESTDIR, no longer passing --libdir=/usr/lib/glx at configure time messing with the .pc's since it is used for a majority of the packages now. + [ Julien Cristau ] + * Add ${misc:Depends} to all packages. + -- Robert Hooker <sarv...@ubuntu.com> Fri, 11 Jun 2010 09:46:20 -0400 mesa (7.8.1-2) experimental; urgency=low diff --git a/debian/control b/debian/control index 87cf02f..496c709 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,10 @@ Package: libgl1-mesa-swx11 Section: libs Priority: extra Architecture: any -Depends: ${shlibs:Depends}, libosmesa6 (>= 6.5.2-1) +Depends: + libosmesa6 (>= 6.5.2-1), + ${shlibs:Depends}, + ${misc:Depends}, Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast Provides: libgl1, mesag3, libgl1-mesa-swrast Replaces: libgl1, mesag3, libgl1-mesa-swrast @@ -41,7 +44,9 @@ Package: libgl1-mesa-swx11-dbg Section: debug Priority: extra Architecture: any -Depends: libgl1-mesa-swx11 (= ${binary:Version}) +Depends: + libgl1-mesa-swx11 (= ${binary:Version}), + ${misc:Depends}, Conflicts: libgl1-mesa-swrast-dbg Provides: libgl1-mesa-swrast-dbg Replaces: libgl1-mesa-swrast-dbg @@ -66,7 +71,10 @@ Package: libgl1-mesa-swx11-i686 Section: libs Priority: extra Architecture: i386 kfreebsd-i386 hurd-i386 -Depends: libgl1-mesa-swx11 (= ${binary:Version}), ${shlibs:Depends} +Depends: + libgl1-mesa-swx11 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, Description: Mesa OpenGL runtime [i686 optimized] Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL. To the extent that Mesa utilizes the OpenGL command @@ -90,7 +98,13 @@ Package: libgl1-mesa-swx11-dev Section: libdevel Priority: extra Architecture: any -Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${binary:Version}) +Depends: + libgl1-mesa-swx11 (= ${binary:Version}), + libc6-dev, + libx11-dev, + libxext6, + mesa-common-dev (= ${binary:Version}), + ${misc:Depends}, Provides: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev, libgl1-mesa-swrast-dev Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev @@ -106,7 +120,9 @@ Description: A free implementation of the OpenGL API -- development files Package: libegl1-mesa Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Recommends: libegl1-mesa-drivers-x11 Description: A free implementation of the EGL API -- runtime This package contains the EGL native platform graphics interface library. @@ -121,7 +137,9 @@ Package: libegl1-mesa-dbg Section: debug Priority: extra Architecture: any -Depends: libegl1-mesa (= ${binary:Version}), ${misc:Depends} +Depends: + libegl1-mesa (= ${binary:Version}), + ${misc:Depends}, Description: A free implementation of the EGL API -- debugging symbols This package contains the EGL native platform graphics interface library. EGL provides a platform-agnostic mechanism for creating rendering surfaces @@ -132,7 +150,9 @@ Description: A free implementation of the EGL API -- debugging symbols Package: libegl1-mesa-dev Section: libdevel Architecture: any -Depends: libegl1-mesa (= ${binary:Version}), ${misc:Depends} +Depends: + libegl1-mesa (= ${binary:Version}), + ${misc:Depends}, Description: A free implementation of the EGL API -- development files This package contains the development environment required for compiling programs against EGL native platform graphics interface library. @@ -145,7 +165,9 @@ Description: A free implementation of the EGL API -- development files Package: libegl1-mesa-drivers-x11 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: A free implementation of the EGL API -- X11 drivers This package contains the EGL native platform graphics interface library. EGL provides a platform-agnostic mechanism for creating rendering surfaces @@ -159,7 +181,9 @@ Package: libegl1-mesa-drivers-x11-dbg Section: debug Priority: extra Architecture: any -Depends: libegl1-mesa-drivers-x11 (= ${binary:Version}), ${misc:Depends} +Depends: + libegl1-mesa-drivers-x11 (= ${binary:Version}), + ${misc:Depends}, Description: A free implementation of the EGL API -- X11 driver debugging symbols This package contains the EGL native platform graphics interface library. EGL provides a platform-agnostic mechanism for creating rendering surfaces @@ -172,7 +196,9 @@ Description: A free implementation of the EGL API -- X11 driver debugging symbol Package: libegl1-mesa-drivers-kms Section: libs Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: A free implementation of the EGL API -- KMS drivers This package contains the EGL native platform graphics interface library. EGL provides a platform-agnostic mechanism for creating rendering surfaces @@ -183,9 +209,12 @@ Description: A free implementation of the EGL API -- KMS drivers KMS-framebuffer environment. Package: libegl1-mesa-drivers-kms-dbg -Section: libs +Section: debug +Priority: extra Architecture: linux-any -Depends: libegl1-mesa-drivers-kms (= ${binary:Version}), ${misc:Depends} +Depends: + libegl1-mesa-drivers-kms (= ${binary:Version}), + ${misc:Depends}, Description: A free implementation of the EGL API -- KMS driver debugging symbols This package contains the EGL native platform graphics interface library. EGL provides a platform-agnostic mechanism for creating rendering surfaces @@ -198,7 +227,9 @@ Description: A free implementation of the EGL API -- KMS driver debugging symbol Package: libopenvg1-mesa Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: A free implementation of the OpenVG API -- runtime This package contains the mesa implementation of the OpenVG 2D acceleration library. OpenVG provides a device independent and vendor-neutral interface @@ -210,7 +241,9 @@ Package: libopenvg1-mesa-dbg Section: debug Priority: extra Architecture: any -Depends: libopenvg1-mesa (= ${binary:Version}), ${misc:Depends} +Depends: + libopenvg1-mesa (= ${binary:Version}), + ${misc:Depends}, Description: A free implementation of the OpenVG API -- debugging symbols This package contains the mesa implementation of the OpenVG 2D acceleration library. OpenVG provides a device independent and vendor-neutral interface @@ -223,7 +256,10 @@ Description: A free implementation of the OpenVG API -- debugging symbols Package: libopenvg1-mesa-dev Section: libdevel Architecture: any -Depends: libopenvg1-mesa (= ${binary:Version}), libegl1-mesa-dev, ${misc:Depends} +Depends: + libopenvg1-mesa (= ${binary:Version}), + libegl1-mesa-dev, + ${misc:Depends}, Description: A free implementation of the OpenVG API -- development files This package contains the mesa implementation of the OpenVG 2D acceleration library. OpenVG provides a device independent and vendor-neutral interface @@ -237,7 +273,9 @@ Description: A free implementation of the OpenVG API -- development files Package: libgles1-mesa Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: A free implementation of the OpenGL|ES 1.x API -- runtime OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on embedded systems - including consoles, phones, appliances and vehicles. @@ -250,7 +288,9 @@ Package: libgles1-mesa-dbg Section: debug Priority: extra Architecture: any -Depends: libgles1-mesa (= ${binary:Version}), ${misc:Depends} +Depends: + libgles1-mesa (= ${binary:Version}), + ${misc:Depends}, Description: A free implementation of the OpenGL|ES 1.x API -- debugging symbols OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on embedded systems - including consoles, phones, appliances and vehicles. @@ -264,7 +304,10 @@ Description: A free implementation of the OpenGL|ES 1.x API -- debugging symbols Package: libgles1-mesa-dev Section: libdevel Architecture: any -Depends: libgles1-mesa (= ${binary:Version}), libegl1-mesa-dev, ${misc:Depends} +Depends: + libgles1-mesa (= ${binary:Version}), + libegl1-mesa-dev, + ${misc:Depends}, Description: A free implementation of the OpenGL|ES 1.x API -- development files OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on embedded systems - including consoles, phones, appliances and vehicles. @@ -279,7 +322,9 @@ Description: A free implementation of the OpenGL|ES 1.x API -- development files Package: libgles2-mesa Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: A free implementation of the OpenGL|ES 2.x API -- runtime OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on embedded systems - including consoles, phones, appliances and vehicles. @@ -293,7 +338,9 @@ Package: libgles2-mesa-dbg Section: debug Priority: extra Architecture: any -Depends: libgles2-mesa (= ${binary:Version}), ${misc:Depends} +Depends: + libgles2-mesa (= ${binary:Version}), + ${misc:Depends}, Description: A free implementation of the OpenGL|ES 2.x API -- debugging symbols OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on embedded systems - including consoles, phones, appliances and vehicles. @@ -308,7 +355,10 @@ Description: A free implementation of the OpenGL|ES 2.x API -- debugging symbols Package: libgles2-mesa-dev Section: libdevel Architecture: any -Depends: libgles2-mesa (= ${binary:Version}), libegl1-mesa-dev, ${misc:Depends} +Depends: + libgles2-mesa (= ${binary:Version}), + libegl1-mesa-dev, + ${misc:Depends}, Description: A free implementation of the OpenGL|ES 2.x API -- development files OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on embedded systems - including consoles, phones, appliances and vehicles. @@ -324,7 +374,9 @@ Description: A free implementation of the OpenGL|ES 2.x API -- development files Package: libgl1-mesa-glx Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends} Recommends: libgl1-mesa-dri (>= 7.2) Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0) Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0) @@ -344,7 +396,9 @@ Package: libgl1-mesa-glx-dbg Section: debug Priority: extra Architecture: any -Depends: libgl1-mesa-glx (= ${binary:Version}) +Depends: + libgl1-mesa-glx (= ${binary:Version}), + ${misc:Depends}, Description: Debugging symbols for the Mesa GLX runtime This version of Mesa provides GLX and DRI capabilities: it is capable of both direct and indirect rendering. For direct rendering, it can use DRI @@ -384,7 +438,9 @@ Package: libgl1-mesa-dri Section: libs Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends} Suggests: libglide3 Conflicts: xlibmesa-dri (<< 1:7.0.0) Replaces: xlibmesa-dri (<< 1:7.0.0) @@ -406,7 +462,9 @@ Package: libgl1-mesa-dri-dbg Section: debug Priority: extra Architecture: any -Depends: libgl1-mesa-dri (= ${binary:Version}) +Depends: + libgl1-mesa-dri (= ${binary:Version}), + ${misc:Depends}, Description: Debugging symbols for the Mesa DRI modules This version of Mesa provides GLX and DRI capabilities: it is capable of both direct and indirect rendering. For direct rendering, it can use DRI @@ -423,7 +481,9 @@ Description: Debugging symbols for the Mesa DRI modules Package: libgl1-mesa-dri-experimental Section: libs Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: A free implementation of the OpenGL API -- Extra DRI modules This version of Mesa provides GLX and DRI capabilities: it is capable of both direct and indirect rendering. For direct rendering, it can use DRI @@ -441,7 +501,9 @@ Package: libgl1-mesa-dri-experimental-dbg Section: debug Priority: extra Architecture: linux-any -Depends: libgl1-mesa-dri-experimental (= ${binary:Version}), ${misc:Depends} +Depends: + libgl1-mesa-dri-experimental (= ${binary:Version}), + ${misc:Depends}, Description: Debugging symbols for the experimental Mesa DRI modules This version of Mesa provides GLX and DRI capabilities: it is capable of both direct and indirect rendering. For direct rendering, it can use DRI @@ -479,7 +541,11 @@ Description: Debugging symbols for the experimental Mesa DRI modules Package: libgl1-mesa-dev Section: libdevel Architecture: any -Depends: libc6-dev, mesa-common-dev (= ${binary:Version}), libgl1-mesa-glx (= ${binary:Version}) +Depends: + libc6-dev, + mesa-common-dev (= ${binary:Version}), + libgl1-mesa-glx (= ${binary:Version}), + ${misc:Depends}, Conflicts: libgl-dev, libgl1-mesa-dri-dev Replaces: libgl-dev, libgl1-mesa-dri-dev Provides: libgl-dev, libgl1-mesa-dri-dev @@ -498,7 +564,9 @@ Package: mesa-common-dev Section: libdevel 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 +Depends: + libx11-dev, + ${misc:Depends}, Description: Developer documentation for Mesa This package includes the specifications for the Mesa-specific OpenGL extensions, the complete set of release notes and the development header @@ -507,7 +575,9 @@ Description: Developer documentation for Mesa Package: libosmesa6 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Replaces: libgl1-mesa-swx11 (<< 6.5.2) Description: Mesa Off-screen rendering extension OSmesa is a Mesa extension that allows programs to render to an @@ -520,7 +590,10 @@ Description: Mesa Off-screen rendering extension Package: libosmesa6-dev Section: libdevel Architecture: any -Depends: libosmesa6 (= ${binary:Version}), mesa-common-dev (= ${binary:Version}) | libgl-dev +Depends: + libosmesa6 (= ${binary:Version}), + mesa-common-dev (= ${binary:Version}) | libgl-dev, + ${misc:Depends}, Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), mesa-common-dev (<< 6.5.2) Provides: xlibosmesa-dev, libosmesa-dev @@ -533,7 +606,9 @@ Description: Mesa Off-screen rendering extension -- development files Package: libglu1-mesa Section: libs Architecture: any -Depends: ${shlibs:Depends}, libgl1-mesa-glx | libgl1 +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Provides: libglu1 Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1 Replaces: libglu1 @@ -554,7 +629,10 @@ Description: The OpenGL utility library (GLU) Package: libglu1-mesa-dev Section: libdevel Architecture: any -Depends: libglu1-mesa (= ${binary:Version}), libgl1-mesa-dev | libgl-dev +Depends: + libglu1-mesa (= ${binary:Version}), + libgl1-mesa-dev | libgl-dev, + ${misc: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 @@ -567,7 +645,9 @@ Description: The OpenGL utility library -- development files Package: libglw1-mesa Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Provides: libglw1 Description: A free implementation of the OpenGL API -- runtime Mesa is a 3-D graphics library with an API which is very similar to @@ -585,7 +665,14 @@ Description: A free implementation of the OpenGL API -- runtime Package: libglw1-mesa-dev Section: libdevel Architecture: any -Depends: libglw1-mesa (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${binary:Version}) +Depends: + libglw1-mesa (= ${binary:Version}), + libc6-dev, + libx11-dev, + libxext6, + mesa-common-dev (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev Conflicts: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4) Replaces: libglw-dev @@ -600,7 +687,9 @@ Package: mesa-utils Section: x11 Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Replaces: xbase-clients (<< 6.8.2-38) Description: Miscellaneous Mesa GL utilities This package provides several basic GL utilities built by Mesa, including -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1on58d-0000lu...@alioth.debian.org