I believe the attached patch completes all current transitions for
arkrpg. Please someone review it especially the C++ transition part.
I can NMU with this patch during the current BSP if wanted.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Naur arkrpg-0.1.4b.bak/Ark/ArkModel.h arkrpg-0.1.4b/Ark/ArkModel.h
--- arkrpg-0.1.4b.bak/Ark/ArkModel.h 2004-04-14 22:47:17.000000000 +0200
+++ arkrpg-0.1.4b/Ark/ArkModel.h 2005-08-05 20:28:59.000000000 +0200
@@ -65,6 +65,8 @@
void Optimize ();
};
+ class ModelBuilder;
+
class ARK_DLL_API SubModel
{
friend class ModelBuilder;
diff -Naur arkrpg-0.1.4b.bak/Ark/ArkObject.h arkrpg-0.1.4b/Ark/ArkObject.h
--- arkrpg-0.1.4b.bak/Ark/ArkObject.h 2004-04-14 22:47:17.000000000 +0200
+++ arkrpg-0.1.4b/Ark/ArkObject.h 2005-08-05 20:28:59.000000000 +0200
@@ -42,6 +42,8 @@
V_FONT
};
+ class Cache;
+
// ======================================================================
/**
* A object is an abstract class used which provides refcounting and naming
diff -Naur arkrpg-0.1.4b.bak/debian/changelog arkrpg-0.1.4b/debian/changelog
--- arkrpg-0.1.4b.bak/debian/changelog 2005-08-05 20:26:59.000000000 +0200
+++ arkrpg-0.1.4b/debian/changelog 2005-08-05 21:19:30.000000000 +0200
@@ -1,3 +1,15 @@
+arkrpg (0.1.4b-6.1) unstable; urgency=high
+
+ * Non-maintainer upload during BSP.
+ * Apply patch by Matt Kraai to fix FTBFS with g++ 4.0
+ (Closes: #318999)
+ * Change build-depends and depends of -dev package from
+ xlibmesa-glu-dev to libglu1-xorg-dev
+ * C++ transition: rename libarkrpg to libarkrpg0 (since this seems to
+ be the correct name anyway...) and conflict with the old package
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Fri, 5 Aug 2005 20:29:02 +0200
+
arkrpg (0.1.4b-6) unstable; urgency=low
* CDBS tweaks.
diff -Naur arkrpg-0.1.4b.bak/debian/control arkrpg-0.1.4b/debian/control
--- arkrpg-0.1.4b.bak/debian/control 2005-08-05 20:26:59.000000000 +0200
+++ arkrpg-0.1.4b/debian/control 2005-08-05 21:32:17.715910784 +0200
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Marc Dequènes (Duck) <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), libltdl3-dev,
libsdl1.2-dev, libsdl-mixer1.2-dev, xlibmesa-gl-dev, xlibmesa-glu-dev,
libpng-dev, liblua40-dev, liblualib40-dev, zlib1g-dev, libjpeg62-dev,
docbook-to-man, autotools-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), build-essential, autotools-dev, debhelper
(>= 4.1.0), patchutils (>= 0.2.25), libltdl3-dev, libsdl1.2-dev,
libsdl-mixer1.2-dev, xlibmesa-gl-dev, libglu1-xorg-dev, libpng-dev,
liblua40-dev, liblualib40-dev, zlib1g-dev, libjpeg62-dev, docbook-to-man,
autotools-dev
Standards-Version: 3.6.1.1
Package: arkrpg
@@ -21,10 +21,11 @@
.
This package provides binaries needed to use the kernel.
-Package: libarkrpg
+Package: libarkrpg0
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
+Conflicts: libarkrpg
Suggests: arkrpg
Description: shared libraries for Arkrpg
Arkrpg is a powerful and flexible framework to create
@@ -40,7 +41,7 @@
Package: libarkrpg-dev
Section: libdevel
Architecture: any
-Depends: libarkrpg (= ${Source-Version}), libstdc++5-3.3-dev | libstdc++-dev,
libsdl1.2-dev, libsdl-mixer1.2-dev, xlibmesa-gl-dev, xlibmesa-glu-dev,
libpng-dev, liblua40-dev, liblualib40-dev, zlib1g-dev, libjpeg62-dev
+Depends: libarkrpg0 (= ${Source-Version}), libstdc++6-dev | libstdc++-dev,
libsdl1.2-dev, libsdl-mixer1.2-dev, xlibmesa-gl-dev, libglu1-xorg-dev,
libpng-dev, liblua40-dev, liblualib40-dev, zlib1g-dev, libjpeg62-dev
Description: development headers for Arkrpg
Arkrpg is a powerful and flexible framework to create
(networked/single player) role playing games, without having to write a
diff -Naur arkrpg-0.1.4b.bak/debian/control.in arkrpg-0.1.4b/debian/control.in
--- arkrpg-0.1.4b.bak/debian/control.in 2005-08-05 20:26:59.000000000 +0200
+++ arkrpg-0.1.4b/debian/control.in 2005-08-05 21:17:32.000000000 +0200
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Marc Dequènes (Duck) <[EMAIL PROTECTED]>
-Build-Depends: @cdbs@, libltdl3-dev, libsdl1.2-dev, libsdl-mixer1.2-dev,
xlibmesa-gl-dev, xlibmesa-glu-dev, libpng-dev, liblua40-dev, liblualib40-dev,
zlib1g-dev, libjpeg62-dev, docbook-to-man, autotools-dev
+Build-Depends: @cdbs@, libltdl3-dev, libsdl1.2-dev, libsdl-mixer1.2-dev,
xlibmesa-gl-dev, libglu1-xorg-dev, libpng-dev, liblua40-dev, liblualib40-dev,
zlib1g-dev, libjpeg62-dev, docbook-to-man, autotools-dev
Standards-Version: 3.6.1.1
Package: arkrpg
@@ -21,10 +21,11 @@
.
This package provides binaries needed to use the kernel.
-Package: libarkrpg
+Package: libarkrpg0
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
+Conflicts: libarkrpg
Suggests: arkrpg
Description: shared libraries for Arkrpg
Arkrpg is a powerful and flexible framework to create
@@ -40,7 +41,7 @@
Package: libarkrpg-dev
Section: libdevel
Architecture: any
-Depends: libarkrpg (= ${Source-Version}), libstdc++5-3.3-dev | libstdc++-dev,
libsdl1.2-dev, libsdl-mixer1.2-dev, xlibmesa-gl-dev, xlibmesa-glu-dev,
libpng-dev, liblua40-dev, liblualib40-dev, zlib1g-dev, libjpeg62-dev
+Depends: libarkrpg0 (= ${Source-Version}), libstdc++6-dev | libstdc++-dev,
libsdl1.2-dev, libsdl-mixer1.2-dev, xlibmesa-gl-dev, libglu1-xorg-dev,
libpng-dev, liblua40-dev, liblualib40-dev, zlib1g-dev, libjpeg62-dev
Description: development headers for Arkrpg
Arkrpg is a powerful and flexible framework to create
(networked/single player) role playing games, without having to write a
diff -Naur arkrpg-0.1.4b.bak/debian/libarkrpg0.install
arkrpg-0.1.4b/debian/libarkrpg0.install
--- arkrpg-0.1.4b.bak/debian/libarkrpg0.install 1970-01-01 01:00:00.000000000
+0100
+++ arkrpg-0.1.4b/debian/libarkrpg0.install 2005-08-05 20:27:00.000000000
+0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libArk.so.0.1.0 debian/tmp/usr/lib/libArk.so.0
debian/tmp/usr/lib/ark usr/lib/
diff -Naur arkrpg-0.1.4b.bak/debian/libarkrpg.install
arkrpg-0.1.4b/debian/libarkrpg.install
--- arkrpg-0.1.4b.bak/debian/libarkrpg.install 2005-08-05 20:26:59.000000000
+0200
+++ arkrpg-0.1.4b/debian/libarkrpg.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libArk.so.0.1.0 debian/tmp/usr/lib/libArk.so.0
debian/tmp/usr/lib/ark usr/lib/
diff -Naur arkrpg-0.1.4b.bak/debian/rules arkrpg-0.1.4b/debian/rules
--- arkrpg-0.1.4b.bak/debian/rules 2005-08-05 20:26:59.000000000 +0200
+++ arkrpg-0.1.4b/debian/rules 2005-08-05 21:32:15.176296864 +0200
@@ -17,9 +17,9 @@
# tight versioning
DEB_NOREVISION_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' |
cut -f 2 -d ' ' | cut -f 1 -d '-')
-DEB_DH_MAKESHLIBS_ARGS_libarkrpg := -V"libarkrpg (>=
$(DEB_NOREVISION_VERSION))"
-DEB_SHLIBDEPS_LIBRARY_arkrpg := libarkrpg
-DEB_SHLIBDEPS_INCLUDE_arkrpg := debian/libarkrpg/usr/lib/
+DEB_DH_MAKESHLIBS_ARGS_libarkrpg := -V"libarkrpg0 (>=
$(DEB_NOREVISION_VERSION))"
+DEB_SHLIBDEPS_LIBRARY_arkrpg := libarkrpg0
+DEB_SHLIBDEPS_INCLUDE_arkrpg := debian/libarkrpg0/usr/lib/
configure/arkrpg::
@@ -35,8 +35,8 @@
binary-install/arkrpg::
dh_installman -parkrpg $(ARKRPG_MANPAGES)
-binary-install/libarkrpg::
- find $(CURDIR)/debian/libarkrpg/usr/lib/ \( -name "*.a*" -or -name
"*.la*" \) -and -exec rm {} \;
+binary-install/libarkrpg0::
+ find $(CURDIR)/debian/libarkrpg0/usr/lib/ \( -name "*.a*" -or -name
"*.la*" \) -and -exec rm {} \;
binary-install/libarkrpg-dev::
dh_installman -plibarkrpg-dev $(LIBARKRPG-DEV_MANPAGES)
diff -Naur arkrpg-0.1.4b.bak/Modules/Renderer/Visual.h
arkrpg-0.1.4b/Modules/Renderer/Visual.h
--- arkrpg-0.1.4b.bak/Modules/Renderer/Visual.h 2004-04-14 22:47:17.000000000
+0200
+++ arkrpg-0.1.4b/Modules/Renderer/Visual.h 2005-08-05 20:28:59.000000000
+0200
@@ -29,6 +29,7 @@
namespace Ark
{
+ class GLRenderer;
/* ============================ GL-Specific functions for textures */
class ARKRENDERER_DLL_API GLTexture : public Texture
