[atanks] 04/13: Import Debian patch 6.0~dfsg-1
Markus Koschany
apo at moszumanska.debian.org
Sat Nov 26 23:05:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository atanks.
commit 5adf4bde0e2460b526f8817e61044e0ac0986565
Merge: 2dfe4ce 919a956
Author: Mark Purcell <msp at debian.org>
Date: Sat Jun 14 11:04:28 2014 +1000
Import Debian patch 6.0~dfsg-1
COPYING | 11 ++++---
Changelog | 52 +++++++++++++++++++++++++++++++
Makefile | 8 ++++-
README | 8 +++--
README_ru.txt | 6 ++--
TODO | 36 ++++++++++++++--------
atanks.desktop | 2 +-
debian/atanks.install | 3 +-
debian/changelog | 49 +++++++++++++++++++++++++++++
debian/compat | 2 +-
debian/control | 24 ++++++++++++---
debian/copyright | 3 +-
debian/rules | 29 +++++++++++++++--
debian/watch | 3 +-
src/Makefile | 3 +-
src/Makefile.bsd | 6 ++--
src/atanks.cpp | 61 ++++++++----------------------------
src/beam.cpp | 2 +-
src/button.cpp | 4 +--
src/client.cpp | 11 +++----
src/environment.cpp | 46 ++++++++++++++++++++++-----
src/environment.h | 10 ++++++
src/files.cpp | 9 ++++--
src/floattext.cpp | 35 +++++++++------------
src/gameloop.cpp | 11 +++----
src/globaldata.cpp | 5 +++
src/globaldata.h | 5 ++-
src/main.h | 3 +-
src/menucontent.h | 84 +++++++++++++++++++++++++-------------------------
src/missile.cpp | 5 +--
src/network.cpp | 1 +
src/player.cpp | 15 +++++----
src/player.h | 2 +-
src/sky.cpp | 4 +++
src/tank.cpp | 34 +++++++++++---------
src/tank.h | 4 +--
src/teleport.cpp | 2 +-
src/update.cpp | 2 +-
tank/16.bmp | Bin 0 -> 890 bytes
tankgun/9.bmp | Bin 0 -> 3126 bytes
40 files changed, 391 insertions(+), 209 deletions(-)
diff --cc debian/atanks.install
index 7387fe4,0000000..3612b40
mode 100644,000000..100644
--- a/debian/atanks.install
+++ b/debian/atanks.install
@@@ -1,2 -1,0 +1,3 @@@
- usr/bin/atanks /usr/games/
+debian/atanks-icon.xpm /usr/share/pixmaps/
++usr/bin/atanks /usr/games/
++usr/share/applications/atanks.desktop
diff --cc debian/changelog
index ae223d6,0000000..d4dbf3e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,270 -1,0 +1,319 @@@
++atanks (6.0~dfsg-1) unstable; urgency=low
++
++ * New upstream release
++ - few bug fixes which should improve stability and reduce memory leakage
++ - press "v" to decrease audio volume and "V" (shift+v) to increase volume
++
++ -- Mark Purcell <msp at debian.org> Sat, 14 Jun 2014 11:04:28 +1000
++
++atanks (5.9~dfsg-1) unstable; urgency=low
++
++ * New upstream release
++ - Fixes "[Mayhem] Bug report on atanks: atanks crashes with exit status
++ 139" (Closes: #715654)
++
++ -- Mark Purcell <msp at debian.org> Sun, 13 Apr 2014 15:04:13 +1000
++
++atanks (5.8~dfsg-1) unstable; urgency=low
++
++ * New upstream release
++
++ -- Mark Purcell <msp at debian.org> Sat, 01 Feb 2014 16:25:15 +1100
++
++atanks (5.7~dfsg-2) unstable; urgency=low
++
++ * Upload to unstable
++ * Update debian/copyright - fix unversioned-copyright-format-uri
++ * Update Vcs: - fix vcs-field-not-canonical
++ * Update Standards-Version: 3.9.3 - no further changes
++
++ -- Mark Purcell <msp at debian.org> Mon, 13 May 2013 19:53:04 +1000
++
++atanks (5.7~dfsg-1) experimental; urgency=low
++
++ * New upstream release
++ - Fixes "Game crashes when changing options" (Closes: #691107)
++ * Ack NMU - Thanks Michael
++ * Add get-orig-source target (~dfsg)
++ * Include atanks.desktop in atanks - fixes desktop-command-not-in-package
++
++ -- Mark Purcell <msp at debian.org> Mon, 29 Oct 2012 22:15:39 +1100
++
+atanks (5.5+dfsg-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove binary files from source tarball (closes: #691223).
+
+ -- Michael Gilbert <mgilbert at debian.org> Thu, 25 Oct 2012 13:38:02 -0400
+
++atanks (5.6-1) experimental; urgency=low
++
++ * New upstream release
++ * NEW atanks-dbg package
++ * debian/compat -> 9
++
++ -- Mark Purcell <msp at debian.org> Mon, 22 Oct 2012 19:22:22 +1100
++
+atanks (5.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Wed, 20 Jun 2012 22:37:50 +1000
+
+atanks (5.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Switch to Maintainer: Debian Games Team
+ <pkg-games-devel at lists.alioth.debian.org>
+
+ -- Mark Purcell <msp at debian.org> Sat, 14 Apr 2012 14:36:09 +1000
+
+atanks (5.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Drop 20_link_with_pthread.patch - encorporated upstream
+
+ -- Mark Purcell <msp at debian.org> Thu, 23 Feb 2012 20:47:06 +1100
+
+atanks (5.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Refresh debian/copyright copyright-refers-to-symlink-license
+ * Switch to dh
+
+ -- Mark Purcell <msp at debian.org> Fri, 07 Oct 2011 19:13:16 +1100
+
+atanks (5.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 18 Sep 2011 20:06:49 +1000
+
+atanks (5.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Ilya patch fixed "ftbfs with gold or --no-add-needed" (Closes: #615693)
+
+ -- Mark Purcell <msp at debian.org> Tue, 14 Jun 2011 18:51:53 +1000
+
+atanks (4.9-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Mon, 23 May 2011 20:54:30 +1000
+
+atanks (4.6-1ubuntu2) natty; urgency=low
+
+ * New patch 20_link_with_pthread.patch: add -lpthread to link flags to
+ fix FTBFS.
+
+ -- Ilya Barygin <barygin at gmail.com> Sat, 01 Jan 2011 22:14:12 +0300
+
+atanks (4.7-1) experimental; urgency=low
+
+ * New upstream release
+ * source/format -> 3.0 (quilt)
+ - Drop simple-patchsys.mk
+ * Drop extra-license-file usr/share/games/atanks/COPYING
+
+ -- Mark Purcell <msp at debian.org> Mon, 27 Sep 2010 08:12:38 +1000
+
+atanks (4.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 06 Jun 2010 16:36:00 +1000
+
+atanks (4.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 15 Apr 2010 08:08:49 +1000
+
+atanks (4.4-2) unstable; urgency=low
+
+ * Duplicate install for atanks & atanks-data - fixes FTBFS (Closes: #576686)
+
+ -- Mark Purcell <msp at debian.org> Thu, 08 Apr 2010 16:32:09 +1000
+
+atanks (4.4-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixes "Cannot create user and play" (Closes: #551420)
+
+ -- Mark Purcell <msp at debian.org> Mon, 05 Apr 2010 19:45:35 +1000
+
+atanks (3.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Upstream depreciated Makefile.debian
+ * debian/compat -> 7
+ * Fix binary-control-field-duplicates-source
+ * Update out-of-date-standards-version
+
+ -- Mark Purcell <msp at debian.org> Fri, 05 Jun 2009 16:59:42 +1000
+
+atanks (3.2-2) unstable; urgency=low
+
+ * Upload to unstable
+ * Add ${misc:Depends}
+
+ -- Mark Purcell <msp at debian.org> Wed, 25 Feb 2009 05:51:44 +1100
+
+atanks (3.2-1) experimental; urgency=low
+
+ * New upstream release
+ * Add Homepage: Vcs: headers - update to standards 3.8.0
+
+ -- Mark Purcell <msp at debian.org> Sat, 08 Nov 2008 10:06:36 +1100
+
+atanks (3.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixed upstream:
+ - Does not have a GNOME (Freedesktop) Menu entry; this fixes that
+ (Closes: #478857)
+ - freezes when no players are chosen for game and player clicks 'ok'
+ (Closes: #484900)
+ * Include upstream selectPlayers-fix.patch
+
+ -- Mark Purcell <msp at debian.org> Mon, 30 Jun 2008 21:43:09 +1000
+
+atanks (2.9-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Thu, 03 Apr 2008 22:01:13 +1100
+
+atanks (2.8-1) unstable; urgency=low
+
+ * New upstream release
+ - New upstream version 2.7 (Closes: #458947)
+ - Opponent tanks sometimes get virtually unlimited credits.
+ (Closes: #452058)
+ - Menu slow down (Closes: #452878)
+ * Add .desktop file
+ - atanks has no .desktop file (Closes: #452573)
+ * Switch to CDBS
+
+ -- Mark Purcell <msp at debian.org> Fri, 22 Feb 2008 09:37:34 +0100
+
+atanks (2.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 18 Nov 2007 15:42:25 +0000
+
+atanks (2.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Move to section Games/Action
+ - lintian menu-item-creates-new-section
+ * debian/rules: [ ! -f Makefile ] || $(MAKE) dist
+ - lintian debian-rules-ignores-make-clean-error
+
+ -- Mark Purcell <msp at debian.org> Sat, 18 Aug 2007 11:53:55 +0100
+
+atanks (2.4-2) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Mark Purcell <msp at debian.org> Wed, 18 Jul 2007 18:17:40 +0100
+
+atanks (2.4-1) unstable; urgency=low
+
+ * New upstream release
+ - Large CPU demand while idle (Closes: #422425)
+
+ -- Mark Purcell <msp at debian.org> Wed, 18 Jul 2007 17:28:47 +0100
+
+atanks (2.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Tue, 17 Apr 2007 18:06:05 +1000
+
+atanks (2.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Fri, 16 Mar 2007 06:26:41 +0000
+
+atanks (2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixes the following:
+ - Unneeded limitation in player name size (Closes: #294625)
+ - projectiles sometimes get stuck off the top of the screen (Closes:
+ #394368)
+ - Text color should be adapted to background (Closes: #331551)
+ - Does not respond to window manager close action (Closes: #407765)
+ - projectiles sometimes get stuck off the top of the screen (Closes:
+ #394382)
+
+ -- Mark Purcell <msp at debian.org> Sat, 3 Mar 2007 12:51:00 +0000
+
+atanks (2.0-1) unstable; urgency=low
+
+ * New upstream release
+ - Game crashes all the time (Closes: #324878)
+ - atanks bug fix: Ambiguous calls of abs(double) #318527 (Closes:
+ #376642)
+ * Update debian/watch
+
+ -- Mark Purcell <msp at debian.org> Sun, 21 Jan 2007 19:25:12 +0000
+
+atanks (1.1.0-6) unstable; urgency=low
+
+ * New Maintainer. (Closes: Bug#362084)
+ - Thanks to Graham Wilson for maintenance todate
+ * Lintian cleanup: not-binnmuable-any-depends-all
+ * Prep for upload to svn.debian.org/pkg-allegro
+ - Convert/ Build-Depends: dpatch
+ - Update debian/watch
+
+ -- Mark Purcell <msp at debian.org> Tue, 12 Sep 2006 08:40:55 +0100
+
+atanks (1.1.0-5) unstable; urgency=low
+
+ * QA upload.
+ * Package is orphaned (#362084); set maintainer to Debian QA Group.
+ * Link against liballegro4.2. Closes: #350857.
+ * debian/copyright: Update FSF address.
+ * debian/watch: Add.
+ * Conforms to Standards version 3.7.2.
+
+ -- Matej Vela <vela at debian.org> Thu, 3 Aug 2006 06:35:39 +0200
+
+atanks (1.1.0-4) unstable; urgency=low
+
+ * Include copyright information in copyright file. (closes: #290061)
+ * Remove the watch file, since it currently is broken. It'd be
+ appreciated if someone can send me a working one.
+ * Use int where the code was using char as a boolean value.
+ - cuts down on the number of compiler warnings
+ - no need to compile with -fsigned-char
+ * Use fabs where abs was ambiguous. (closes: #318527)
+ * Update standards version. No changes.
+
+ -- Graham Wilson <graham at debian.org> Sat, 16 Jul 2005 22:39:13 +0000
+
+atanks (1.1.0-3) unstable; urgency=low
+
+ * Apply patch from Jan Hudec to use 1.0 as the default damage multiplier when
+ no other information is available (e.g. a meteor). (closes: #250641)
+
+ -- Graham Wilson <graham at debian.org> Sun, 11 Jul 2004 16:18:31 +0000
+
+atanks (1.1.0-2) unstable; urgency=low
+
+ * Include Help.txt in the doc dir. (closes: #247646)
+ * Correct the watch file.
+
+ -- Graham Wilson <graham at debian.org> Fri, 07 May 2004 04:18:25 +0000
+
+atanks (1.1.0-1) unstable; urgency=low
+
+ * Initial release. (closes: #227648)
+
+ -- Graham Wilson <graham at debian.org> Tue, 09 Mar 2004 05:34:39 +0000
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index f97b092,0000000..3331976
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,35 -1,0 +1,51 @@@
+Source: atanks
+Section: games
+Priority: optional
+Uploaders: Mark Purcell <msp at debian.org>
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
- Build-Depends: debhelper (>= 7.0.50~), liballegro-dev | liballegro4.2-dev
++Build-Depends: debhelper (>= 9), liballegro-dev | liballegro4.2-dev
+Homepage: http://atanks.sourceforge.net/
- Vcs-Svn: svn://svn.debian.org/pkg-allegro/atanks/trunk/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-allegro/atanks/?op=log
- Standards-Version: 3.9.1
++Vcs-Svn: svn://anonscm.debian.org/pkg-allegro/atanks/trunk/
++Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-allegro/atanks/trunk/
++Standards-Version: 3.9.4
+
+
+Package: atanks
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, atanks-data (= ${source:Version})
++Replaces: atanks-data(<< 5.7~dfsg-1)
++Breaks: atanks-data (<< 5.7~dfsg-1)
+Description: tank-battling game
+ Atomic tanks is a multi-player game in which you attempt to destroy
+ other tanks while trying to protect your own. You earn money for
+ destroying other tanks; with this money you can buy upgrades and better
+ weapons for your tank.
+ .
+ This game is similar Scorched Earth or the Worms series of games.
+
+Package: atanks-data
+Depends: ${misc:Depends}
+Architecture: all
+Description: data files for Atomic tanks
+ Atomic tanks is a multi-player game in which you attempt to destroy
+ other tanks while trying to protect your own. You earn money for
+ destroying other tanks; with this money you can buy upgrades and better
+ weapons for your tank.
+ .
+ This game is similar Scorched Earth or the Worms series of games.
+ .
+ This package holds the data files needed for Atomic tanks.
++
++Package: atanks-dbg
++Depends: ${shlibs:Depends}, ${misc:Depends}, atanks (= ${binary:Version})
++Architecture: any
++Section: debug
++Priority: extra
++Description: tank-battling game - debug symbols
++ Atomic tanks is a multi-player game in which you attempt to destroy
++ other tanks while trying to protect your own. You earn money for
++ destroying other tanks; with this money you can buy upgrades and better
++ weapons for your tank.
++ .
++ This package contains the debug symbols which is useful if you wish to
++ analyse segmentation faults.
diff --cc debian/copyright
index 3b8978b,0000000..3ae1471
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,28 -1,0 +1,29 @@@
- Format: http://dep.debian.net/deps/dep5
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: atanks
+Source: http://sourceforge.net/projects/atanks/
++ *.dll have been removed as they do not meet the DFSG
+
+Files: *
+Copyright: 2002,2003 Thomas Hudson,Juraj Michalek
+License: GPL-2.0+
+
+Files: debian/*
+Copyright: Mark Purcell <msp at debian.org>
+License: GPL-2.0+
+
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --cc debian/rules
index 77b90b9,0000000..71d60e1
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,0 +1,32 @@@
+#!/usr/bin/make -f
+
++DEBVERSION := $(shell head -n 1 debian/changelog \
++ | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
++UPVERSION := $(shell echo $(DEBVERSION) | sed 's/~dfsg-.//')
++
++PKG=atanks
++FILENAME := $(PKG)_$(UPVERSION)~dfsg.orig.tar.gz
++UPFILENAME := $(PKG)_$(UPVERSION).orig.tar.gz
++URL := http://downloads.sourceforge.net/project/$(PKG)/$(PKG)/$(PKG)-$(UPVERSION)/$(PKG)-$(UPVERSION).tar.gz
++
+%:
- dh $@ --parallel
++ dh $@ --parallel --dbg-package=atanks-dbg
+
+override_dh_install:
- dh_install -XCOPYING
++ dh_install -XCOPYING --fail-missing
++ rm -fR $(CURDIR)/debian/atanks-data/usr/share/applications/
++
++get-orig-source:
++ @@dh_testdir
++ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
++ @@#this is for stable versions
++ @@echo Downloading $(UPFILENAME) from $(URL) ...
++ @@wget -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
++ @@echo 'Repacking as DFSG-free (removing windows DLLs)...'
++ @@mkdir -p ../tarballs/$(PKG)-$(UPVERSION).tmp/
++ @@cd ../tarballs/$(PKG)-$(UPVERSION).tmp ; tar xfz ../$(UPFILENAME)
++ @@find ../tarballs/$(PKG)-$(UPVERSION).tmp/ -iname '*.dll' -delete
++ @@echo Writing archive ../tarballs/$(FILENAME) ...
++ @@cd ../tarballs/$(PKG)-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
++ @@echo Cleaning up...
++ @@$(RM) -rf ../tarballs/$(PKG)-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
diff --cc debian/watch
index 1005e14,0000000..0d3b6a6
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,3 @@@
+version=3
- http://sf.net/atanks/atanks-(.*)\.tar\.(?:gz|bz2) debian svn-upgrade
++opts=dversionmangle=s/.dfsg// \
++ http://sf.net/atanks/atanks-(.*)\.tar\.(?:gz|bz2) debian svn-upgrade
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/atanks.git
More information about the Pkg-games-commits
mailing list