X Strike Force X.Org X11 SVN commit: r359 - trunk/debian
Author: dnusinow
Date: 2005-07-17 09:41:47 -0500 (Sun, 17 Jul 2005)
New Revision: 359
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/libglu1-xorg.shlibs
Log:
- Fix incorrect C++ ABI transition. libglu1-xorg is implemented in C++
but only exports a C ABI, so transitioning it is unnecessary. The
package now provides both libglu1 and libglu1c2. Thanks to Marcelo
Magallon and Steve Langasek.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-17 14:37:27 UTC (rev 358)
+++ trunk/debian/changelog 2005-07-17 14:41:47 UTC (rev 359)
@@ -6,6 +6,10 @@
debian/rules (thanks Steve Langasek)
- Update MANIFEST.in, and missing items to be installed for alpha, arm,
and m68k
+ - Fix incorrect C++ ABI transition. libglu1-xorg is implemented in C++
+ but only exports a C ABI, so transitioning it is unnecessary. The
+ package now provides both libglu1 and libglu1c2. Thanks to Marcelo
+ Magallon and Steve Langasek.
- Refer to correct config file in xserver-xorg.bug.script (thanks David
Martínez Moreno)
- Add 030_libvgahw_gcc4_volatile_fix.diff to work around libvgahw.a gcc4
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-07-17 14:37:27 UTC (rev 358)
+++ trunk/debian/control 2005-07-17 14:41:47 UTC (rev 359)
@@ -2317,7 +2317,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu, xlibmesa-glu
-Provides: libglu1c2
+Provides: libglu1c2, libglu1
Replaces: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu, xlibmesa-glu
Description: Mesa OpenGL utility library [X.Org]
The OpenGL utility library (GLU) offers simple interfaces for building
Modified: trunk/debian/libglu1-xorg.shlibs
===================================================================
--- trunk/debian/libglu1-xorg.shlibs 2005-07-17 14:37:27 UTC (rev 358)
+++ trunk/debian/libglu1-xorg.shlibs 2005-07-17 14:41:47 UTC (rev 359)
@@ -1 +1 @@
-libGLU 1 libglu1-xorg | libglu1c2
+libGLU 1 libglu1-xorg | libglu1
Reply to: