Hi folks, Attached is a patch which implements the renaming of xorg-x11 binary packages required for the C++ ABI transition. I've checked this against Ubuntu via Daniel Stone; combined with a bit of svn moving on debian/xlibmesa-glu*, this should give us packages that are ready for gcc-4.0 in etch, so it'd be great if this could be applied and uploaded to unstable post haste so that we can move forward with the ABI transition for all the packages above xlibmesa-glu in the tree. Thanks, -- Steve Langasek postmodern programmer
Index: debian/xlibmesa-glu.shlibs =================================================================== --- debian/xlibmesa-glu.shlibs (revision 319) +++ debian/xlibmesa-glu.shlibs (working copy) @@ -1 +1 @@ -libGLU 1 xlibmesa-glu | libglu1 +libGLU 1 libglu1-xorg | libglu1c2 Index: debian/changelog =================================================================== --- debian/changelog (revision 319) +++ debian/changelog (working copy) @@ -44,6 +44,29 @@ - patch to xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c re-added to comply with post-sarge SC + - Package name changes for the C++ ABI transition: + - xlibmesa-glu renamed to libglu1-xorg; Provides: changed to + libglu1c2, libglu1c2 added to the Conflicts: and Replaces: + - libglu1-xorg shlibs changed to libglu1-xorg | libglu1c2 + - xlibmesa-glu-dbg renamed to libglu1-xorg-dbg; xlibmesa-glu-dbg + added to Conflicts: and Replaces: + - xlibmesa-glu-dev renamed to libglu1-xorg-dev; depend on + libglu1-xorg instead of xlibmesa-glu, of course, and add + xlibmesa-glu-dev to the Conflicts/Replaces/Provides + - Update x-window-system-core to depend on libglu1-xorg instead of + xlibmesa-glu + - Update x-window-system-dev to depend on libglu1-xorg-{dev,dbg} + instead of xlibmesa-glu-{dev,dbg} + - Drop the xlibmesa3, xlibmesa3-dbg, and xlibmesa-dev transition + packages; these existed for the woody->sarge transition, and they + can't possibly provide a proper transition for anything that + relies on the C++ ABI, so better to get rid of them altogether + + - Remove libglu1-xorg-dev's dependency on "libstdc++5-3.3-dev | + libstdc++-dev": this doesn't actually ensure that the correct C++ + headers are installed, and it's no longer the correct libstdc++ + version anyway. + -- David Nusinow <dnusinow@debian.org> Fri, 24 Jun 2005 10:24:48 -0400 xorg-x11 (6.8.2.dfsg.1-0pre1v1) experimental; urgency=low Index: debian/xlibmesa-glu.postinst.in =================================================================== --- debian/xlibmesa-glu.postinst.in (revision 319) +++ debian/xlibmesa-glu.postinst.in (working copy) @@ -1,5 +1,5 @@ #!/bin/sh -# Debian xlibmesa-glu package post-installation script +# Debian libglu1-xorg package post-installation script # Copyright 1998-2001, 2004 Branden Robinson. # Licensed under the GNU General Public License, version 2. See the file # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. @@ -9,7 +9,7 @@ set -e -THIS_PACKAGE=xlibmesa-glu +THIS_PACKAGE=libglu1-xorg THIS_SCRIPT=postinst #INCLUDE_SHELL_LIB# Index: debian/rules =================================================================== --- debian/rules (revision 319) +++ debian/rules (working copy) @@ -519,7 +519,7 @@ -Nlibxxf86rush1-dbg \ -Nlibxxf86vm1-dbg \ -Nxlibmesa-gl-dbg \ - -Nxlibmesa-glu-dbg \ + -Nlibxglu1-xorg-dbg \ -Nxlibosmesa4-dbg \ -Nxserver-xorg-dbg find debian/xserver-xorg/usr/X11R6/lib/modules -name "*_drv.o" | \ Index: debian/xlibmesa-glu.postrm.in =================================================================== --- debian/xlibmesa-glu.postrm.in (revision 319) +++ debian/xlibmesa-glu.postrm.in (working copy) @@ -1,5 +1,5 @@ #!/bin/sh -# Debian xlibmesa-glu package post-removal script +# Debian libglu1-xorg package post-removal script # Copyright 1998-2001, 2004 Branden Robinson. # Licensed under the GNU General Public License, version 2. See the file # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. @@ -9,7 +9,7 @@ set -e -THIS_PACKAGE=xlibmesa-glu +THIS_PACKAGE=libglu1-xorg THIS_SCRIPT=postrm #INCLUDE_SHELL_LIB# Index: debian/control =================================================================== --- debian/control (revision 319) +++ debian/control (working copy) @@ -2312,13 +2312,13 @@ . See the xlibmesa-gl package for further information. -Package: xlibmesa-glu +Package: libglu1-xorg Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu -Provides: libglu1 -Replaces: libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu +Conflicts: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu +Provides: libglu1c2 +Replaces: libglu1c2, libglu1, libutahglx1, mesag3 (<< 5.0.0-1), xlibmesa3 (<< 4.2.1-5), xlibmesa3-glu Description: Mesa OpenGL utility library [X.Org] The OpenGL utility library (GLU) offers simple interfaces for building mipmaps; checking for the presence of extensions in the OpenGL (or other @@ -2332,13 +2332,13 @@ . This package was built using version 1.02 of the C++ ABI. -Package: xlibmesa-glu-dbg +Package: libglu1-xorg-dbg Section: libdevel Priority: extra Architecture: any Depends: xlibmesa-gl (= ${Source-Version}), ${misc:Depends} -Conflicts: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg -Replaces: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg +Conflicts: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg, xlibmesa-glu-dbg +Replaces: xlibmesa3-dbg (<< 4.2.1-5), xlibmesa3-glu-dbg, xlibmesa-glu-dbg Description: Mesa OpenGL utility library (unstripped) [X.Org] This package is useful to provide a backtrace with symbol names in a debugger; this facilitates interpretation of core dumps, and aids in finding @@ -2348,20 +2348,20 @@ be debugged is executed. . Non-programmers will likely have little use for this package. See the - xlibmesa-glu package for further information. + libglu1-xorg package for further information. -Package: xlibmesa-glu-dev +Package: libglu1-xorg-dev Section: libdevel Architecture: any -Depends: xlibmesa-glu (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, libstdc++5-3.3-dev | libstdc++-dev, libc6-dev | libc-dev -Conflicts: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5) -Provides: libglu-dev -Replaces: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5) +Depends: libglu1-xorg (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, libc6-dev | libc-dev +Conflicts: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5), xlibmesa-glu-dev +Provides: libglu-dev, xlibmesa-glu-dev +Replaces: libglu-dev, libutahglx-dev, mesag-dev (<< 5.0.0-1), xlibmesa-dev (<< 4.2.1-5), xlibmesa-glu-dev Description: Mesa OpenGL utility library development files [X.Org] - xlibmesa-glu-dev provides static versions of the libraries provided in - xlibmesa-glu, as well as header files and manual pages. + libglu1-xorg-dev provides static versions of the libraries provided in + libglu1-xorg, as well as header files and manual pages. . - See the xlibmesa-glu package for further information. + See the libglu1-xorg package for further information. Package: xlibosmesa4 Section: libs @@ -2762,7 +2762,7 @@ Package: x-window-system-core Architecture: any -Depends: ${F:XWSC-Special-Depends}xlibmesa-gl, xlibmesa-glu, xfonts-base (>> 4.0), xfonts-100dpi, xfonts-75dpi, xfonts-scalable, xbase-clients, xutils +Depends: ${F:XWSC-Special-Depends}xlibmesa-gl, libglu1-xorg, xfonts-base (>> 4.0), xfonts-100dpi, xfonts-75dpi, xfonts-scalable, xbase-clients, xutils Description: X Window System core components This metapackage provides the essential components for a standalone workstation running the X Window System. It provides the X libraries, an X @@ -2779,7 +2779,7 @@ Package: x-window-system-dev Priority: extra Architecture: any -Depends: libdps-dev, libdps1-dbg, libice-dev, libice6-dbg, libsm-dev, libsm6-dbg, libx11-6-dbg, libx11-dev, libxaw7-dbg, libxaw7-dev, libxext-dev, libxext6-dbg, libxi-dev, libxi6-dbg, libxmu-dev, libxmu6-dbg, libxmuu-dev, libxmuu1-dbg, libxp-dev, libxp6-dbg, libxpm-dev, libxpm4-dbg, libxrandr-dev, libxrandr2-dbg, libxt-dev, libxt6-dbg, libxtrap-dev, libxtrap6-dbg, libxtst-dev, libxtst6-dbg, libxv-dev, libxv1-dbg, pm-dev, x-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, xlibmesa-gl-dbg, xlibmesa-glu-dbg, ${F:XWSD-Special-Depends}xlibs-static-dev, xlibs-static-pic, xspecs +Depends: libdps-dev, libdps1-dbg, libice-dev, libice6-dbg, libsm-dev, libsm6-dbg, libx11-6-dbg, libx11-dev, libxaw7-dbg, libxaw7-dev, libxext-dev, libxext6-dbg, libxi-dev, libxi6-dbg, libxmu-dev, libxmu6-dbg, libxmuu-dev, libxmuu1-dbg, libxp-dev, libxp6-dbg, libxpm-dev, libxpm4-dbg, libxrandr-dev, libxrandr2-dbg, libxt-dev, libxt6-dbg, libxtrap-dev, libxtrap6-dbg, libxtst-dev, libxtst6-dbg, libxv-dev, libxv1-dbg, pm-dev, x-dev, xlibmesa-gl-dev, libglu1-xorg-dev, xlibmesa-gl-dbg, libglu1-xorg-dbg, ${F:XWSD-Special-Depends}xlibs-static-dev, xlibs-static-pic, xspecs Description: X Window System development components This metapackage provides the components of the X Window System as developed by the X.Org Project which are most interesting to programmers. @@ -2811,40 +2811,6 @@ This transitional package is only depended upon by packages that install files into /usr/X11R6 but have not yet corrected their dependencies. -Package: xlibmesa3 -Section: oldlibs -Architecture: any -Depends: ${F:Xlibmesa-gl-Special-Depends}xlibmesa-gl, xlibmesa-glu -Description: X.Org Mesa libraries transitional package - This package smooths upgrades from Debian 3.0 by depending on xlibmesa-gl and - xlibmesa-glu. This transitional package is only depended upon by packages that - haven't yet been compiled against the newer Mesa libraries provided by - X.Org. - . - This package also depends on xlibmesa-dri, if that package is available for - your machine architecture. - -Package: xlibmesa3-dbg -Section: oldlibs -Priority: extra -Architecture: all -Depends: xlibmesa-gl-dbg, xlibmesa-glu-dbg -Description: X.Org Mesa unstripped libraries transitional package - This package smooths upgrades from Debian 3.0 by depending on - xlibmesa-gl-dbg and xlibmesa-glu-dbg. This transitional package should not be - depended upon by any Debian packages; report bugs with the Debian Bug - Tracking System if you encounter any that do so. - -Package: xlibmesa-dev -Section: oldlibs -Architecture: all -Depends: xlibmesa-gl-dev, xlibmesa-glu-dev -Description: X.Org Mesa development libraries transitional package - This package smooths upgrades from Debian 3.0 by depending on xlibmesa-gl-dev - and xlibmesa-glu-dev. This transitional package is only depended upon by - packages that haven't yet corrected their dependencies to reflect the new - library arrangement. - Package: xlibs-dbg Section: oldlibs Priority: extra
Attachment:
signature.asc
Description: Digital signature