* Change libgl1-mesa to be named libgl1-mesa-glx

4 files changed, 14 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 19038a09fb9..3a0669911c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,8 +37,9 @@ mesa (6.4.1-1) unstable; urgency=low
   * Change libgl1-mesa-swrast Depends on libx11-6-dev to libx11-dev.
     (closes: #347205)
   * Change libgl1-mesa-swrast to be named libgl1-mesa-swx11
+  * Change libgl1-mesa to be named libgl1-mesa-glx
 
- -- David Nusinow <dnusinow@debian.org>  Mon, 16 Jan 2006 17:18:10 -0500
+ -- David Nusinow <dnusinow@debian.org>  Thu, 19 Jan 2006 18:44:04 -0500
 
 mesa (6.3.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 59d1e478019..2bd7e4d4184 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: A free implementation of the OpenGL API -- runtime
  .
  This library provides a pure software rasteriser; it does not provide
  a direct rendering-capable library, or one which uses GLX.  For that,
- please see libgl1-mesa.
+ please see libgl1-mesa-glx.
  .
  On Linux, this library is also known as libGL or libGL.so.1.
 
@@ -37,7 +37,7 @@ Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
 Description: A free implementation of the OpenGL API -- development support files
  This package provides the development environment required for
  compiling programs with Mesa.  For a complete description of Mesa,
- please look at the libgl1-mesa package.
+ please look at the libgl1-mesa-swx11 package.
  .
  This package also provides a simple widgets library, libGLw, which
  allows Motif-based applications to embed an OpenGL drawing context.
@@ -61,7 +61,7 @@ Description: A free implementation of the OpenGL API -- debugging package
  For a complete description of Mesa, please look at the libgl1-mesa-swx11
  package.
 
-Package: libgl1-mesa
+Package: libgl1-mesa-glx
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -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 (= ${Source-Version})
+Depends: ${shlibs-Depends}, libgl1-mesa-glx (= ${Source-Version})
 Conflicts: xlibmesa-dri
 Replaces: xlibmesa-dri
 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 (=${Source-Version})
+Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${Source-Version}), libgl1-mesa-glx (=${Source-Version}), libgl1-mesa-dri (={Source-Version})
 Conflicts: libgl-dev, libgl1-mesa-dri-dev
 Replaces: libgl-dev, libgl1-mesa-dri-dev
 Provides: libgl-dev, libgl1-mesa-dri-dev
@@ -111,7 +111,7 @@ Description: A free implementation of the OpenGL API -- GLX development support
  This package includes headers and static libraries for compiling
  programs with Mesa.
  .
- For a complete description of Mesa, please look at the libgl1-mesa
+ For a complete description of Mesa, please look at the libgl1-mesa-swx11
  package.
 
 Package: libgl1-mesa-directfb
@@ -125,7 +125,7 @@ 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
+ For a complete description of Mesa, please look at the libgl1-mesa-swx11
  package.
 
 Package: libgl1-mesa-directfb-dev
@@ -142,7 +142,7 @@ Description: A free implementation of the OpenGL API -- DirectFB development sup
  This package includes headers and static libraries for compiling
  programs with Mesa.
  .
- For a complete description of Mesa, please look at the libgl1-mesa
+ For a complete description of Mesa, please look at the libgl1-mesa-swx11
  package.
 
 Package: mesa-common-dev
@@ -181,7 +181,7 @@ Description: Mesa Off-screen rendering extension -- development support files
 Package: libglu1-mesa
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgl1-mesa | libgl1
+Depends: ${shlibs:Depends}, libgl1-mesa-swx11 | libgl1
 Provides: libglu1
 Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
 Replaces: libglu1
diff --git a/debian/libdir.map b/debian/libdir.map
index 508b58d9c58..f1f62492858 100644
--- a/debian/libdir.map
+++ b/debian/libdir.map
@@ -4,7 +4,7 @@ gl-debian-debug usr/lib/debug libgl1-mesa-swx11-dbg libgl1-mesa-swx11-dbg
 gl-debian_i386 usr/lib/i686/mmx/cmov libgl1-mesa-swx11 libgl1-mesa-swx11-dev
 gl-debian-static_i386 usr/lib/i686/mmx/cmov libgl1-mesa-swx11 libgl1-mesa-swx11-dev
 gl-debian-debug_i386 usr/lib/debug/i686/mmx/cmov libgl1-mesa-swx11-dbg libgl1-mesa-swx11-dbg
-gl-debian-dri usr/lib libgl1-mesa libgl1-mesa-dev
+gl-debian-dri usr/lib libgl1-mesa-glx libgl1-mesa-dev
 gl-debian-directfb usr/lib libgl1-mesa-directfb libgl1-mesa-directfb-dev
 gl-debian-osmesa16 usr/lib libosmesa6 libosmesa6-dev
 gl-debian-osmesa16-static usr/lib libosmesa6 libosmesa6-dev
diff --git a/debian/rules b/debian/rules
index f0dfc1a72ab..ec84c038a8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -198,8 +198,8 @@ endif
 ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-swx11)),)
 	dh_makeshlibs -plibgl1-mesa-swx11 -V 'libgl1-mesa-swx11 | libgl1'
 endif
-ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa)),)
-	dh_makeshlibs -plibgl1-mesa -V 'libgl1-mesa | libgl1'
+ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-glx)),)
+	dh_makeshlibs -plibgl1-mesa-glx -V 'libgl1-mesa-glx | libgl1'
 endif
 ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-directfb)),)
 	dh_makeshlibs -plibgl1-mesa-directfb -V 'libgl1-mesa-directfb | libgl1'