* Change libgl1-mesa-swrast to be named libgl1-mesa-swx11

7 files changed, 98 insertions, 94 deletions

diff --git a/debian/changelog b/debian/changelog
index 8d3e8f9cea6..19038a09fb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,14 +30,15 @@ mesa (6.4.1-1) unstable; urgency=low
 
   [ David Nusinow <[email protected]> ]
   * New upstream version (6.4.1) (closes: #232665)
-  * Merge changes from Ubuntu version 6.4.1-0ubuntu1. 
+  * Merge changes from Ubuntu version 6.4.1-0ubuntu1.
     (closes: #341479, #340168, #334742)
     + Add new files required by xorg-server GL build to mesa-swrast-source.
   * NMU to begin getting Xorg 7.0 in to Debian
   * Change libgl1-mesa-swrast Depends on libx11-6-dev to libx11-dev.
     (closes: #347205)
+  * Change libgl1-mesa-swrast to be named libgl1-mesa-swx11
 
- -- David Nusinow <[email protected]>  Tue, 10 Jan 2006 23:00:02 -0500
+ -- David Nusinow <[email protected]>  Mon, 16 Jan 2006 17:18:10 -0500
 
 mesa (6.3.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 563e0715971..59d1e478019 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,13 @@ Uploaders: Marcelo E. Magallon <[email protected]>
 Standards-Version: 3.6.1
 Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 1.0.5), libdirectfb-dev, makedepend | xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, 
 
-Package: libgl1-mesa-swrast
+Package: libgl1-mesa-swx11
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
-Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3
-Provides: libgl1, mesag3
-Replaces: libgl1, mesag3
+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
 Description: A free implementation of the OpenGL API -- runtime
  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
@@ -27,13 +27,13 @@ Description: A free implementation of the OpenGL API -- runtime
  .
  On Linux, this library is also known as libGL or libGL.so.1.
 
-Package: libgl1-mesa-swrast-dev
+Package: libgl1-mesa-swx11-dev
 Section: libdevel
 Architecture: any
-Depends: libgl1-mesa-swrast (= ${Source-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
-Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev
-Replaces: libgl-dev, mesag-dev
+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
+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
 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,
@@ -48,14 +48,17 @@ Description: A free implementation of the OpenGL API -- development support file
  a direct rendering-capable library, or one which uses GLX.  For that,
  please see libgl1-mesa-dev.
 
-Package: libgl1-mesa-swrast-dbg
+Package: libgl1-mesa-swx11-dbg
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libglu1-mesa | libglu1
+Conflicts: libgl1-mesa-swrast-dbg
+Replaces: libgl1-mesa-swrast-dbg
+Provides: libgl1-mesa-swrast-dbg
 Description: A free implementation of the OpenGL API -- debugging package
  This package provides a debug-enabled version of the Mesa libraries.
  .
- For a complete description of Mesa, please look at the libgl1-mesa-swrast
+ For a complete description of Mesa, please look at the libgl1-mesa-swx11
  package.
 
 Package: libgl1-mesa
@@ -74,7 +77,7 @@ Description: A free implementation of the OpenGL API -- GLX runtime
  in the libgl1-mesa-dri package.
  .
  For a complete description of Mesa, please look at the
- libgl1-mesa-swrast package.
+ libgl1-mesa-swx11 package.
 
 Package: libgl1-mesa-dri
 Section: libs
@@ -91,7 +94,7 @@ Description: A free implementation of the OpenGL API -- DRI modules
  modules for accelerating direct rendering.
  .
  For a complete description of Mesa, please look at the
- libgl1-mesa-swrast package.
+ libgl1-mesa-swx11 package.
 
 Package: libgl1-mesa-dev
 Section: libs
@@ -165,7 +168,7 @@ Description: Mesa Off-screen rendering extension
 Package: libosmesa6-dev
 Section: devel
 Architecture: any
-Depends: libosmesa6 (= ${Source-Version}), libgl1-mesa-swrast-dev (= ${Source-Version})
+Depends: libosmesa6 (= ${Source-Version}), libgl1-mesa-swx11-dev (= ${Source-Version})
 Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
 Replaces: xlibosmesa-dev, libosmesa-dev
 Provides: xlibosmesa-dev, libosmesa-dev
@@ -209,7 +212,7 @@ Description: The OpenGL utility library -- development support files
  For a complete description of GLU, please look at the libglu1-mesa
  package.
 
-Package: mesa-swrast-source
+Package: mesa-swx11-source
 Section: libdevel
 Architecture: all
 Description: Mesa software rasteriser source -- development support files
diff --git a/debian/libdir.map b/debian/libdir.map
index f863feb764e..508b58d9c58 100644
--- a/debian/libdir.map
+++ b/debian/libdir.map
@@ -1,9 +1,9 @@
-gl-debian usr/lib libgl1-mesa-swrast libgl1-mesa-swrast-dev
-gl-debian-static usr/lib libgl1-mesa-swrast libgl1-mesa-swrast-dev
-gl-debian-debug usr/lib/debug libgl1-mesa-swrast-dbg libgl1-mesa-swrast-dbg
-gl-debian_i386 usr/lib/i686/mmx/cmov libgl1-mesa-swrast libgl1-mesa-swrast-dev
-gl-debian-static_i386 usr/lib/i686/mmx/cmov libgl1-mesa-swrast libgl1-mesa-swrast-dev
-gl-debian-debug_i386 usr/lib/debug/i686/mmx/cmov libgl1-mesa-swrast-dbg libgl1-mesa-swrast-dbg
+gl-debian usr/lib libgl1-mesa-swx11 libgl1-mesa-swx11-dev
+gl-debian-static usr/lib libgl1-mesa-swx11 libgl1-mesa-swx11-dev
+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-directfb usr/lib libgl1-mesa-directfb libgl1-mesa-directfb-dev
 gl-debian-osmesa16 usr/lib libosmesa6 libosmesa6-dev
@@ -12,4 +12,4 @@ gl-debian-osmesa32 usr/lib libosmesa6 libosmesa6-dev
 gl-debian-osmesa32-static usr/lib libosmesa6 libosmesa6-dev
 glu-debian usr/lib libglu1-mesa libglu1-mesa-dev
 glu-debian-static usr/lib libglu1-mesa libglu1-mesa-dev
-glw-debian-static usr/lib libgl1-mesa-swrast libgl1-mesa-swrast-dev
+glw-debian-static usr/lib libgl1-mesa-swx11 libgl1-mesa-swx11-dev
diff --git a/debian/libgl1-mesa-swrast-dev.install b/debian/libgl1-mesa-swx11-dev.install
index da4b3b1a6ca..da4b3b1a6ca 100644
--- a/debian/libgl1-mesa-swrast-dev.install
+++ b/debian/libgl1-mesa-swx11-dev.install
diff --git a/debian/mesa-swrast-source.dirs b/debian/mesa-swx11-source.dirs
index 8256e60ad87..8256e60ad87 100644
--- a/debian/mesa-swrast-source.dirs
+++ b/debian/mesa-swx11-source.dirs
diff --git a/debian/mesa-swrast-source.install b/debian/mesa-swx11-source.install
index 8213ab709de..a065e560a73 100644
--- a/debian/mesa-swrast-source.install
+++ b/debian/mesa-swx11-source.install
@@ -144,73 +144,73 @@ src/mesa/array_cache/ac_context.c usr/share/mesa-source/src/mesa/array_cache
 src/mesa/array_cache/ac_context.h usr/share/mesa-source/src/mesa/array_cache
 src/mesa/array_cache/ac_import.c usr/share/mesa-source/src/mesa/array_cache
 src/mesa/array_cache/acache.h usr/share/mesa-source/src/mesa/array_cache
-src/mesa/swrast/s_aaline.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_aaline.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_aalinetemp.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_aatriangle.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_aatriangle.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_aatritemp.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_accum.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_accum.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_alpha.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_alpha.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_atifragshader.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_atifragshader.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_bitmap.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_blend.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_blend.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_buffers.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_context.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_context.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_copypix.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_depth.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_depth.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_drawpix.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_drawpix.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_feedback.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_feedback.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_fog.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_fog.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_fragprog_to_c.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_imaging.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_lines.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_lines.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_linetemp.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_logic.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_logic.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_masking.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_masking.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_nvfragprog.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_nvfragprog.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_pixeltex.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_pixeltex.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_points.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_points.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_pointtemp.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_readpix.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_span.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_span.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_spantemp.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_stencil.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_stencil.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_tcc.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_texstore.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_texture.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_texture.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_triangle.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_triangle.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_trispan.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_tritemp.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_zoom.c usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/s_zoom.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast/swrast.h usr/share/mesa-source/src/mesa/swrast
-src/mesa/swrast_setup/ss_context.c usr/share/mesa-source/src/mesa/swrast_setup
-src/mesa/swrast_setup/ss_context.h usr/share/mesa-source/src/mesa/swrast_setup
-src/mesa/swrast_setup/ss_triangle.c usr/share/mesa-source/src/mesa/swrast_setup
-src/mesa/swrast_setup/ss_triangle.h usr/share/mesa-source/src/mesa/swrast_setup
-src/mesa/swrast_setup/ss_tritmp.h usr/share/mesa-source/src/mesa/swrast_setup
-src/mesa/swrast_setup/ss_vb.h usr/share/mesa-source/src/mesa/swrast_setup
-src/mesa/swrast_setup/swrast_setup.h usr/share/mesa-source/src/mesa/swrast_setup
+src/mesa/swx11/s_aaline.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_aaline.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_aalinetemp.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_aatriangle.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_aatriangle.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_aatritemp.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_accum.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_accum.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_alpha.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_alpha.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_atifragshader.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_atifragshader.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_bitmap.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_blend.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_blend.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_buffers.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_context.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_context.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_copypix.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_depth.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_depth.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_drawpix.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_drawpix.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_feedback.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_feedback.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_fog.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_fog.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_fragprog_to_c.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_imaging.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_lines.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_lines.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_linetemp.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_logic.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_logic.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_masking.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_masking.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_nvfragprog.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_nvfragprog.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_pixeltex.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_pixeltex.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_points.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_points.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_pointtemp.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_readpix.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_span.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_span.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_spantemp.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_stencil.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_stencil.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_tcc.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_texstore.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_texture.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_texture.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_triangle.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_triangle.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_trispan.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_tritemp.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_zoom.c usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/s_zoom.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11/swx11.h usr/share/mesa-source/src/mesa/swx11
+src/mesa/swx11_setup/ss_context.c usr/share/mesa-source/src/mesa/swx11_setup
+src/mesa/swx11_setup/ss_context.h usr/share/mesa-source/src/mesa/swx11_setup
+src/mesa/swx11_setup/ss_triangle.c usr/share/mesa-source/src/mesa/swx11_setup
+src/mesa/swx11_setup/ss_triangle.h usr/share/mesa-source/src/mesa/swx11_setup
+src/mesa/swx11_setup/ss_tritmp.h usr/share/mesa-source/src/mesa/swx11_setup
+src/mesa/swx11_setup/ss_vb.h usr/share/mesa-source/src/mesa/swx11_setup
+src/mesa/swx11_setup/swx11_setup.h usr/share/mesa-source/src/mesa/swx11_setup
 src/mesa/tnl/t_array_api.c usr/share/mesa-source/src/mesa/tnl
 src/mesa/tnl/t_array_api.h usr/share/mesa-source/src/mesa/tnl
 src/mesa/tnl/t_array_import.c usr/share/mesa-source/src/mesa/tnl
diff --git a/debian/rules b/debian/rules
index 1e1369b5edf..f0dfc1a72ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -185,7 +185,7 @@ binary-arch: build install
 	dh_compress -s
 	dh_fixperms -s
 #	dh_makeshlibs -s -Nlibglu1-mesa -Nmesag3
-	dh_makeshlibs -plibgl1-mesa-swrast-dbg -V 'libgl1-mesa-swrast | libgl1'
+	dh_makeshlibs -plibgl1-mesa-swx11-dbg -V 'libgl1-mesa-swx11 | libgl1'
 ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-glide3)),)
 	dh_makeshlibs -plibgl1-mesa-glide3 -V 'libgl1-mesa-glide3'
 endif
@@ -195,8 +195,8 @@ endif
 ifneq ($(strip $(shell dh_listpackages -s | grep -w libosmesa6)),)
 	dh_makeshlibs -plibosmesa6
 endif
-ifneq ($(strip $(shell dh_listpackages -s | grep -w libgl1-mesa-swrast)),)
-	dh_makeshlibs -plibgl1-mesa-swrast -V 'libgl1-mesa-swrast | libgl1'
+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'