* Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both

    static and shared libraries, creating libglw1-mesa and libglw1-mesa-dev
    (closes: #374904).

5 files changed, 45 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 608d8347e77..1ece9610261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 mesa (6.5.2-4) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * debian/control: libgl1-mesa-dri now suggests libglide3, with an
     explanation in the description (closes: #387339).
 
- -- Julien Cristau <jcristau@debian.org>  Fri, 30 Mar 2007 14:06:44 +0200
+  [ Brice Goglin ]
+  * Split out libGLw libs and headers from libgl1-mesa-swx11 and ship both
+    static and shared libraries, creating libglw1-mesa and libglw1-mesa-dev
+    (closes: #374904).
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org>  Fri, 30 Mar 2007 19:44:53 +0200
 
 mesa (6.5.2-3) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 16a6ebb73d2..8400b0414ae 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,7 @@ Package: libgl1-mesa-swx11-dev
 Section: libdevel
 Architecture: any
 Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${source:Version})
-Provides: libgl-dev, mesag3-widgets, mesag-widgets-dev, libglw-dev, mesag-dev, libgl1-mesa-swrast-dev
+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
 Description: A free implementation of the OpenGL API -- development support files
@@ -88,11 +88,6 @@ Description: A free implementation of the OpenGL API -- development support file
  compiling programs with Mesa.  For a complete description of Mesa,
  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.
- The headers and static libraries for compiling programs that use this
- library are included.
- .
  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-dev.
@@ -303,6 +298,39 @@ Description: The OpenGL utility library -- development support files
  For a complete description of GLU, please look at the libglu1-mesa
  package.
 
+Package: libglw1-mesa
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libgl1-mesa-swx11 (<< 6.5.2-4)
+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
+ that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ Silicon Graphics, Inc.  However, the author makes no claim that Mesa
+ is in any way a compatible replacement for OpenGL or associated with
+ Silicon Graphics, Inc.
+ .
+ This package provides a simple widgets library, libGLw, which
+ allows Motif-based applications to embed an OpenGL drawing context.
+ .
+ On Linux, this library is also known as libGLw or libGLw.so.1.
+
+Package: libglw1-mesa-dev
+Section: libdevel
+Architecture: any
+Depends: libglw1-mesa (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${source:Version})
+Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev
+Conflicts: libgl1-mesa-swx11-dev (<< 6.5.2-4)
+Replaces: libglw-dev
+Description: A free implementation of the OpenGL API -- development support files
+ This package provides the development environment required for
+ compiling programs with the Mesa widgets library, libGLw, which
+ allows Motif-based applications to embed an OpenGL drawing context.
+ The headers and static libraries for compiling programs that use this
+ library are included.
+
 Package: mesa-swx11-source
 Section: libdevel
 Architecture: all
diff --git a/debian/libgl1-mesa-swx11-dev.install b/debian/libgl1-mesa-swx11-dev.install
index 86f5b3e4cb1..f353c5923d6 100644
--- a/debian/libgl1-mesa-swx11-dev.install
+++ b/debian/libgl1-mesa-swx11-dev.install
@@ -1,4 +1,2 @@
-usr/include/GL/GLw*A.h
 usr/lib/libGL.a
 usr/lib/libGL.so
-usr/lib/libGLw.a
diff --git a/debian/libglw1-mesa-dev.install b/debian/libglw1-mesa-dev.install
new file mode 100644
index 00000000000..7c03280c337
--- /dev/null
+++ b/debian/libglw1-mesa-dev.install
@@ -0,0 +1,3 @@
+usr/include/GL/GLw*A.h
+usr/lib/libGLw.a
+usr/lib/libGLw.so
diff --git a/debian/libglw1-mesa.install b/debian/libglw1-mesa.install
new file mode 100644
index 00000000000..9d299c81a51
--- /dev/null
+++ b/debian/libglw1-mesa.install
@@ -0,0 +1 @@
+usr/lib/libGLw.so.*