[SCM] Packaging for funguloids branch, master, updated. upstream/1.06-42-g95ad921
Michael Koch
konqueror at gmx.de
Sat Sep 19 19:11:16 UTC 2009
The following commit has been merged in the master branch:
commit 95ad9217739aeb192e22f1c4ca51b843c812a58b
Author: Michael Koch <konqueror at gmx.de>
Date: Sat Sep 19 21:10:21 2009 +0200
package cleanup and upload
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..15f8be5
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --git a/debian/changelog b/debian/changelog
index 4652cd0..1bf1cfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+funguloids (1.06-8) unstable; urgency=low
+
+ * Added debian/patches/ogre-1.6.1.patch to work with newer ogre
+ (Closes: #546353).
+ * Improve clean target to delete files generated by autotools.
+ * Comment out unused entry in watch file.
+ * Added debian debian/README.source.
+ * Added myself to Uploaders.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 15 Sep 2009 21:04:00 +0200
+
+funguloids (1.06-7) unstable; urgency=low
+
+ * Fix compiling error with g++-4.3. Closes: #482649
+ * Ensure that funguloids is built with libogre-dev 1.4.9 or higher.
+ * Bumped Standards-Version to 3.8.0.
+ * Make sure build-aux directory is there.
+
+ -- Andres Mejia <mcitadel at gmail.com> Tue, 22 Jul 2008 00:31:14 -0400
+
funguloids (1.06-6) unstable; urgency=low
[ Andres Mejia ]
diff --git a/debian/control b/debian/control
index ca8b094..863de50 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: funguloids
Priority: extra
Section: contrib/games
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), quilt, tofrodos, automake, pkg-config, liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev
-Standards-Version: 3.7.3
+Uploaders: Andres Mejia <mcitadel at gmail.com>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), quilt, tofrodos, automake, pkg-config, liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4.9), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-games/funguloids.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/funguloids.git
Homepage: http://funguloids.sourceforge.net
diff --git a/debian/patches/alc_error.patch b/debian/patches/alc_error.patch
index 707d857..94f4e9c 100644
--- a/debian/patches/alc_error.patch
+++ b/debian/patches/alc_error.patch
@@ -1,7 +1,7 @@
Check ALC errors instead of AL errors.
=====================================================================
---- src/openalsoundsystem.cpp.bak 2008-05-04 16:41:32.000000000 -0400
-+++ src/openalsoundsystem.cpp 2008-05-04 16:20:52.000000000 -0400
+--- a/src/openalsoundsystem.cpp.bak 2008-05-04 16:41:32.000000000 -0400
++++ b/src/openalsoundsystem.cpp 2008-05-04 16:20:52.000000000 -0400
@@ -266,14 +266,14 @@
int attributes[] = { 0 };
diff --git a/debian/patches/disable_mouse_capture.patch b/debian/patches/disable_mouse_capture.patch
index 4d05a4e..d3c57ef 100644
--- a/debian/patches/disable_mouse_capture.patch
+++ b/debian/patches/disable_mouse_capture.patch
@@ -1,7 +1,7 @@
Support disabling of keyboard and mouse capture for debugging.
=====================================================================
---- src/input.cpp.bak 2008-05-04 14:51:35.000000000 -0400
-+++ src/input.cpp 2008-05-04 14:35:00.000000000 -0400
+--- a/src/input.cpp.bak 2008-05-04 14:51:35.000000000 -0400
++++ b/src/input.cpp 2008-05-04 14:35:00.000000000 -0400
@@ -37,6 +37,21 @@
OIS::ParamList pl;
pl.insert(OIS::ParamList::value_type("WINDOW", Ogre::StringConverter::toString(hWnd)));
diff --git a/debian/patches/g++4.3_fix.patch b/debian/patches/g++4.3_fix.patch
new file mode 100644
index 0000000..6b92fdd
--- /dev/null
+++ b/debian/patches/g++4.3_fix.patch
@@ -0,0 +1,12 @@
+Fix for compiling with g++4.3
+=====================================================================
+--- a/src/mp3stream.cpp.bak 2008-07-22 00:26:28.000000000 -0400
++++ b/src/mp3stream.cpp 2008-07-22 00:26:38.000000000 -0400
+@@ -35,6 +35,7 @@
+ #include <sys/stat.h>
+ #include <sstream>
+ #include "Ogre.h"
++#include <limits.h>
+
+ #include "mp3stream.h"
+
diff --git a/debian/patches/makefile_modifications.diff b/debian/patches/makefile_modifications.diff
index 3c1d782..e088287 100644
--- a/debian/patches/makefile_modifications.diff
+++ b/debian/patches/makefile_modifications.diff
@@ -1,8 +1,8 @@
Some modifications to get some of the data files installed in the correct
places. This is mainly for the purpose of building Debian packages.
==========================================================================
---- bin/music/Makefile.am~ 2007-06-23 18:03:05.000000000 -0400
-+++ bin/music/Makefile.am 2007-06-23 18:04:00.000000000 -0400
+--- a/bin/music/Makefile.am~ 2007-06-23 18:03:05.000000000 -0400
++++ b/bin/music/Makefile.am 2007-06-23 18:04:00.000000000 -0400
@@ -1,12 +1,10 @@
-musicinstall_DATA = playlist.lua
+musicinstall_DATA = playlist.lua MarylandInMay.ogg
@@ -17,8 +17,8 @@ places. This is mainly for the purpose of building Debian packages.
distclean: clean
---- bin/Makefile.am~ 2007-06-23 18:36:56.000000000 -0400
-+++ bin/Makefile.am 2007-06-23 18:39:50.000000000 -0400
+--- a/bin/Makefile.am~ 2007-06-23 18:36:56.000000000 -0400
++++ b/bin/Makefile.am 2007-06-23 18:39:50.000000000 -0400
@@ -4,7 +4,7 @@
dist_pixmapinstall_DATA = funguloids.png
dist_gameinstall_DATA = gamesettings.cfg
diff --git a/debian/patches/ogre-1.6.1.patch b/debian/patches/ogre-1.6.1.patch
new file mode 100644
index 0000000..40105dc
--- /dev/null
+++ b/debian/patches/ogre-1.6.1.patch
@@ -0,0 +1,42 @@
+--- funguloids-1.06.orig/include/mpakogre.h
++++ funguloids-1.06/include/mpakogre.h
+@@ -56,6 +56,7 @@
+ FileInfoListPtr findFileInfo(const String &pattern, bool recursive, bool dirs = false);
+
+ bool exists(const String &filename);
++ time_t getModifiedTime(const String& filename);
+ };
+
+
+--- funguloids-1.06.orig/src/mpakogre.cpp
++++ funguloids-1.06/src/mpakogre.cpp
+@@ -198,6 +198,11 @@
+ return (i != -1);
+ }
+
++time_t MPakArchive::getModifiedTime(const String& filename) {
++ // TODO: This is currently only a dummy implementation.
++ return 0;
++}
++
+ const String &MPakArchiveFactory::getType(void) const {
+ static String name = "MPK";
+ return name;
+--- funguloids-1.06.orig/src/scriptsystem.cpp
++++ funguloids-1.06/src/scriptsystem.cpp
+@@ -137,7 +137,6 @@
+ Asteroid *roid = new Asteroid(String(name), ScriptSystem::getSingleton().getSceneMgr(), String(mesh), String(mat), pos);
+ roid->setScale(scale, scale, scale);
+ roid->setMass(scale * 10.0f);
+- roid->getEntity()->setNormaliseNormals(true);
+ return 0;
+ }
+
+@@ -435,6 +434,7 @@
+ ScriptSystem::ScriptSystem(SceneManager *mgr, const char *startup_file) {
+ assert(mgr);
+ mSceneMgr = mgr;
++ mgr->setNormaliseNormalsOnScale(true);
+ scriptLights.clear();
+
+ LogManager::getSingleton().logMessage("Using " + String(LUA_VERSION));
diff --git a/debian/patches/series b/debian/patches/series
index 24cdd80..45f8652 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
-makefile_modifications.diff -p0
-size_chunks_reverse.patch -p0
-disable_mouse_capture.patch -p0
-alc_error.patch -p0
+makefile_modifications.diff
+size_chunks_reverse.patch
+disable_mouse_capture.patch
+alc_error.patch
+g++4.3_fix.patch
+ogre-1.6.1.patch
diff --git a/debian/patches/size_chunks_reverse.patch b/debian/patches/size_chunks_reverse.patch
index 14fbcd7..732a7b6 100644
--- a/debian/patches/size_chunks_reverse.patch
+++ b/debian/patches/size_chunks_reverse.patch
@@ -1,8 +1,8 @@
Correction for MPakDataStream::read(). This reflects what's done in the
FileHandleDataStream::read() method in OgreDataStream.cpp in the Ogre library.
=====================================================================
---- src/mpakogre.cpp.bak 2008-05-04 01:05:10.000000000 -0400
-+++ src/mpakogre.cpp 2008-05-04 00:56:05.000000000 -0400
+--- a/src/mpakogre.cpp.bak 2008-05-04 01:05:10.000000000 -0400
++++ b/src/mpakogre.cpp 2008-05-04 00:56:05.000000000 -0400
@@ -219,7 +219,7 @@
}
diff --git a/debian/rules b/debian/rules
index f20579b..89a8edd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,6 @@ else
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-# Specify available DEB_BUILD_OPTIONS, nostrip option is specified where
-# dh_strip is used under binary-arch target.
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
DEB_CXXFLAGS += -O0 -g -Wall
else
@@ -34,9 +32,11 @@ endif
fromdos: fromdos-stamp
fromdos-stamp:
dh_testdir
+ fromdos -e include/mpakogre.h
fromdos -e src/mpakogre.cpp
fromdos -e src/input.cpp
fromdos -e src/openalsoundsystem.cpp
+ fromdos -e src/scriptsystem.cpp
patch: fromdos patch-stamp
patch-stamp:
@@ -47,6 +47,9 @@ patch-stamp:
configure: patch configure-stamp
configure-stamp:
dh_testdir
+# Some strange issue happened where the build-aux directory was never imported
+# using git-import-orig, thus the next line ensures that it's there
+ [ -d build-aux ] || mkdir build-aux
aclocal
autoheader -f
automake --add-missing --force-missing --copy
@@ -66,8 +69,14 @@ clean-stamp:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) clean distclean
+ [ -d build-aux ] && rm -f build-aux/*
[ ! -f configure-stamp ] || rm configure-stamp
[ ! -f build-stamp ] || rm build-stamp
+ rm -f aclocal.m4 configure
+ rm -f bin/music/playlist.lua
+ find . -name Makefile -delete
+ find . -name Makefile.in -delete
+ rm -rf .pc
dh_clean
unpatch:
@@ -77,9 +86,11 @@ unpatch:
todos:
dh_testdir
+ todos -e include/mpakogre.h
todos -e src/mpakogre.cpp
todos -e src/input.cpp
todos -e src/openalsoundsystem.cpp
+ todos -e src/scriptsystem.cpp
install: build
dh_testdir
@@ -101,10 +112,7 @@ binary-arch: build install
dh_installman debian/funguloids.6
dh_installdocs debian/tmp/usr/share/docs/funguloids/*
dh_installmenu
- dh_desktop
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip
-endif
dh_compress
dh_fixperms
dh_installdeb
diff --git a/debian/watch b/debian/watch
index f8b8f0e..519ff91 100644
--- a/debian/watch
+++ b/debian/watch
@@ -5,7 +5,7 @@ http://sf.net/funguloids/funguloids-linux-([^(src)].+)\.tar\.bz2 \
1.06-4.
# Scan sourceforge directly
-opts=uversionmangle=s/\.\?.*// \
- http://downloads.sourceforge.net/funguloids \
- http://downloads.sourceforge.net/funguloids/funguloids-linux-([^(src)].+)\.tar\.bz2(.*) \
- 1.06-4
+#opts=uversionmangle=s/\.\?.*// \
+# http://downloads.sourceforge.net/funguloids \
+# http://downloads.sourceforge.net/funguloids/funguloids-linux-([^(src)].+)\.tar\.bz2(.*) \
+# 1.06-4
diff --git a/src/mpakogre.cpp b/src/mpakogre.cpp
index 9a6871e..3dd49be 100644
--- a/src/mpakogre.cpp
+++ b/src/mpakogre.cpp
@@ -75,10 +75,10 @@ void MPakArchive::load() {
mFileList.push_back(info);
}
-
- // The following is commented out since it isn't really needed,
- // I'm not planning to use the override directory.. It wasn't compiling on
- // Linux anyways, as the _find* aren't exported currently (Ogre Eihort 1.4.0)
+
+ // The following is commented out since it isn't really needed,
+ // I'm not planning to use the override directory.. It wasn't compiling on
+ // Linux anyways, as the _find* aren't exported currently (Ogre Eihort 1.4.0)
/*
// Find the possible files in the override directory (media) and add them too
if(mPakFile->override_dir != NULL) {
diff --git a/src/openalsoundsystem.cpp b/src/openalsoundsystem.cpp
index 908a93f..f90a0cc 100644
--- a/src/openalsoundsystem.cpp
+++ b/src/openalsoundsystem.cpp
@@ -21,9 +21,9 @@
//
// 3. This notice may not be removed or altered from any source distribution.
//
-//***************************************************************************/
-
-// NOTICE: This file is written by Piet (thanks! :), <funguloids at superpiet.de>,
+//***************************************************************************/
+
+// NOTICE: This file is written by Piet (thanks! :), <funguloids at superpiet.de>,
// for the Linux version of Funguloids.
#include "soundsystem.h"
@@ -312,12 +312,12 @@ int OpenALSoundSystem::initialise( unsigned int devIndex )
mSoundChannels->setVolume(vol);
// add a music player
- mStreamPlayer = new StreamPlayer();
-
- // Set the music volume
+ mStreamPlayer = new StreamPlayer();
+
+ // Set the music volume
svol = GameApplication::mGameConfig->GetValue("audio", "music_volume", "1.0");
vol = StringConverter::parseReal(svol);
- mStreamPlayer->setVolume(vol);
+ mStreamPlayer->setVolume(vol);
return 0;
}
@@ -480,14 +480,14 @@ void OpenALSoundSystem::playMusic(const std::string& file) {
if(mSoundDisabled) return;
if(file.empty()) return;
LogManager::getSingleton().logMessage("Going to play '" + file + "'..");
- assert(mStreamPlayer);
-
- // Set the volume
+ assert(mStreamPlayer);
+
+ // Set the volume
String svol = GameApplication::mGameConfig->GetValue("audio", "music_volume", "1.0");
Real vol = StringConverter::parseReal(svol);
mStreamPlayer->play(file);
- mStreamPlayer->setVolume(vol);
+ mStreamPlayer->setVolume(vol);
}
diff --git a/src/scriptsystem.cpp b/src/scriptsystem.cpp
index 067b4fe..66aec0c 100644
--- a/src/scriptsystem.cpp
+++ b/src/scriptsystem.cpp
@@ -407,24 +407,24 @@ static int GetNextSong(lua_State *L) {
String song = getNextSong();
lua_pushstring(L, song.c_str());
return 1;
-}
-
-
-// Get the music directory
-// $HOME/music/ on Linux, the ./music/ on Windows
-static int GetMusicDir(lua_State *L) {
- // Return the music directory
- String dir;
-
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 // For Windows
+}
+
+
+// Get the music directory
+// $HOME/music/ on Linux, the ./music/ on Windows
+static int GetMusicDir(lua_State *L) {
+ // Return the music directory
+ String dir;
+
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 // For Windows
dir = "music/";
#else // For Linux/Unix/etc.
- extern String getFunguloidsDir();
- dir = getFunguloidsDir() + "music/";
-#endif
-
- lua_pushstring(L, dir.c_str());
- return 1;
+ extern String getFunguloidsDir();
+ dir = getFunguloidsDir() + "music/";
+#endif
+
+ lua_pushstring(L, dir.c_str());
+ return 1;
}
////////////////////////////////////////////
@@ -465,7 +465,7 @@ ScriptSystem::ScriptSystem(SceneManager *mgr, const char *startup_file) {
lua_register(mLuaVM, "PlayMusic", PlayMusic);
lua_register(mLuaVM, "AddToPlaylist", AddToPlaylist);
lua_register(mLuaVM, "ShufflePlaylist", ShufflePlaylist);
- lua_register(mLuaVM, "GetNextSong", GetNextSong);
+ lua_register(mLuaVM, "GetNextSong", GetNextSong);
lua_register(mLuaVM, "GetMusicDir", GetMusicDir);
LogManager::getSingleton().logMessage("ScriptSystem created.");
--
Packaging for funguloids
More information about the Pkg-games-commits
mailing list