The attached patch is my first shot at moving GLw out of mesa-swx11
packages. Some Provides/conflicts adjustment might be required, but
otherwise it looks good. Apart from /usr/share/doc/, the resulting
package contents are:
$ dpkg -c libgl1-mesa-swx11_6.5.2-4_i386.deb
-rw-r--r-- root/root 2450892 2007-02-18 23:29 ./usr/lib/libGL.so.1.5.060502
lrwxrwxrwx root/root 0 2007-02-18 23:29 ./usr/lib/libGL.so.1 ->
libGL.so.1.5.060502
$ dpkg -c libgl1-mesa-swx11_6.5.2-4_i386.deb
-rw-r--r-- root/root 3060250 2007-02-18 23:29 ./usr/lib/libGL.a
lrwxrwxrwx root/root 0 2007-02-18 23:29 ./usr/lib/libGL.so -> libGL.so.1
$ dpkg -c libglw1-mesa_6.5.2-4_i386.deb
-rw-r--r-- root/root 16340 2007-02-18 23:29 ./usr/lib/libGLw.so.1.0.0
lrwxrwxrwx root/root 0 2007-02-18 23:29 ./usr/lib/libGLw.so.1 ->
libGLw.so.1.0.0
$ dpkg -c libglw1-mesa-dev_6.5.2-4_i386.deb
drwxr-xr-x root/root 0 2007-02-18 23:29 ./usr/include/
drwxr-xr-x root/root 0 2007-02-18 23:29 ./usr/include/GL/
-rw-r--r-- root/root 6609 2007-02-18 23:27 ./usr/include/GL/GLwDrawA.h
-rw-r--r-- root/root 2030 2007-02-18 23:27 ./usr/include/GL/GLwMDrawA.h
drwxr-xr-x root/root 0 2007-02-18 23:29 ./usr/lib/
-rw-r--r-- root/root 18538 2007-02-18 23:29 ./usr/lib/libGLw.a
lrwxrwxrwx root/root 0 2007-02-18 23:29 ./usr/lib/libGLw.so ->
libGLw.so.1
I modified inventor to build using libglw1-mesa-dev instead of
libgl1-mesa-swx11-dev, it seems to still build and work fine.
Brice
diff --git a/debian/changelog b/debian/changelog
index e9446fe..1672b82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (6.5.2-4) experimental; urgency=low
+
+ * 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: #374303).
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Sun, 18 Feb 2007 20:05:19 +0100
+
mesa (6.5.2-3) experimental; urgency=low
* Set LIB_DIR and EXTRA_LIB_PATH in configs/debian-default to override
diff --git a/debian/control b/debian/control
index 5ac6522..147c420 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.
@@ -300,6 +295,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 86f5b3e..f353c59 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 0000000..7c03280
--- /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 0000000..9d299c8
--- /dev/null
+++ b/debian/libglw1-mesa.install
@@ -0,0 +1 @@
+usr/lib/libGLw.so.*
