r14298 - in packages/trunk/alienblaster/debian: . patches

Markus Koschany apo-guest at alioth.debian.org
Sat Jun 22 09:09:37 UTC 2013 

Author: apo-guest
Date: 2013-06-22 09:09:37 +0000 (Sat, 22 Jun 2013)
New Revision: 14298

Added:
   packages/trunk/alienblaster/debian/alienblaster.lintian-overrides
   packages/trunk/alienblaster/debian/patches/add-hardening-support.patch
Modified:
   packages/trunk/alienblaster/debian/alienblaster.6
   packages/trunk/alienblaster/debian/changelog
   packages/trunk/alienblaster/debian/control
   packages/trunk/alienblaster/debian/patches/series
   packages/trunk/alienblaster/debian/rules
   packages/trunk/alienblaster/debian/watch
Log:
Add hardening support, fix control.

- Add accidentally removed alienblaster package again.
- Build with hardening=+all
- Override lintian warning for missing man page for alienblaster.bin


Modified: packages/trunk/alienblaster/debian/alienblaster.6
===================================================================
--- packages/trunk/alienblaster/debian/alienblaster.6	2013-06-22 06:31:17 UTC (rev 14297)
+++ packages/trunk/alienblaster/debian/alienblaster.6	2013-06-22 09:09:37 UTC (rev 14298)
@@ -36,6 +36,6 @@
 Debian Games Team
 .SH AlienBlaster Homepage
 http://www.schwardtnet.de/alienblaster/
-.SH LICENCE  
+.SH LICENSE
 GNU GENERAL PUBLIC LICENSE
 Version 2, June 1991

Added: packages/trunk/alienblaster/debian/alienblaster.lintian-overrides
===================================================================
--- packages/trunk/alienblaster/debian/alienblaster.lintian-overrides	                        (rev 0)
+++ packages/trunk/alienblaster/debian/alienblaster.lintian-overrides	2013-06-22 09:09:37 UTC (rev 14298)
@@ -0,0 +1,3 @@
+# The package already ships a man page for the alienblaster wrapper script.
+# In fact this man page applies to alienblaster.bin.
+alienblaster: binary-without-manpage usr/games/alienblaster.bin

Modified: packages/trunk/alienblaster/debian/changelog
===================================================================
--- packages/trunk/alienblaster/debian/changelog	2013-06-22 06:31:17 UTC (rev 14297)
+++ packages/trunk/alienblaster/debian/changelog	2013-06-22 09:09:37 UTC (rev 14298)
@@ -13,22 +13,23 @@
     - Add Suggests: alienblaster to alienblaster-data.
     - Add build-dep on imagemagick.
     - Use canonical VCS-URI.
-  * debian/rules: Build with --parallel.
+  * debian/rules:
+    - Build with --parallel.
+    - Build with hardening=+all.
   * Add alienblaster.png and alienblaster.xpm icons for application menus by
     converting existing .bmp images with imagemagick at build time.
-  * debian/patches: Drop patches 01-03 fix-datapaths patches. Do not change the
-    path to the game data directory anymore. Instead use a shell wrapper script
-    to fix the issue. All configuration files are now available in
-    ~/.alienblaster/cfg, hence users can edit and update the keyboard
-    configuration again. Thanks Hans de Goede for the hint. (Closes: #476635)
+  * debian/patches:
+    - Drop patches 01-03 fix-datapaths patches. Do not change the path to the
+      game data directory anymore. Instead use a shell wrapper script to fix
+      the issue. All configuration files are now available in
+      ~./alienblaster/cfg, hence users can edit and update the keyboard
+      configuration again. Thanks Hans de Goede for the hint. (Closes: #476635)
+    - Enable hardening with add-hardening-support.patch.
   * Drop all .dirs files. They are no longer necessary.
   * Update debian/copyright to copyright format 1.0.
   * alienblaster.desktop: Add keywords.
   * alienblaster.menu: Rename menu to alienblaster.menu, add a longtitle and
     icon field.
-  * Remove docs file. Do not install the README file because it does not
-    contain any useful information.
-  * Use xz compression.
 
  -- Barry deFreese <bdefreese at debian.org>  Sun, 02 Jun 2013 13:49:47 -0400
 

Modified: packages/trunk/alienblaster/debian/control
===================================================================
--- packages/trunk/alienblaster/debian/control	2013-06-22 06:31:17 UTC (rev 14297)
+++ packages/trunk/alienblaster/debian/control	2013-06-22 09:09:37 UTC (rev 14298)
@@ -15,11 +15,27 @@
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/alienblaster/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/alienblaster/
 
+Package: alienblaster
+Architecture: any
+Depends:
+ alienblaster-data,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Classic 2D shoot 'em up
+ Your mission is simple: Stop the invasion of the aliens and blast them!
+ .
+ Alien Blaster is a classic 2D shoot 'em up featuring lots of different
+ weapons, special items, aliens to blast and a big bad boss.
+ .
+ It supports both a single player mode and a cooperative two player mode
+ for two persons playing on one computer.
+
 Package: alienblaster-data
 Architecture: all
 Depends:
  ${misc:Depends}
-Suggests: alienblaster
+Suggests:
+ alienblaster
 Description: Game data for Alien Blaster
  Your mission is simple: Stop the invasion of the aliens and blast them!
  .

Added: packages/trunk/alienblaster/debian/patches/add-hardening-support.patch
===================================================================
--- packages/trunk/alienblaster/debian/patches/add-hardening-support.patch	                        (rev 0)
+++ packages/trunk/alienblaster/debian/patches/add-hardening-support.patch	2013-06-22 09:09:37 UTC (rev 14298)
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 22 Jun 2013 10:30:29 +0200
+Subject: add hardening support
+
+---
+ src/Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/Makefile b/src/Makefile
+index 02c4c67..adc3ecd 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -18,7 +18,10 @@ SDL_FLAGS=$(shell sdl-config --cflags)
+ 
+ # game flags
+ GAME_FLAGS=-D_GNU_SOURCE -Wall -Winline -finline-functions $(SDL_FLAGS) $(OPTIMIZATION)
++GAME_FLAGS+=`dpkg-buildflags --get CFLAGS`
++GAME_FLAGS+=`dpkg-buildflags --get CXXFLAGS`
+ GAME_LIBS=-lSDL_mixer $(SDL_LIBS) $(OPTIMIZATION)
++GAME_LIBS+=`dpkg-buildflags --get LDFLAGS`
+ 
+ # all objectfiles
+ OBJECT_FILES=main.o surfaceDB.o soundDB.o options.o geometry.o video.o game.o \

Modified: packages/trunk/alienblaster/debian/patches/series
===================================================================
--- packages/trunk/alienblaster/debian/patches/series	2013-06-22 06:31:17 UTC (rev 14297)
+++ packages/trunk/alienblaster/debian/patches/series	2013-06-22 09:09:37 UTC (rev 14298)
@@ -2,4 +2,4 @@
 05-fix-exec-name.patch
 06-fix-highscore.patch
 07-fix_as_needed_build.patch
-
+add-hardening-support.patch

Modified: packages/trunk/alienblaster/debian/rules
===================================================================
--- packages/trunk/alienblaster/debian/rules	2013-06-22 06:31:17 UTC (rev 14297)
+++ packages/trunk/alienblaster/debian/rules	2013-06-22 09:09:37 UTC (rev 14298)
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --parallel
 
 override_dh_install:
 	mv $(CURDIR)/alienblaster $(CURDIR)/alienblaster.bin
-	convert -monitor -crop 640x240 \
+	convert -monitor -resize 50% -trim \
 	$(CURDIR)/images/alienblasterintro.bmp $(CURDIR)/alienblaster.png
-	mv $(CURDIR)/alienblaster-0.png $(CURDIR)/alienblaster.png
 	convert -monitor $(CURDIR)/images/alienblastericon.bmp $(CURDIR)/alienblaster.xpm
 	dh_install
 

Modified: packages/trunk/alienblaster/debian/watch
===================================================================
--- packages/trunk/alienblaster/debian/watch	2013-06-22 06:31:17 UTC (rev 14297)
+++ packages/trunk/alienblaster/debian/watch	2013-06-22 09:09:37 UTC (rev 14298)
@@ -1,7 +1,4 @@
 version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
 http://www.schwardtnet.de/alienblaster/archives/alienblaster-(.*)\.tgz

More information about the Pkg-games-commits mailing list