tags 321779 + patch
thanks
[Matthias Klose]
> Yes, it's not documented, and finally remains the decision of the
> package maintainer. It saves a good amount work on depending
> library packages for kde. If the work is already done for clanlib,
> you can't save the work anymore ;-P
Right. Then I move forward with my NMU renaming all the C++ library
packages.
I've verified that the libclanGL is only using the symbols
gluBuild2DMipmaps, gluErrorString and gluOrtho2D from the libGLU
library, and thus have no C++ dependency on the xlibmesa-glu package.
But as the xlibmesa-glu package containt a library with C++ symbols, I
expect someone to upload a version with a new name including 'c2', and
that the clanlib package upload should be delayed until after this
happen.
Because of this, I only attach the patch for now, and postpone the
delayed upload until a new version of xlibmesa-glu is in the archive.
All the files debian/libclan2-*.install files should be removed, as
they are replaced with debian/libclan2c2-*.install files. I'm unable
to represent this change in a diff.
This is the changelog:
clanlib (0.6.5-1-2.3) unstable; urgency=low
* Non-maintainer upload to move the library to new C++ ABI.
(Closes: #321779)
* Rename package names to reflect the new ABI:
libclanlib2 -> libclanlib2c2,
libclan2-gl -> libclan2c2-gl,
libclan2-gui -> libclan2c2-gui,
libclan2-jpeg -> libclan2c2-jpeg,
libclan2-lua -> libclan2c2-lua,
libclan2-mikmod -> libclan2c2-mikmod,
libclan2-network -> libclan2c2-network,
libclan2-png -> libclan2c2-png,
libclan2-sound -> libclan2c2-sound,
libclan2-ttf -> libclan2c2-ttf,
libclan2-vorbis -> libclan2c2-vorbis
The change affects debian/control, debian/rules and
debian/*.install. Made the library packages conflict and replace
the old library, to ease upgrades.
* Build-depend on libxxf86vm-dev to find
<X11/extensions/xf86vmode.h> with the new X packages.
* Need a fix for #320515 in linux-kernel-headers to build
joystick_linux.cpp.
* Change section for libclanlib-devfrom devel to libdevel to match
the override file.
* Updated Standards-Version to 3.6.2.1. No special changes needed.
* Remove "Bugs: debbugs://bugs.debian.org/" and "Origin: debian"
from debian/control to avoid lintian warnings.
* Converted debian/changelog from ISO-8859-1 to UTF-8.
* New patch:
- 015_gcc-3.4-fix: Fix build errors on gcc 3.4/4.0. Patch from
Andreas Jochens. (Closes: #266645)
-- Petter Reinholdtsen <[EMAIL PROTECTED]> Sun, 7 Aug 2005 16:45:26 +0200
Not sure why, but I get these lintian warnings when I build the
package on the current unstable:
: libclan2c2-vorbis: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-vorbis: package-name-doesnt-match-sonames libclanVorbis2
E: libclan2c2-ttf: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-ttf: package-name-doesnt-match-sonames libclanTTF2
E: libclan2c2-sound: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-sound: package-name-doesnt-match-sonames libclanSound2
E: libclan2c2-png: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-png: package-name-doesnt-match-sonames libclanPNG2
E: libclan2c2-network: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-network: package-name-doesnt-match-sonames libclanNetwork2
E: libclan2c2-mikmod: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-mikmod: package-name-doesnt-match-sonames libclanMikMod2
E: libclan2c2-lua: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-lua: package-name-doesnt-match-sonames libclanLua2
E: libclan2c2-jpeg: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-jpeg: package-name-doesnt-match-sonames libclanJPEG2
E: libclan2c2-gui: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-gui: package-name-doesnt-match-sonames libclanGUI2
E: libclan2c2-gl: usr-doc-symlink-without-dependency libclanlib2c2
W: libclan2c2-gl: package-name-doesnt-match-sonames libclanGL2
I get similar warnings from linda:
W: clanlib; Package Build-Depends on automake* or autoconf.
E: libclan2c2-gl; Package has a /usr/share/doc/<pkg> symlink, but no dependancy
W: libclan2c2-gl; Shared object /usr/lib/libclanGL.so.0.6.3 is linked with
version 6 and 5 of libstdc++.
E: libclan2c2-gui; Package has a /usr/share/doc/<pkg> symlink, but no dependancy
E: libclan2c2-jpeg; Package has a /usr/share/doc/<pkg> symlink, but no
dependancy
E: libclan2c2-lua; Package has a /usr/share/doc/<pkg> symlink, but no dependancy
E: libclan2c2-mikmod; Package has a /usr/share/doc/<pkg> symlink, but no
dependancy
E: libclan2c2-network; Package has a /usr/share/doc/<pkg> symlink, but no
dependancy
E: libclan2c2-png; Package has a /usr/share/doc/<pkg> symlink, but no dependancy
E: libclan2c2-sound; Package has a /usr/share/doc/<pkg> symlink, but no
dependancy
E: libclan2c2-ttf; Package has a /usr/share/doc/<pkg> symlink, but no dependancy
E: libclan2c2-vorbis; Package has a /usr/share/doc/<pkg> symlink, but no
dependancy
As far as I can see, the symlink issue are present in the existing
packages too. The shared object linking issue with libclan2c2-gl is
explained above, and the automake and soname issues are beyond me.
diff -uNr clanlib-0.6.5-1-orig/debian/changelog clanlib-0.6.5-1/debian/changelog
--- clanlib-0.6.5-1-orig/debian/changelog 2005-08-07 13:54:25.000000000
+0200
+++ clanlib-0.6.5-1/debian/changelog 2005-08-07 19:23:31.417354001 +0200
@@ -1,3 +1,38 @@
+clanlib (0.6.5-1-2.3) unstable; urgency=low
+
+ * Non-maintainer upload to move the library to new C++ ABI.
+ (Closes: #321779)
+ * Rename package names to reflect the new ABI:
+ libclanlib2 -> libclanlib2c2,
+ libclan2-gl -> libclan2c2-gl,
+ libclan2-gui -> libclan2c2-gui,
+ libclan2-jpeg -> libclan2c2-jpeg,
+ libclan2-lua -> libclan2c2-lua,
+ libclan2-mikmod -> libclan2c2-mikmod,
+ libclan2-network -> libclan2c2-network,
+ libclan2-png -> libclan2c2-png,
+ libclan2-sound -> libclan2c2-sound,
+ libclan2-ttf -> libclan2c2-ttf,
+ libclan2-vorbis -> libclan2c2-vorbis
+ The change affects debian/control, debian/rules and
+ debian/*.install. Made the library packages conflict and replace
+ the old library, to ease upgrades.
+ * Build-depend on libxxf86vm-dev to find
+ <X11/extensions/xf86vmode.h> with the new X packages.
+ * Need a fix for #320515 in linux-kernel-headers to build
+ joystick_linux.cpp.
+ * Change section for libclanlib-devfrom devel to libdevel to match
+ the override file.
+ * Updated Standards-Version to 3.6.2.1. No special changes needed.
+ * Remove "Bugs: debbugs://bugs.debian.org/" and "Origin: debian"
+ from debian/control to avoid lintian warnings.
+ * Converted debian/changelog from ISO-8859-1 to UTF-8.
+ * New patch:
+ - 015_gcc-3.4-fix: Fix build errors on gcc 3.4/4.0. Patch from
+ Andreas Jochens. (Closes: #266645)
+
+ -- Petter Reinholdtsen <[EMAIL PROTECTED]> Sun, 7 Aug 2005 16:45:26 +0200
+
clanlib (0.6.5-1-2.2) unstable; urgency=low
* Non-maintainer upload to fix previous broken NMU
@@ -131,7 +166,7 @@
= configure, makefile: deal with the changed lua soname in the Debian
packages. Add a decent test to handle the Debian Xxf86vm_pic library
name.
- = soundproviders: another patch by Michel D�nzer; fixes signedness issues
+ = soundproviders: another patch by Michel Dänzer; fixes signedness issues
which prevented LE architectures from working.
- inputsource: back out for now because it causes breakage on
little-endian system.
@@ -143,7 +178,7 @@
* Set individual Conflicts: on all packages. I still believe this is apt's
bug. (Closes: #142154)
* Fix spelling errors. (Closes: #141595)
- * Thanks to Michel D�nzer for cleaning up endian problems, again.
+ * Thanks to Michel Dänzer for cleaning up endian problems, again.
(Closes: #142348)
* Patches:
= configure: use autoconf 2.50. (Closes: #142631)
@@ -163,7 +198,7 @@
* Run autoconf in debian/rules, as upstream forgot to include configure.
Consequently, clean configure, too.
* Hopefully powerpc (and hppa too?) will finally build now.
- Don't build with "-g3 -gdb3" by default. Thanks to Michel D�nzer for
+ Don't build with "-g3 -gdb3" by default. Thanks to Michel Dänzer for
looking into this. (Closes: #141813)
-- Filip Van Raemdonck <[EMAIL PROTECTED]> Tue, 9 Apr 2002 19:10:24 +0200
@@ -383,7 +418,7 @@
clanlib0 (0.4.4-5) unstable; urgency=high
* Fix endianness issues with the datacompiler, thanks to a patch from Michel
- D�nzer. (Closes: #49806, #96241)
+ Dänzer. (Closes: #49806, #96241)
-- Filip Van Raemdonck <[EMAIL PROTECTED]> Mon, 27 Aug 2001 16:05:46 +0200
diff -uNr clanlib-0.6.5-1-orig/debian/clanlib-doc.install
clanlib-0.6.5-1/debian/clanlib-doc.install
--- clanlib-0.6.5-1-orig/debian/clanlib-doc.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/clanlib-doc.install 2005-08-07 15:45:12.000000000
+0200
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/libclanlib2/html
-debian/tmp/usr/share/doc/libclanlib2/tutorial
+debian/tmp/usr/share/doc/libclanlib2c2/html
+debian/tmp/usr/share/doc/libclanlib2c2/tutorial
diff -uNr clanlib-0.6.5-1-orig/debian/clanlib-examples.install
clanlib-0.6.5-1/debian/clanlib-examples.install
--- clanlib-0.6.5-1-orig/debian/clanlib-examples.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/clanlib-examples.install 2005-08-07
15:45:26.000000000 +0200
@@ -1 +1 @@
-debian/tmp/usr/share/doc/libclanlib2/examples
+debian/tmp/usr/share/doc/libclanlib2c2/examples
diff -uNr clanlib-0.6.5-1-orig/debian/control clanlib-0.6.5-1/debian/control
--- clanlib-0.6.5-1-orig/debian/control 2005-08-07 13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/control 2005-08-07 19:18:22.141565331 +0200
@@ -2,17 +2,16 @@
Section: libs
Priority: optional
Maintainer: Filip Van Raemdonck <[EMAIL PROTECTED]>
-Build-Depends: autoconf, automake, bzip2, debhelper (>= 4), hermes1-dev,
libesd0-dev, libfreetype6-dev, xlibmesa-dev | libgl-dev, libjpeg62-dev,
liblualib40-dev, libtolua-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>=
1.0.0-3), pkg-config, xlibs-static-pic, zlib1g-dev, libxt-dev
+Build-Depends: autoconf, automake, bzip2, debhelper (>= 4), hermes1-dev,
libesd0-dev, libfreetype6-dev, xlibmesa-dev | libgl-dev, libjpeg62-dev,
liblualib40-dev, libtolua-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>=
1.0.0-3), pkg-config, xlibs-static-pic, zlib1g-dev, libxt-dev, libxxf86vm-dev
Build-Conflicts: libutahglx-dev
-Standards-Version: 3.5.6.1
-Bugs: debbugs://bugs.debian.org/
-Origin: debian
+Standards-Version: 3.6.2.1
-Package: libclanlib2
+Package: libclanlib2c2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib, clanlib2
+Conflicts: clanlib, clanlib2, libclanlib2
+Replaces: libclanlib2
Description: ClanLib game SDK core runtime
ClanLib is a multi-platform software development kit, with an emphasis on
game development.
@@ -32,9 +31,9 @@
build with it.
Package: libclanlib-dev
-Section: devel
+Section: libdevel
Architecture: any
-Depends: libclanlib2, hermes1-dev, libfreetype6-dev, xlibmesa-dev | libgl-dev,
libjpeg62-dev, liblua40-dev, liblualib40-dev, libmikmod2-dev, libpng12-0-dev,
libvorbis-dev, tolua-dev, libclan2-gl, libclan2-gui, libclan2-jpeg,
libclan2-lua, libclan2-mikmod, libclan2-network, libclan2-png, libclan2-sound,
libclan2-ttf, libclan2-vorbis
+Depends: libclanlib2c2, hermes1-dev, libfreetype6-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
Conflicts: clanlib0-common, libutahglx-dev, clanlib2 (<< 0.6.1-1-3),
clanlib-dev
Provides: clanlib-dev
Replaces: clanlib-dev
@@ -81,7 +80,7 @@
Package: clanlib-examples
Section: doc
Architecture: all
-Depends: libclanlib2
+Depends: libclanlib2c2
Suggests: clanlib-dev
Description: Examples for ClanLib
ClanLib delivers a platform independent interface to write games with.
@@ -98,11 +97,12 @@
.
This package contains examples for most modules of the ClanLib API.
-Package: libclan2-gl
+Package: libclan2c2-gl
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-gl, libutahglx1, clanlib2-gl
+Conflicts: clanlib-gl, libutahglx1, clanlib2-gl, libclan2-gl
+Replaces: libclan2-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,11 +118,12 @@
.
This package contains the OpenGL module (clanGL).
-Package: libclan2-gui
+Package: libclan2c2-gui
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-gui, clanlib2-gui
+Conflicts: clanlib-gui, clanlib2-gui, libclan2-gui
+Replaces: libclan2-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
@@ -138,11 +139,12 @@
.
This package contains the GUI module (clanGUI).
-Package: libclan2-jpeg
+Package: libclan2c2-jpeg
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-jpeg, clanlib2-jpeg
+Conflicts: clanlib-jpeg, clanlib2-jpeg, libclan2-jpeg
+Replaces: libclan2-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
@@ -158,11 +160,12 @@
.
This package contains the JPEG module (clanJPEG).
-Package: libclan2-lua
+Package: libclan2c2-lua
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib2-lua
+Conflicts: clanlib2-lua, libclan2-lua
+Replaces: libclan2-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
@@ -178,11 +181,12 @@
.
This package contains the Lua scripting module (clanLua).
-Package: libclan2-mikmod
+Package: libclan2c2-mikmod
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-mikmod, clanlib2-mikmod
+Conflicts: clanlib-mikmod, clanlib2-mikmod, libclan2-mikmod
+Replaces: libclan2-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
@@ -198,11 +202,12 @@
.
This package contains the MikMod module (clanMikMod).
-Package: libclan2-network
+Package: libclan2c2-network
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-network, clanlib2-network
+Conflicts: clanlib-network, clanlib2-network, libclan2-network
+Replaces: libclan2-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
@@ -218,11 +223,12 @@
.
This package contains the Network module (clanNetwork).
-Package: libclan2-png
+Package: libclan2c2-png
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-png, clanlib2-png
+Conflicts: clanlib-png, clanlib2-png, libclan2-png
+Replaces: libclan2-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
@@ -238,11 +244,12 @@
.
This package contains the PNG module (clanPNG).
-Package: libclan2-sound
+Package: libclan2c2-sound
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-sound, clanlib2-sound
+Conflicts: clanlib-sound, clanlib2-sound, libclan2-sound
+Replaces: libclan2-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
@@ -258,11 +265,12 @@
.
This package contains the Sound module (clanSound).
-Package: libclan2-ttf
+Package: libclan2c2-ttf
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-ttf, clanlib2-ttf
+Conflicts: clanlib-ttf, clanlib2-ttf, libclan2-ttf
+Replaces: libclan2-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
@@ -278,11 +286,12 @@
.
This package contains the freetype TTF module (clanTTF).
-Package: libclan2-vorbis
+Package: libclan2c2-vorbis
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: clanlib-vorbis, clanlib2-vorbis
+Conflicts: clanlib-vorbis, clanlib2-vorbis, libclan2-vorbis
+Replaces: libclan2-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 -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-gl.install
clanlib-0.6.5-1/debian/libclan2c2-gl.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-gl.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-gl.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanGL.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-gui.install
clanlib-0.6.5-1/debian/libclan2c2-gui.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-gui.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-gui.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanGUI.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-jpeg.install
clanlib-0.6.5-1/debian/libclan2c2-jpeg.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-jpeg.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-jpeg.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanJPEG.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-lua.install
clanlib-0.6.5-1/debian/libclan2c2-lua.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-lua.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-lua.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanLua.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-mikmod.install
clanlib-0.6.5-1/debian/libclan2c2-mikmod.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-mikmod.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-mikmod.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanMikMod.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-network.install
clanlib-0.6.5-1/debian/libclan2c2-network.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-network.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-network.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanNetwork.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-png.install
clanlib-0.6.5-1/debian/libclan2c2-png.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-png.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-png.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanPNG.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-sound.install
clanlib-0.6.5-1/debian/libclan2c2-sound.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-sound.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-sound.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanSound.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-ttf.install
clanlib-0.6.5-1/debian/libclan2c2-ttf.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-ttf.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-ttf.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanTTF.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2c2-vorbis.install
clanlib-0.6.5-1/debian/libclan2c2-vorbis.install
--- clanlib-0.6.5-1-orig/debian/libclan2c2-vorbis.install 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/libclan2c2-vorbis.install 2005-08-07
13:57:29.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libclanVorbis.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-gl.install
clanlib-0.6.5-1/debian/libclan2-gl.install
--- clanlib-0.6.5-1-orig/debian/libclan2-gl.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-gl.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanGL.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-gui.install
clanlib-0.6.5-1/debian/libclan2-gui.install
--- clanlib-0.6.5-1-orig/debian/libclan2-gui.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-gui.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanGUI.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-jpeg.install
clanlib-0.6.5-1/debian/libclan2-jpeg.install
--- clanlib-0.6.5-1-orig/debian/libclan2-jpeg.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-jpeg.install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanJPEG.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-lua.install
clanlib-0.6.5-1/debian/libclan2-lua.install
--- clanlib-0.6.5-1-orig/debian/libclan2-lua.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-lua.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanLua.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-mikmod.install
clanlib-0.6.5-1/debian/libclan2-mikmod.install
--- clanlib-0.6.5-1-orig/debian/libclan2-mikmod.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-mikmod.install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanMikMod.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-network.install
clanlib-0.6.5-1/debian/libclan2-network.install
--- clanlib-0.6.5-1-orig/debian/libclan2-network.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-network.install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanNetwork.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-png.install
clanlib-0.6.5-1/debian/libclan2-png.install
--- clanlib-0.6.5-1-orig/debian/libclan2-png.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-png.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanPNG.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-sound.install
clanlib-0.6.5-1/debian/libclan2-sound.install
--- clanlib-0.6.5-1-orig/debian/libclan2-sound.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-sound.install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanSound.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-ttf.install
clanlib-0.6.5-1/debian/libclan2-ttf.install
--- clanlib-0.6.5-1-orig/debian/libclan2-ttf.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-ttf.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanTTF.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/libclan2-vorbis.install
clanlib-0.6.5-1/debian/libclan2-vorbis.install
--- clanlib-0.6.5-1-orig/debian/libclan2-vorbis.install 2005-08-07
13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/libclan2-vorbis.install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libclanVorbis.so.*
diff -uNr clanlib-0.6.5-1-orig/debian/patches/015_gcc-3.4-fix
clanlib-0.6.5-1/debian/patches/015_gcc-3.4-fix
--- clanlib-0.6.5-1-orig/debian/patches/015_gcc-3.4-fix 1970-01-01
01:00:00.000000000 +0100
+++ clanlib-0.6.5-1/debian/patches/015_gcc-3.4-fix 2005-08-07
14:13:28.000000000 +0200
@@ -0,0 +1,55 @@
+diff -urN tmp/Sources/Core/System/Unix/appconf.h
ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h
+--- tmp/Sources/Core/System/Unix/appconf.h 2000-05-03 20:29:00.000000000
+0200
++++ ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h 2004-08-18
16:30:09.442547793 +0200
+@@ -564,7 +564,6 @@
+ void SetNext(ConfigEntry *pNext) { m_pNext = pNext; }
+ };
+
+-protected:
+ class ConfigGroup
+ {
+ private:
+diff -urN tmp/Sources/Display/Display/Generic/blit_alphamask_rle.h
ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h
+--- tmp/Sources/Display/Display/Generic/blit_alphamask_rle.h 2001-09-02
19:33:37.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h
2004-08-18 16:32:18.089990409 +0200
+@@ -107,14 +107,14 @@
+ {
+ T a = alpha_data[x];
+ T destval = dst_data[x];
+- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
//(((destval&rmask)>>rstart)*a)>>8;
+- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
//(((destval&gmask)>>gstart)*a)>>8;
+- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
//(((destval&bmask)>>bstart)*a)>>8;
++ T r =
this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
//(((destval&rmask)>>rstart)*a)>>8;
++ T g =
this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
//(((destval&gmask)>>gstart)*a)>>8;
++ T b =
this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
//(((destval&bmask)>>bstart)*a)>>8;
+
+ T amix =
+- (r<<rstart) +
+- (g<<gstart) +
+- (b<<bstart);
++ (r<<this->rstart) +
++ (g<<this->gstart) +
++ (b<<this->bstart);
+
+ dst_data[x] = amix + *(src_data++);
+ }
+@@ -151,13 +151,13 @@
+ {
+ T a = alpha_data[x];
+ T destval = dst_buf[x];
+- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
+- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
+- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
++ T r =
this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
++ T g =
this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
++ T b =
this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
+ T amix =
+- (r<<rstart) +
+- (g<<gstart) +
+- (b<<bstart);
++ (r<<this->rstart) +
++ (g<<this->gstart) +
++ (b<<this->bstart);
+ dst_buf[x] = amix + *(src_data++);
+ }
+ memcpy(dst_data, dst_buf, sizeof(T)*rep);
diff -uNr clanlib-0.6.5-1-orig/debian/rules clanlib-0.6.5-1/debian/rules
--- clanlib-0.6.5-1-orig/debian/rules 2005-08-07 13:54:25.000000000 +0200
+++ clanlib-0.6.5-1/debian/rules 2005-08-07 19:18:51.000000000 +0200
@@ -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 := libclan2
+PKG_BASE := libclan2c2
MOVEBEFORE="$(PKG_BASE)-gl" \
"$(PKG_BASE)-gui" \
