* mesa-swrast-src.install stop looking for the swx11 dir and look for swrast

3 files changed, 70 insertions, 69 deletions

diff --git a/debian/changelog b/debian/changelog
index fd1214d2b1f..2b5f696e7f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,8 +37,9 @@ mesa (6.4.1-0.1) unstable; urgency=low
   * Change libgl1-mesa-swrast Depends on libx11-6-dev to libx11-dev.
   * Change libgl1-mesa-swrast to be named libgl1-mesa-swx11
   * Change libgl1-mesa to be named libgl1-mesa-glx
+  * mesa-swrast-src.install stop looking for the swx11 dir and look for swrast
 
- -- David Nusinow <dnusinow@debian.org>  Sat, 21 Jan 2006 18:37:50 -0500
+ -- David Nusinow <dnusinow@debian.org>  Sat, 21 Jan 2006 21:43:37 -0500
 
 mesa (6.3.2-2.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c904fdb2821..c88b08eaf7b 100644
--- a/debian/control
+++ b/debian/control
@@ -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 (=${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
diff --git a/debian/mesa-swx11-source.install b/debian/mesa-swx11-source.install
index a065e560a73..8213ab709de 100644
--- a/debian/mesa-swx11-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/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/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/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