r15131 - in packages/trunk/tecnoballz/debian: . patches

Markus Koschany apo-guest at moszumanska.debian.org
Thu Jun 26 13:21:38 UTC 2014 

Author: apo-guest
Date: 2014-06-26 13:21:38 +0000 (Thu, 26 Jun 2014)
New Revision: 15131

Added:
   packages/trunk/tecnoballz/debian/patches/Makefile-supervisor.patch
   packages/trunk/tecnoballz/debian/patches/manpage-window-mode.patch
   packages/trunk/tecnoballz/debian/tecnoballz.postrm
Modified:
   packages/trunk/tecnoballz/debian/README.Debian
   packages/trunk/tecnoballz/debian/changelog
   packages/trunk/tecnoballz/debian/compat
   packages/trunk/tecnoballz/debian/control
   packages/trunk/tecnoballz/debian/copyright
   packages/trunk/tecnoballz/debian/patches/series
   packages/trunk/tecnoballz/debian/rules
   packages/trunk/tecnoballz/debian/tecnoballz-data.install
   packages/trunk/tecnoballz/debian/tecnoballz.desktop
   packages/trunk/tecnoballz/debian/tecnoballz.install
Log:
Release 0.92-6. Fix RC bug #750249

#745324
#722173
#656358


Modified: packages/trunk/tecnoballz/debian/README.Debian
===================================================================
--- packages/trunk/tecnoballz/debian/README.Debian	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/README.Debian	2014-06-26 13:21:38 UTC (rev 15131)
@@ -1,7 +1,7 @@
 technoballz-0.91 for Debian
 ----------------------------
 
-Note that everytime you install the tecnoballz package, 
+Note that everytime you install the tecnoballz package,
 scores will be overwritten (/var/games/tecnoballz/tecnoballz.hi).
 
  -- Alexis Sukrieh <sukria at sukria.net>, Thu, 11 Mar 2005 10:57:20 +0200

Modified: packages/trunk/tecnoballz/debian/changelog
===================================================================
--- packages/trunk/tecnoballz/debian/changelog	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/changelog	2014-06-26 13:21:38 UTC (rev 15131)
@@ -1,9 +1,36 @@
-tecnoballz (0.92-6) UNRELEASED; urgency=low
+tecnoballz (0.92-6) unstable; urgency=medium
 
-  * Correct Vcs-* URLs to point to anonscm.debian.org
+  * Team upload.
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:22:12 +0200
+  [ Markus Koschany ]
+  * Use compat level 9 and require debhelper >= 9.
+  * wrap-and-sort -sa.
+  * Declare compliance with Debian policy 3.9.5.
+  * debian/control:
+    - Drop dpkg-dev build-dependency. It is not needed.
+    - Drop b-d hardening-includes. Compat level 9 provides all hardening flags.
+    - Switch to unversioned libmikmod-dev from libmikmod2-dev. (Closes: #745324)
+  * debian/rules:
+    - Remove dh_builddeb override. xz compression is the default now.
+    - Build with autoreconf. Remove build-dependencies for autotools-dev,
+      automake and autoconf and replace them with dh-autoreconf.
+    - Use default hardening build flags instead of custom overrides for
+      CPPFLAGS, CXXFLAGS and LDFLAGS.
+    - Remove werror option. Use default values. The package does not FTBFS
+      because of that anymore.
+  * Add Makefile-supervisor.patch (Closes: #750249).
+        - Fix FTBFS due to erroneous Makefile.
+  * Add manpage-window-mode.patch (Closes: #722173).
+    - Mention window mode in man pages.
+  * Add tecnoballz.postrm (Closes: #656358).
+    - Remove tecnoballz.hi when purging the package.
+  * Add keywords and a comment in German to desktop file.
 
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org.
+
+ -- Markus Koschany <apo at gambaru.de>  Thu, 26 Jun 2014 14:18:57 +0200
+
 tecnoballz (0.92-5) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/tecnoballz/debian/compat
===================================================================
--- packages/trunk/tecnoballz/debian/compat	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/compat	2014-06-26 13:21:38 UTC (rev 15131)
@@ -1 +1 @@
-8
+9

Modified: packages/trunk/tecnoballz/debian/control
===================================================================
--- packages/trunk/tecnoballz/debian/control	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/control	2014-06-26 13:21:38 UTC (rev 15131)
@@ -2,34 +2,45 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 8), autoconf, automake, dpkg-dev (>= 1.15.7~),
-               hardening-includes,
-               libsdl-mixer1.2-dev, 
-               libmikmod2-dev, libxext-dev, libvorbis-dev, 
-               libogg-dev, libsmpeg-dev, libxxf86dga-dev, 
-               libxxf86vm-dev, autotools-dev,
-               libsdl-image1.2-dev, libtinyxml-dev
-Standards-Version: 3.9.2
+Uploaders:
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends:
+ dh-autoreconf,
+ debhelper (>= 9),
+ libmikmod-dev,
+ libogg-dev,
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsmpeg-dev,
+ libtinyxml-dev,
+ libvorbis-dev,
+ libxext-dev,
+ libxxf86dga-dev,
+ libxxf86vm-dev
+Standards-Version: 3.9.5
 Homepage: http://linux.tlk.fr/games/TecnoballZ/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/tecnoballz/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/tecnoballz/
 
 Package: tecnoballz
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tecnoballz-data
+Depends:
+ tecnoballz-data,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: breaking block game ported from the Amiga platform
  This is a Breakout or Arkanoid like game with a lot of bonus
  stages. You can buy weapons and bonus between stages.
- Sometimes you have to defeat a guardian. 
+ Sometimes you have to defeat a guardian.
  This game is written in C++ and uses the SDL library.
 
 Package: tecnoballz-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: graphic, sound and music files for the game tecnoballz
  This is a Breakout or Arkanoid like game with a lot of bonus
  stages. You can buy weapons and bonus between stages.
- Sometimes you have to defeat a guardian. 
+ Sometimes you have to defeat a guardian.
  .
  This package provides all graphics, sound, music, and text data files.

Modified: packages/trunk/tecnoballz/debian/copyright
===================================================================
--- packages/trunk/tecnoballz/debian/copyright	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/copyright	2014-06-26 13:21:38 UTC (rev 15131)
@@ -6,12 +6,12 @@
 Copyright:
   TecnoballZ is Copyright (C) 1991-2005 TLK Games
 
-Upstream Authors: 
+Upstream Authors:
   - TLK Games <http://linux.tlk.fr>
   - Bruno Ethvignot <bruno at tlk.fr>
 
 License:
-  TecnoballZ is published under the terms of the GPL Licence. 
-  
+  TecnoballZ is published under the terms of the GPL Licence.
+
   On Debian systems, the complete text of the GNU General Public
   License can be found in /usr/share/common-licenses/GPL-3

Added: packages/trunk/tecnoballz/debian/patches/Makefile-supervisor.patch
===================================================================
--- packages/trunk/tecnoballz/debian/patches/Makefile-supervisor.patch	                        (rev 0)
+++ packages/trunk/tecnoballz/debian/patches/Makefile-supervisor.patch	2014-06-26 13:21:38 UTC (rev 15131)
@@ -0,0 +1,35 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Thu, 26 Jun 2014 12:31:05 +0200
+Subject: Makefile supervisor
+
+---
+ src/Makefile.am | 2 +-
+ src/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bc54146..062ec34 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -71,7 +71,7 @@ SOURCES_MAIN = \
+   sprite_projectile.cc \
+   sprite_ship.cc \
+   sprite_wall.cc \
+-  supervisor.c \
++  supervisor.cc \
+   supervisor_bricks_level.cc \
+   supervisor_main_menu.cc \
+   supervisor_map_editor.cc \
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 53d8414..53b5e1e 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -324,7 +324,7 @@ SOURCES_MAIN = \
+   sprite_projectile.cc \
+   sprite_ship.cc \
+   sprite_wall.cc \
+-  supervisor.c \
++  supervisor.cc \
+   supervisor_bricks_level.cc \
+   supervisor_main_menu.cc \
+   supervisor_map_editor.cc \

Added: packages/trunk/tecnoballz/debian/patches/manpage-window-mode.patch
===================================================================
--- packages/trunk/tecnoballz/debian/patches/manpage-window-mode.patch	                        (rev 0)
+++ packages/trunk/tecnoballz/debian/patches/manpage-window-mode.patch	2014-06-26 13:21:38 UTC (rev 15131)
@@ -0,0 +1,37 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Thu, 26 Jun 2014 13:05:38 +0200
+Subject: manpage window mode
+
+---
+ man/tecnoballz.6    | 3 +++
+ man/tecnoballz.fr.6 | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/man/tecnoballz.6 b/man/tecnoballz.6
+index e8a0857..fe36bd4 100644
+--- a/man/tecnoballz.6
++++ b/man/tecnoballz.6
+@@ -43,6 +43,9 @@ Print a lot of debuging information to stdout.
+ .TP
+ .B \--nosound
+ Disable the sound.
++.TP
++.B \--window
++Start the game in windowed mode.
+ .SH COPYRIGHT
+ .if n TecnoballZ is Copyright (C) 1992-2004 by the Tlk Games Company.
+ .SH AUTHOR
+diff --git a/man/tecnoballz.fr.6 b/man/tecnoballz.fr.6
+index db1cf8b..0b66042 100644
+--- a/man/tecnoballz.fr.6
++++ b/man/tecnoballz.fr.6
+@@ -42,6 +42,9 @@ Affiche beaucoup de messages de debugging 
+ .TP
+ .B \--nosound
+ Désactive le son.
++.TP
++.B \--window
++Lance le jeu en mode fenêtre.
+ .SH COPYRIGHT
+ .if n TecnoballZ est sous Copyright (C) 1992-2004 de la société Tlk Games.
+ .SH AUTHOR

Modified: packages/trunk/tecnoballz/debian/patches/series
===================================================================
--- packages/trunk/tecnoballz/debian/patches/series	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/patches/series	2014-06-26 13:21:38 UTC (rev 15131)
@@ -5,3 +5,5 @@
 031_honor_cxxflags.diff
 032_warnings.patch
 system-tinyxml.diff
+Makefile-supervisor.patch
+manpage-window-mode.patch

Modified: packages/trunk/tecnoballz/debian/rules
===================================================================
--- packages/trunk/tecnoballz/debian/rules	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/rules	2014-06-26 13:21:38 UTC (rev 15131)
@@ -1,29 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
-CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+%:
+	dh $@ --with autoreconf
 
-# Warnings
-CXXFLAGS += -Wall -fno-strict-aliasing
-
-ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS+=	-Werror
-endif
-
-include /usr/share/hardening-includes/hardening.make
-ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
-CXXFLAGS+=	$(HARDENING_CFLAGS)
-LDFLAGS+=	$(HARDENING_LDFLAGS)
-endif
-
-export CPPFLAGS CXXFLAGS LDFLAGS
-
 override_dh_auto_configure:
-	autoreconf -fvi
 	dh_auto_configure -- --datadir=/usr/share/games
 
 override_dh_clean:
@@ -35,9 +16,3 @@
 	# The data package
 	mv $(CURDIR)/debian/tmp/var/games/tecnoballz/tecnoballz.hi \
 		$(CURDIR)/debian/tmp/var/games/tecnoballz/tecnoballz.hi.clean
-
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
-%:
-	dh $@

Modified: packages/trunk/tecnoballz/debian/tecnoballz-data.install
===================================================================
--- packages/trunk/tecnoballz/debian/tecnoballz-data.install	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/tecnoballz-data.install	2014-06-26 13:21:38 UTC (rev 15131)
@@ -1,2 +1 @@
 debian/tmp/usr/share/games/tecnoballz/* usr/share/games/tecnoballz/
-

Modified: packages/trunk/tecnoballz/debian/tecnoballz.desktop
===================================================================
--- packages/trunk/tecnoballz/debian/tecnoballz.desktop	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/tecnoballz.desktop	2014-06-26 13:21:38 UTC (rev 15131)
@@ -3,8 +3,9 @@
 Name=TecnoballZ
 GenericName=tecnoballz
 Comment=Play an Arkanoid-like game
+Comment[de]=Spiele ein Arkanoid-ähnliches Spiel
 Icon=tecnoballz
 Exec=tecnoballz
 Terminal=false
 Categories=Game;ArcadeGame;
-
+Keywords=arkanoid;arcade;futuristic;amiga;

Modified: packages/trunk/tecnoballz/debian/tecnoballz.install
===================================================================
--- packages/trunk/tecnoballz/debian/tecnoballz.install	2014-06-25 06:01:45 UTC (rev 15130)
+++ packages/trunk/tecnoballz/debian/tecnoballz.install	2014-06-26 13:21:38 UTC (rev 15131)
@@ -1,5 +1,4 @@
-debian/tmp/usr/games/* usr/games/
-debian/tmp/var/games/* var/games/
 debian/tecnoballz.desktop usr/share/applications/
 debian/tecnoballz.xpm usr/share/pixmaps/
-
+debian/tmp/usr/games/* usr/games/
+debian/tmp/var/games/* var/games/

Added: packages/trunk/tecnoballz/debian/tecnoballz.postrm
===================================================================
--- packages/trunk/tecnoballz/debian/tecnoballz.postrm	                        (rev 0)
+++ packages/trunk/tecnoballz/debian/tecnoballz.postrm	2014-06-26 13:21:38 UTC (rev 15131)
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+    purge)
+	# Remove high score file.
+	rm -f /var/games/tecnoballz/tecnoballz.hi
+    ;;
+esac
+
+#DEBHELPER#

More information about the Pkg-games-commits mailing list