Author: ansgar-guest Date: 2008-08-31 23:31:55 +0000 (Sun, 31 Aug 2008) New Revision: 8062
Added: packages/trunk/btanks/debian/btanks.manpages packages/trunk/btanks/debian/clean packages/trunk/btanks/debian/patches/fix_path_bug.patch Removed: packages/trunk/btanks/debian/patches/btanks_gcc43.patch Modified: packages/trunk/btanks/debian/btanks-data.dirs packages/trunk/btanks/debian/btanks.install packages/trunk/btanks/debian/changelog packages/trunk/btanks/debian/compat packages/trunk/btanks/debian/control packages/trunk/btanks/debian/patches/remove_default_optimizations.patch packages/trunk/btanks/debian/patches/series packages/trunk/btanks/debian/rules Log: TODO: Test if sound problem is really fixed TODO: Test building in pbuilder TODO: Convert copyright, check if still up to date MAYBE: install map editor (depends how usable it is) * New Upstream Version (Closes: #490792, #496997) + Get available resolutions from the SDL (Closes: #440737) + New sound backend (MAYBE Closes: #440897) * Refresh remove_default_optimizations.patch * Remove btanks_gcc43.patch (applied upstream) * New patch fix_path_but.patch: Fix problem with normalizing absolute paths * Rewrote debian/rules to use debhelper 7 * Change description for btanks-data * Add myself to Uploaders Modified: packages/trunk/btanks/debian/btanks-data.dirs =================================================================== --- packages/trunk/btanks/debian/btanks-data.dirs 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/btanks-data.dirs 2008-08-31 23:31:55 UTC (rev 8062) @@ -1 +1,3 @@ usr/share/games/btanks/ +usr/share/doc/btanks/ + Modified: packages/trunk/btanks/debian/btanks.install =================================================================== --- packages/trunk/btanks/debian/btanks.install 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/btanks.install 2008-08-31 23:31:55 UTC (rev 8062) @@ -1,7 +1,10 @@ -btanks usr/games/ -libmrt.so usr/lib/btanks/ -libbt.so usr/lib/btanks/ -libsdlx.so usr/lib/btanks/ +build/release/engine/btanks usr/games/ +build/release/mrt/libmrt.so usr/lib/btanks/ +build/release/engine/libbt.so usr/lib/btanks/ +build/release/clunk/libclunk.so usr/lib/btanks/ +build/release/sdlx/libsdlx.so usr/lib/btanks/ +build/release/objects/libbt_objects.so usr/lib/btanks/ + debian/btanks.xpm usr/share/pixmaps/ -libbt_objects.so usr/lib/btanks/ debian/*.desktop usr/share/applications/ + Added: packages/trunk/btanks/debian/btanks.manpages =================================================================== --- packages/trunk/btanks/debian/btanks.manpages (rev 0) +++ packages/trunk/btanks/debian/btanks.manpages 2008-08-31 23:31:55 UTC (rev 8062) @@ -0,0 +1,2 @@ +debian/btanks.6 + Modified: packages/trunk/btanks/debian/changelog =================================================================== --- packages/trunk/btanks/debian/changelog 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/changelog 2008-08-31 23:31:55 UTC (rev 8062) @@ -1,10 +1,22 @@ -btanks (0.7.5800-3) UNRELEASED; urgency=low +btanks (0.8.7656-1) UNRELEASED; urgency=low - * NOT RELEASED YET - * + TODO: Test if sound problem is really fixed + TODO: Test building in pbuilder + TODO: Convert copyright, check if still up to date + MAYBE: install map editor (depends how usable it is) - -- Alexander Schmehl <[EMAIL PROTECTED]> Mon, 07 Apr 2008 23:37:48 +0200 + * New Upstream Version (Closes: #490792, #496997) + + Get available resolutions from the SDL (Closes: #440737) + + New sound backend (MAYBE Closes: #440897) + * Refresh remove_default_optimizations.patch + * Remove btanks_gcc43.patch (applied upstream) + * New patch fix_path_but.patch: Fix problem with normalizing absolute paths + * Rewrote debian/rules to use debhelper 7 + * Change description for btanks-data + * Add myself to Uploaders + -- Ansgar Burchardt <[EMAIL PROTECTED]> Sun, 31 Aug 2008 20:04:12 +0200 + btanks (0.7.5800-2) unstable; urgency=high [ Barry deFreese ] Added: packages/trunk/btanks/debian/clean =================================================================== --- packages/trunk/btanks/debian/clean (rev 0) +++ packages/trunk/btanks/debian/clean 2008-08-31 23:31:55 UTC (rev 8062) @@ -0,0 +1,5 @@ +debian/html.tar +config.log +options.cache +.sconsign.dblite + Modified: packages/trunk/btanks/debian/compat =================================================================== --- packages/trunk/btanks/debian/compat 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/compat 2008-08-31 23:31:55 UTC (rev 8062) @@ -1 +1 @@ -5 +7 Modified: packages/trunk/btanks/debian/control =================================================================== --- packages/trunk/btanks/debian/control 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/control 2008-08-31 23:31:55 UTC (rev 8062) @@ -2,11 +2,12 @@ Section: games Priority: extra Maintainer: Debian Games Team <[EMAIL PROTECTED]> -Uploaders: Miriam Ruiz <[EMAIL PROTECTED]>, Barry deFreese <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.51~), quilt, scons, sharutils, chrpath, - libsdl1.2-dev, libsdl-image1.2-dev, liblua5.1-dev, +Uploaders: Miriam Ruiz <[EMAIL PROTECTED]>, Barry deFreese <[EMAIL PROTECTED]>, + Ansgar Burchardt <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 7), quilt, scons, sharutils, + libsdl1.2-dev, libsdl-image1.2-dev, liblua5.1-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, - libopenal-dev, libvorbis-dev, libsigc++-2.0-dev, libexpat1-dev + libsmpeg-dev, libvorbis-dev, libsigc++-2.0-dev, libexpat1-dev Standards-Version: 3.7.3 Homepage: http://btanks.sourceforge.net Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/btanks/ @@ -26,5 +27,13 @@ Architecture: all Depends: ${misc:Depends} Recommends: btanks -Description: game data for Battle Tanks - Fonts, maps, sounds, music images and other data for Battle Tanks. +Description: fast 2D tank arcade game -- data + Battle Tanks is a funny battle on your desk, where you can choose one of + three vehicles and eliminate your enemy using the whole arsenal of + weapons. has original cartoon-like graphics and cool music, it is fun + and dynamic, it has several network modes for deathmatch and + cooperative. + . + This package contains fonts, maps, sounds, music, images and other data for + Battle Tanks. + Deleted: packages/trunk/btanks/debian/patches/btanks_gcc43.patch =================================================================== --- packages/trunk/btanks/debian/patches/btanks_gcc43.patch 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/patches/btanks_gcc43.patch 2008-08-31 23:31:55 UTC (rev 8062) @@ -1,103 +0,0 @@ -only in patch2: -unchanged: ---- btanks-0.7.5800.orig/mrt/udp_socket.cpp -+++ btanks-0.7.5800/mrt/udp_socket.cpp -@@ -22,6 +22,7 @@ - # endif - #endif - -+#include <cstring> - - using namespace mrt; - -only in patch2: -unchanged: ---- btanks-0.7.5800.orig/mrt/sys_socket.cpp -+++ btanks-0.7.5800/mrt/sys_socket.cpp -@@ -27,6 +27,7 @@ - # include <unistd.h> - #endif - -+#include <cstring> - - using namespace mrt; - -only in patch2: -unchanged: ---- btanks-0.7.5800.orig/mrt/lang.cpp -+++ btanks-0.7.5800/mrt/lang.cpp -@@ -8,6 +8,9 @@ - #include "lang.h" - #include "logger.h" - -+#include <cstdlib> -+#include <cstring> -+ - const std::string mrt::getLanguageCode() { - #ifdef WIN32 - LANGID lang_id = GetUserDefaultLangID(); -only in patch2: -unchanged: ---- btanks-0.7.5800.orig/mrt/serializator.cpp -+++ btanks-0.7.5800/mrt/serializator.cpp -@@ -31,6 +31,8 @@ - #include <limits.h> - #include "exception.h" - -+#include <cstring> -+ - #ifdef WIN32 - # ifndef uint32_t - # define uint32_t unsigned __int32 -only in patch2: -unchanged: ---- btanks-0.7.5800.orig/menu/menu_config.cpp -+++ btanks-0.7.5800/menu/menu_config.cpp -@@ -24,6 +24,8 @@ - #include "mrt/b64.h" - #include "config.h" - -+#include <cstring> -+ - IMPLEMENT_SINGLETON(MenuConfig, IMenuConfig); - - void SlotConfig::serialize(mrt::Serializator &s) const { -only in patch2: -unchanged: ---- btanks-0.7.5800.orig/src/i18n.cpp -+++ btanks-0.7.5800/src/i18n.cpp -@@ -20,6 +20,8 @@ - #include "mrt/exception.h" - #include <assert.h> - -+#include <cstring> -+ - IMPLEMENT_SINGLETON(I18n, II18n); - - bool lessnocase::operator()(const std::string& s1, const std::string& s2) const { -only in patch2: -unchanged: ---- btanks-0.7.5800.orig/src/var.cpp -+++ btanks-0.7.5800/src/var.cpp -@@ -21,6 +21,8 @@ - #include "mrt/serializator.h" - #include <assert.h> - -+#include <cstdlib> -+ - void Var::serialize(mrt::Serializator &s) const { - if (type.empty()) - throw_ex(("cannot serialize empty variable")); -only in patch2: -unchanged: ---- btanks-0.7.5800.orig/objects/trooper.cpp -+++ btanks-0.7.5800/objects/trooper.cpp -@@ -24,6 +24,8 @@ - #include "config.h" - #include "trooper.h" - -+#include <cstring> -+ - void Trooper::getImpassabilityPenalty(const float impassability, float &base, float &base_value, float &penalty) const { - if (impassability > 0.2f) { - base_value = 0.2f; Added: packages/trunk/btanks/debian/patches/fix_path_bug.patch =================================================================== --- packages/trunk/btanks/debian/patches/fix_path_bug.patch (rev 0) +++ packages/trunk/btanks/debian/patches/fix_path_bug.patch 2008-08-31 23:31:55 UTC (rev 8062) @@ -0,0 +1,11 @@ +--- btanks.orig/mrt/fs_node.cpp ++++ btanks/mrt/fs_node.cpp +@@ -121,7 +121,7 @@ + std::vector<std::string> p, r; + mrt::split(p, path, "/"); + for(size_t i = 0; i < p.size(); ++i) { +- if (p[i] == "." || p[i].empty()) ++ if (p[i] == ".") + continue; + if (p[i] == ".." && !r.empty()) { + r.resize(r.size() - 1); Modified: packages/trunk/btanks/debian/patches/remove_default_optimizations.patch =================================================================== --- packages/trunk/btanks/debian/patches/remove_default_optimizations.patch 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/patches/remove_default_optimizations.patch 2008-08-31 23:31:55 UTC (rev 8062) @@ -1,12 +1,12 @@ ---- btanks-0.5.4549.orig/SConstruct -+++ btanks-0.5.4549/SConstruct -@@ -84,9 +84,6 @@ +--- btanks.orig/SConstruct ++++ btanks/SConstruct +@@ -97,9 +97,6 @@ if debug: - env.Append(CCFLAGS='-ggdb ') - env.Append(CPPFLAGS='-ggdb ') + env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2']) + env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2']) - else: -- env.Append(CCFLAGS='-O3 ') -- env.Append(CPPFLAGS='-O3 ') +- env.Append(CCFLAGS=['-O3']) +- env.Append(CPPFLAGS=['-O3']) - al_lib = 'openal' - env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ') + env.Append(CPPFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pipe', '-pthread']) + env.Append(CCFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pipe', '-pthread']) Modified: packages/trunk/btanks/debian/patches/series =================================================================== --- packages/trunk/btanks/debian/patches/series 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/patches/series 2008-08-31 23:31:55 UTC (rev 8062) @@ -1,2 +1,2 @@ remove_default_optimizations.patch -btanks_gcc43.patch +fix_path_bug.patch Modified: packages/trunk/btanks/debian/rules =================================================================== --- packages/trunk/btanks/debian/rules 2008-08-30 21:24:32 UTC (rev 8061) +++ packages/trunk/btanks/debian/rules 2008-08-31 23:31:55 UTC (rev 8062) @@ -1,102 +1,39 @@ #!/usr/bin/make -f +include /usr/share/quilt/quilt.make + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -patch: - dh_testdir - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - -unpatch: - dh_testdir - QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2 - -configure: configure-stamp -configure-stamp: - dh_testdir - $(MAKE) -f /usr/share/quilt/quilt.make patch - cat debian/options.cache | sed -e 's/:CFLAGS:/$(CFLAGS)/' > options.cache - touch $@ - build: build-stamp -build-stamp: configure-stamp +build-stamp: $(QUILT_STAMPFN) dh_testdir - scons prefix=/usr resources_dir=/usr/share/games/btanks lib_dir=$(CURDIR) + sed -e 's/:CFLAGS:/$(CFLAGS)/' < debian/options.cache > options.cache + scons prefix=/usr resources_dir=/usr/share/games/btanks plugins_dir=/usr/lib/btanks lib_dir=/usr/lib/btanks + dh build + uudecode -o debian/html.tar debian/html.tar.uu touch $@ -clean: +clean: unpatch dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - -scons -c - rm -f `find . -name "*.o"` - rm -f `find . -name "*.os"` - rm -f `find . -name "*.so"` - rm -f config.log options.cache bt.xml .sconsign.dblite - rm -rf .sconf_temp build/release - rm -f bt btanks - rm -rf debian/html.tar - $(MAKE) -f /usr/share/quilt/quilt.make unpatch - dh_clean + rm -rf .sconf_temp build + dh clean install: build - dh_testdir - dh_testroot - dh_clean -k -a - dh_installdirs - mv bt btanks - chrpath --replace /usr/lib/btanks btanks - -# Build architecture-independent files here. -binary-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installchangelogs -i ChangeLog - dh_installdocs -i - dh_install -i - mkdir -p $(CURDIR)/debian/btanks-data/usr/share/doc/btanks/ - uudecode -o debian/html.tar debian/html.tar.uu + dh install --until dh_install cd $(CURDIR)/debian/btanks-data/usr/share/doc/btanks/ && tar xvf $(CURDIR)/debian/html.tar + dh install --remaining find debian/btanks-data/ -type f -print0 | xargs -0 chmod 0644 - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i +# Build architecture-independent files here. +binary-indep: install + dh binary-indep # Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs -a ChangeLog - dh_installdocs -a - dh_installexamples -a - dh_install -a - dh_installmenu -a - dh_desktop -a - dh_icons -a - dh_installman -a debian/btanks.6 - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a -# dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a -l$(CURDIR)/debian/btanks/usr/lib/btanks - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a +binary-arch: install + dh binary-arch binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
