r10650 - in packages/trunk/btanks/debian: . patches source

Sat Jan 2 14:17:08 UTC 2010

Author: ansgar-guest
Date: 2010-01-02 14:17:08 +0000 (Sat, 02 Jan 2010)
New Revision: 10650

Added:
   packages/trunk/btanks/debian/source/
   packages/trunk/btanks/debian/source/format
Modified:
   packages/trunk/btanks/debian/
   packages/trunk/btanks/debian/btanks.install
   packages/trunk/btanks/debian/changelog
   packages/trunk/btanks/debian/control
   packages/trunk/btanks/debian/copyright
   packages/trunk/btanks/debian/patches/remove_default_optimizations.patch
   packages/trunk/btanks/debian/patches/rename-currency-symbol.patch
   packages/trunk/btanks/debian/rules
Log:
* New upstream release.
  + Update debian/copyright.
* Switch to source format v3 and drop b-dep on quilt.
* debian/rules: Use override_* rules.
* Bump Standards Version to 3.8.3 (no changes).


Property changes on: packages/trunk/btanks/debian
___________________________________________________________________
Modified: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/btanks_0.8.7686.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/btanks_0.9.8083.orig.tar.bz2

Modified: packages/trunk/btanks/debian/btanks.install
===================================================================

--- packages/trunk/btanks/debian/btanks.install	2010-01-01 21:11:55 UTC (rev 10649)
+++ packages/trunk/btanks/debian/btanks.install	2010-01-02 14:17:08 UTC (rev 10650)
@@ -1,6 +1,6 @@
 build/release/engine/btanks usr/games/
 build/release/mrt/libmrt.so usr/lib/btanks/
-build/release/engine/libbt.so usr/lib/btanks/
+build/release/engine/libbtanks_engine.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/

Modified: packages/trunk/btanks/debian/changelog
===================================================================
--- packages/trunk/btanks/debian/changelog	2010-01-01 21:11:55 UTC (rev 10649)
+++ packages/trunk/btanks/debian/changelog	2010-01-02 14:17:08 UTC (rev 10650)
@@ -1,3 +1,13 @@
+btanks (0.9.8083-1) unstable; urgency=low
+
+  * New upstream release.
+    + Update debian/copyright.
+  * Switch to source format v3 and drop b-dep on quilt.
+  * debian/rules: Use override_* rules.
+  * Bump Standards Version to 3.8.3 (no changes).
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Sat, 02 Jan 2010 23:16:53 +0900
+
 btanks (0.8.7686-2) unstable; urgency=low
 
   * Do not use the CURRENCY_SYMBOL identifier in mrt/tclUniData.c.

Modified: packages/trunk/btanks/debian/control
===================================================================
--- packages/trunk/btanks/debian/control	2010-01-01 21:11:55 UTC (rev 10649)
+++ packages/trunk/btanks/debian/control	2010-01-02 14:17:08 UTC (rev 10650)
@@ -4,11 +4,11 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bddebian at comcast.net>,
  Ansgar Burchardt <ansgar at 43-1.org>
-Build-Depends: debhelper (>= 7), quilt, scons, sharutils,
+Build-Depends: debhelper (>= 7.0.50~), scons, sharutils,
  libsdl1.2-dev, libsdl-image1.2-dev, liblua5.1-dev,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsmpeg-dev, libvorbis-dev, libsigc++-2.0-dev, libexpat1-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://btanks.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/btanks/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/btanks/?op=log

Modified: packages/trunk/btanks/debian/copyright
===================================================================
--- packages/trunk/btanks/debian/copyright	2010-01-01 21:11:55 UTC (rev 10649)
+++ packages/trunk/btanks/debian/copyright	2010-01-02 14:17:08 UTC (rev 10650)
@@ -5,7 +5,7 @@
 Files: *
 Copyright:
  © 2005-2008, Vladimir Menshakov
- © 2006-2008, Battle Tanks Team
+ © 2006-2009, Battle Tanks Team
 License: GPL-2+ | other
  Battle Tanks is distributed in accordance with the terms and conditions of
  the GNU GPL with the following interpretation and a specific Exception:
@@ -73,32 +73,6 @@
  It is provided free with no restrictions on use, provided the authors are
  cited when the data is used in any research or commercial application.
 
-Files: clunk/kiss/*
-Copyright: © 2003-2004, Mark Borgerding
-License: other
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
-     * Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-     * Neither the author nor the names of any contributors may be used to
-       endorse or promote products derived from this software without specific
-       prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 Files: mrt/tclUniData.c
 Copyright: © 1998, Scriptics Corporation
 License: other
@@ -177,7 +151,7 @@
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL'.
 
-Files: sdlx/wrappers/d3dsdl.cpp
+Files: sdlx/wrappers/d3dsdl.cpp, sdlx/wrappers/d3dsdl8.cpp
 Copyright: © 2008, Vladimir Menshakov
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or

Modified: packages/trunk/btanks/debian/patches/remove_default_optimizations.patch
===================================================================
--- packages/trunk/btanks/debian/patches/remove_default_optimizations.patch	2010-01-01 21:11:55 UTC (rev 10649)
+++ packages/trunk/btanks/debian/patches/remove_default_optimizations.patch	2010-01-02 14:17:08 UTC (rev 10650)
@@ -1,6 +1,6 @@
---- btanks.orig/SConstruct
-+++ btanks/SConstruct
-@@ -97,9 +97,6 @@
+--- btanks-0.9.8083.orig/SConstruct
++++ btanks-0.9.8083/SConstruct
+@@ -98,9 +98,6 @@
  	if debug:
  		env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
  		env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
@@ -8,5 +8,5 @@
 -		env.Append(CCFLAGS=['-O3'])
 -		env.Append(CPPFLAGS=['-O3'])
  		
- 	env.Append(CPPFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
- 	env.Append(CCFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
+ 	env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
+ 	env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])

Modified: packages/trunk/btanks/debian/patches/rename-currency-symbol.patch
===================================================================
--- packages/trunk/btanks/debian/patches/rename-currency-symbol.patch	2010-01-01 21:11:55 UTC (rev 10649)
+++ packages/trunk/btanks/debian/patches/rename-currency-symbol.patch	2010-01-02 14:17:08 UTC (rev 10650)
@@ -13,9 +13,9 @@
 /usr/include/langinfo.h:360: error: '__CURRENCY_SYMBOL' has a previous declaration as '<anonymous enum> __CURRENCY_SYMBOL'
 scons: *** [build/release/mrt/utf8_utils.os] Error 1
 
---- btanks-0.8.7686.orig/mrt/tclUniData.c
-+++ btanks-0.8.7686/mrt/tclUniData.c
-@@ -880,7 +880,7 @@
+--- btanks-0.9.8083.orig/mrt/tclUniData.c
++++ btanks-0.9.8083/mrt/tclUniData.c
+@@ -881,7 +881,7 @@
      FINAL_QUOTE_PUNCTUATION,
      OTHER_PUNCTUATION,
      MATH_SYMBOL,

Modified: packages/trunk/btanks/debian/rules
===================================================================
--- packages/trunk/btanks/debian/rules	2010-01-01 21:11:55 UTC (rev 10649)
+++ packages/trunk/btanks/debian/rules	2010-01-02 14:17:08 UTC (rev 10650)
@@ -1,39 +1,23 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
+CFLAGS ?= -Wall -g
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@
 
-CFLAGS = -Wall -g
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh_testdir
+override_dh_auto_configure:
 	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
+
+override_dh_auto_build:
+	dh_auto_build
 	uudecode -o debian/html.tar debian/html.tar.uu
-	touch $@
 
-clean: unpatch
-	dh_testdir
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -rf .sconf_temp build
-	dh clean 
 
-install: build
-	dh install --until dh_install
+override_dh_install:
+	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 
-
-# Build architecture-independent files here.
-binary-indep: install
-	dh binary-indep
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh binary-arch
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

Added: packages/trunk/btanks/debian/source/format
===================================================================
--- packages/trunk/btanks/debian/source/format	                        (rev 0)
+++ packages/trunk/btanks/debian/source/format	2010-01-02 14:17:08 UTC (rev 10650)
@@ -0,0 +1 @@
+3.0 (quilt)


