Bump to latest mesa in Debian

1 files changed, 12 insertions, 42 deletions

diff --git a/debian/control b/debian/control
index b444adf3ec7..fd91268235b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: graphics
 Priority: optional
 Maintainer: Mesa package maintainers <pkg-mesa-devel@lists.alioth.debian.org>
 Uploaders: Marcelo E. Magallon <mmagallo@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 2.0.1), libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, 
+Standards-Version: 3.7.2
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 2) [!hurd-i386], libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev, dpkg-dev (>= 1.13.19)
 
 Package: libgl1-mesa-swx11
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
+Depends: ${shlibs: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
@@ -30,7 +30,7 @@ Description: A free implementation of the OpenGL API -- runtime
 Package: libgl1-mesa-swx11-dev
 Section: libdevel
 Architecture: any
-Depends: libgl1-mesa-swx11 (= ${Source-Version}), libc6-dev, libx11-dev | xlibs-dev (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), mesa-common-dev (= ${Source-Version}), lesstif2-dev
+Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev | xlibs-dev (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), mesa-common-dev (= ${source:Version}), lesstif2-dev
 Provides: libgl-dev, mesag3-widgets, mesag-widgets-dev, libglw-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
@@ -51,7 +51,7 @@ Description: A free implementation of the OpenGL API -- development support file
 Package: libgl1-mesa-swx11-dbg
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
+Depends: ${shlibs:Depends}
 Conflicts: libgl1-mesa-swrast-dbg
 Replaces: libgl1-mesa-swrast-dbg
 Provides: libgl1-mesa-swrast-dbg
@@ -67,7 +67,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
 Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
-Provides: libgl1, libgl1-mesa-dri
+Provides: libgl1
 Description: A free implementation of the OpenGL API -- 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
@@ -82,7 +82,7 @@ Description: A free implementation of the OpenGL API -- GLX runtime
 Package: libgl1-mesa-dri
 Section: libs
 Architecture: any
-Depends: ${shlibs-Depends}, libgl1-mesa-glx (= ${Source-Version})
+Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
 Conflicts: xlibmesa-dri (<< 1:7.0.0)
 Replaces: xlibmesa-dri (<< 1:7.0.0)
 Description: A free implementation of the OpenGL API -- DRI modules
@@ -99,7 +99,7 @@ Description: A free implementation of the OpenGL API -- DRI modules
 Package: libgl1-mesa-dev
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${Source-Version}), libgl1-mesa-glx (=${Source-Version}), libgl1-mesa-dri (= ${Source-Version})
+Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (=${binary:Version}), libgl1-mesa-dri (= ${binary:Version})
 Conflicts: libgl-dev, libgl1-mesa-dri-dev
 Replaces: libgl-dev, libgl1-mesa-dri-dev
 Provides: libgl-dev, libgl1-mesa-dri-dev
@@ -114,40 +114,10 @@ Description: A free implementation of the OpenGL API -- GLX development support
  For a complete description of Mesa, please look at the libgl1-mesa-swx11
  package.
 
-Package: libgl1-mesa-directfb
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
-Conflicts: libgl1
-Replaces: libgl1
-Provides: libgl1
-Description: A free implementation of the OpenGL API -- DirectFB runtime
- This version of Mesa provides hardware accelerated rendering
- capabilities via the DirectFB infraestructure.
- .
- For a complete description of Mesa, please look at the libgl1-mesa-swx11
- package.
-
-Package: libgl1-mesa-directfb-dev
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${Source-Version}), libgl1-mesa-directfb (=${Source-Version})
-Conflicts: libgl-dev
-Replaces: libgl-dev
-Provides: libgl-dev
-Description: A free implementation of the OpenGL API -- DirectFB development support files
- This version of Mesa provides hardware accelerated rendering
- capabilities via the DirectFB infraestructure.
- .
- This package includes headers and static libraries for compiling
- programs with Mesa.
- .
- For a complete description of Mesa, please look at the libgl1-mesa-swx11
- package.
-
 Package: mesa-common-dev
 Section: devel
 Architecture: all
+Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev
 Description: Developer documentation for Mesa
  This package includes the specifications for the Mesa-specific OpenGL
  extensions, the complete set of release release notes and the
@@ -168,7 +138,7 @@ Description: Mesa Off-screen rendering extension
 Package: libosmesa6-dev
 Section: devel
 Architecture: any
-Depends: libosmesa6 (= ${Source-Version}), libgl1-mesa-swx11-dev (= ${Source-Version})
+Depends: libosmesa6 (= ${binary:Version}), libgl1-mesa-swx11-dev (= ${binary:Version})
 Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
 Replaces: xlibosmesa-dev, libosmesa-dev
 Provides: xlibosmesa-dev, libosmesa-dev
@@ -202,8 +172,8 @@ Description: The OpenGL utility library (GLU)
 Package: libglu1-mesa-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, libglu1-mesa (= ${Source-Version}), libgl1-mesa-dev | libgl-dev
-Provides: libglu-dev
+Depends: ${shlibs:Depends}, libglu1-mesa (= ${binary:Version}), libgl1-mesa-dev | libgl-dev
+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 support files