tags 339157 patch thanks Hi Filip,
I've prepared an NMU for this bug using the attached patch. I'll be uploading the package shortly to the NEW queue. If you disagree with the changes I've made, please make a maintainer upload in its place. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u clanlib-0.6.5-1/debian/control clanlib-0.6.5-1/debian/control
--- clanlib-0.6.5-1/debian/control
+++ clanlib-0.6.5-1/debian/control
@@ -6,12 +6,12 @@
Build-Conflicts: libutahglx-dev
Standards-Version: 3.6.2.1
-Package: libclanlib2c2
+Package: libclanlib2c2a
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib, clanlib2, libclanlib2
-Replaces: libclanlib2
+Conflicts: clanlib, clanlib2, libclanlib2, libclanlib2c2
+Replaces: libclanlib2, libclanlib2c2
Description: ClanLib game SDK core runtime
ClanLib is a multi-platform software development kit, with an emphasis on
game development.
@@ -33,7 +33,7 @@
Package: libclanlib-dev
Section: libdevel
Architecture: any
-Depends: libclanlib2c2, hermes1-dev, libfreetype6-dev, libglu1-xorg-dev |
xlibmesa-dev | libgl-dev, libjpeg62-dev, liblua40-dev, liblualib40-dev,
libmikmod2-dev, libpng12-0-dev, libvorbis-dev, tolua-dev, libclan2c2-gl,
libclan2c2-gui, libclan2c2-jpeg, libclan2c2-lua, libclan2c2-mikmod,
libclan2c2-network, libclan2c2-png, libclan2c2-sound, libclan2c2-ttf,
libclan2c2-vorbis
+Depends: libclanlib2c2a, hermes1-dev, libfreetype6-dev, libglu1-xorg-dev |
xlibmesa-dev | libgl-dev, libjpeg62-dev, liblua40-dev, liblualib40-dev,
libmikmod2-dev, libpng12-0-dev, libvorbis-dev, tolua-dev, libclan2c2a-gl,
libclan2c2a-gui, libclan2c2a-jpeg, libclan2c2a-lua, libclan2c2a-mikmod,
libclan2c2a-network, libclan2c2a-png, libclan2c2a-sound, libclan2c2a-ttf,
libclan2c2a-vorbis
Conflicts: clanlib0-common, libutahglx-dev, clanlib2 (<< 0.6.1-1-3),
clanlib-dev
Provides: clanlib-dev
Replaces: clanlib-dev
@@ -80,7 +80,7 @@
Package: clanlib-examples
Section: doc
Architecture: all
-Depends: libclanlib2c2
+Depends: libclanlib2c2a
Suggests: clanlib-dev
Description: Examples for ClanLib
ClanLib delivers a platform independent interface to write games with.
@@ -97,12 +97,12 @@
.
This package contains examples for most modules of the ClanLib API.
-Package: libclan2c2-gl
+Package: libclan2c2a-gl
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-gl, libutahglx1, clanlib2-gl, libclan2-gl
-Replaces: libclan2-gl
+Conflicts: clanlib-gl, libutahglx1, clanlib2-gl, libclan2-gl, libclan2c2-gl
+Replaces: libclan2-gl, libclan2c2-gl
Description: OpenGL module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the
@@ -118,12 +118,12 @@
.
This package contains the OpenGL module (clanGL).
-Package: libclan2c2-gui
+Package: libclan2c2a-gui
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-gui, clanlib2-gui, libclan2-gui
-Replaces: libclan2-gui
+Conflicts: clanlib-gui, clanlib2-gui, libclan2-gui, libclan2c2-gui
+Replaces: libclan2-gui, libclan2c2-gui
Description: GUI module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the
@@ -139,12 +139,12 @@
.
This package contains the GUI module (clanGUI).
-Package: libclan2c2-jpeg
+Package: libclan2c2a-jpeg
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-jpeg, clanlib2-jpeg, libclan2-jpeg
-Replaces: libclan2-jpeg
+Conflicts: clanlib-jpeg, clanlib2-jpeg, libclan2-jpeg, libclan2c2-jpeg
+Replaces: libclan2-jpeg, libclan2c2-jpeg
Description: JPEG module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the
@@ -160,12 +160,12 @@
.
This package contains the JPEG module (clanJPEG).
-Package: libclan2c2-lua
+Package: libclan2c2a-lua
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib2-lua, libclan2-lua
-Replaces: libclan2-lua
+Conflicts: clanlib2-lua, libclan2-lua, libclan2c2-lua
+Replaces: libclan2-lua, libclan2c2-lua
Description: Lua module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the game
@@ -181,12 +181,12 @@
.
This package contains the Lua scripting module (clanLua).
-Package: libclan2c2-mikmod
+Package: libclan2c2a-mikmod
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-mikmod, clanlib2-mikmod, libclan2-mikmod
-Replaces: libclan2-mikmod
+Conflicts: clanlib-mikmod, clanlib2-mikmod, libclan2-mikmod, libclan2c2-mikmod
+Replaces: libclan2-mikmod, libclan2c2-mikmod
Description: MikMod module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the
@@ -202,12 +202,12 @@
.
This package contains the MikMod module (clanMikMod).
-Package: libclan2c2-network
+Package: libclan2c2a-network
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-network, clanlib2-network, libclan2-network
-Replaces: libclan2-network
+Conflicts: clanlib-network, clanlib2-network, libclan2-network,
libclan2c2-network
+Replaces: libclan2-network, libclan2c2-network
Description: Network module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the
@@ -223,12 +223,12 @@
.
This package contains the Network module (clanNetwork).
-Package: libclan2c2-png
+Package: libclan2c2a-png
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-png, clanlib2-png, libclan2-png
-Replaces: libclan2-png
+Conflicts: clanlib-png, clanlib2-png, libclan2-png, libclan2c2-png
+Replaces: libclan2-png, libclan2c2-png
Description: PNG module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the
@@ -244,12 +244,12 @@
.
This package contains the PNG module (clanPNG).
-Package: libclan2c2-sound
+Package: libclan2c2a-sound
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-sound, clanlib2-sound, libclan2-sound
-Replaces: libclan2-sound
+Conflicts: clanlib-sound, clanlib2-sound, libclan2-sound, libclan2c2-sound
+Replaces: libclan2-sound, libclan2c2-sound
Description: Sound module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the
@@ -265,12 +265,12 @@
.
This package contains the Sound module (clanSound).
-Package: libclan2c2-ttf
+Package: libclan2c2a-ttf
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-ttf, clanlib2-ttf, libclan2-ttf
-Replaces: libclan2-ttf
+Conflicts: clanlib-ttf, clanlib2-ttf, libclan2-ttf, libclan2c2-ttf
+Replaces: libclan2-ttf, libclan2c2-ttf
Description: TTF module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the game
@@ -286,12 +286,12 @@
.
This package contains the freetype TTF module (clanTTF).
-Package: libclan2c2-vorbis
+Package: libclan2c2a-vorbis
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-vorbis, clanlib2-vorbis, libclan2-vorbis
-Replaces: libclan2-vorbis
+Conflicts: clanlib-vorbis, clanlib2-vorbis, libclan2-vorbis, libclan2c2-vorbis
+Replaces: libclan2-vorbis, libclan2c2-vorbis
Description: Vorbis module for ClanLib game SDK
ClanLib delivers a platform independent interface to write games with.
If a game is written with ClanLib, it should be possible to compile the
diff -u clanlib-0.6.5-1/debian/changelog clanlib-0.6.5-1/debian/changelog
--- clanlib-0.6.5-1/debian/changelog
+++ clanlib-0.6.5-1/debian/changelog
@@ -1,3 +1,12 @@
+clanlib (0.6.5-1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfix.
+ * Rename libraries from "c2" to "c2a" for the C++ mt allocator ABI
+ transition; conflict/replace the old libs accordingly. Closes: #339157.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Mon, 28 Nov 2005 04:32:46 -0800
+
clanlib (0.6.5-1-3) unstable; urgency=medium
* Drop xlibmesa-dev and xlibs-static-pic builddeps.
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-vorbis.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-vorbis.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanVorbis.so.*
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-mikmod.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-mikmod.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanMikMod.so.*
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-gl.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-gl.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanGL.so.*
diff -u clanlib-0.6.5-1/debian/clanlib-doc.install
clanlib-0.6.5-1/debian/clanlib-doc.install
--- clanlib-0.6.5-1/debian/clanlib-doc.install
+++ clanlib-0.6.5-1/debian/clanlib-doc.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/libclanlib2c2/html
-debian/tmp/usr/share/doc/libclanlib2c2/tutorial
+debian/tmp/usr/share/doc/libclanlib2c2a/html
+debian/tmp/usr/share/doc/libclanlib2c2a/tutorial
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-ttf.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-ttf.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanTTF.so.*
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-sound.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-sound.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanSound.so.*
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-png.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-png.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanPNG.so.*
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-network.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-network.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanNetwork.so.*
diff -u clanlib-0.6.5-1/debian/clanlib-examples.install
clanlib-0.6.5-1/debian/clanlib-examples.install
--- clanlib-0.6.5-1/debian/clanlib-examples.install
+++ clanlib-0.6.5-1/debian/clanlib-examples.install
@@ -1 +1 @@
-debian/tmp/usr/share/doc/libclanlib2c2/examples
+debian/tmp/usr/share/doc/libclanlib2c2a/examples
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-lua.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-lua.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanLua.so.*
diff -u clanlib-0.6.5-1/debian/rules clanlib-0.6.5-1/debian/rules
--- clanlib-0.6.5-1/debian/rules
+++ clanlib-0.6.5-1/debian/rules
@@ -14,7 +14,7 @@
PKG_DEV := $(shell grep "^Package: .*dev" debian/control|head -1|sed
's/Package: \(.*\)/\1/g')
PKG_DOC := $(shell grep "^Package: .*doc" debian/control|head -1|sed
's/Package: \(.*\)/\1/g')
PKG_EXA := $(shell grep "^Package: .*exa" debian/control|head -1|sed
's/Package: \(.*\)/\1/g')
-PKG_BASE := libclan2c2
+PKG_BASE := libclan2c2a
MOVEBEFORE="$(PKG_BASE)-gl" \
"$(PKG_BASE)-gui" \
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-jpeg.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-jpeg.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanJPEG.so.*
reverted:
--- clanlib-0.6.5-1/debian/libclan2c2-gui.install
+++ clanlib-0.6.5-1.orig/debian/libclan2c2-gui.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanGUI.so.*
reverted:
--- clanlib-0.6.5-1/debian/libclanlib2c2.install
+++ clanlib-0.6.5-1.orig/debian/libclanlib2c2.install
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/libclanCore.so.*
-debian/tmp/usr/lib/libclanApp.so.*
-debian/tmp/usr/lib/libclanDisplay.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-gl.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-gl.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanGL.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-gui.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-gui.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanGUI.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-jpeg.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-jpeg.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanJPEG.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-lua.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-lua.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanLua.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclanlib2c2a.install
+++ clanlib-0.6.5-1/debian/libclanlib2c2a.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/libclanCore.so.*
+debian/tmp/usr/lib/libclanApp.so.*
+debian/tmp/usr/lib/libclanDisplay.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-mikmod.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-mikmod.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanMikMod.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-network.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-network.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanNetwork.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-png.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-png.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanPNG.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-sound.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-sound.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanSound.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-ttf.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-ttf.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanTTF.so.*
only in patch2:
unchanged:
--- clanlib-0.6.5-1.orig/debian/libclan2c2a-vorbis.install
+++ clanlib-0.6.5-1/debian/libclan2c2a-vorbis.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanVorbis.so.*
signature.asc
Description: Digital signature
