r15600 - in packages/trunk/gravitywars/debian: . patches

Markus Koschany apo-guest at moszumanska.debian.org
Sat Nov 21 20:43:44 UTC 2015 

Author: apo-guest
Date: 2015-11-21 20:43:43 +0000 (Sat, 21 Nov 2015)
New Revision: 15600

Added:
   packages/trunk/gravitywars/debian/clean
   packages/trunk/gravitywars/debian/dirs
   packages/trunk/gravitywars/debian/patches/040_hardening.patch
Modified:
   packages/trunk/gravitywars/debian/README.Debian
   packages/trunk/gravitywars/debian/changelog
   packages/trunk/gravitywars/debian/control
   packages/trunk/gravitywars/debian/copyright
   packages/trunk/gravitywars/debian/docs
   packages/trunk/gravitywars/debian/gravitywars.6
   packages/trunk/gravitywars/debian/gravitywars.desktop
   packages/trunk/gravitywars/debian/install
   packages/trunk/gravitywars/debian/patches/series
   packages/trunk/gravitywars/debian/postinst
   packages/trunk/gravitywars/debian/postrm
   packages/trunk/gravitywars/debian/rules
Log:
Release 1.102-34


Modified: packages/trunk/gravitywars/debian/README.Debian
===================================================================
--- packages/trunk/gravitywars/debian/README.Debian	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/README.Debian	2015-11-21 20:43:43 UTC (rev 15600)
@@ -17,4 +17,4 @@
 except rewriting huge parts of the game, so please run the game on a 256
 color display if you experience speed issues.
 
- -- Sam Hocevar <sho at debian.org>  Sat, 26 Apr 2003 10:31:06 +0200
+ -- Sam Hocevar <sam at zoy.org>  Sat, 26 Apr 2003 10:31:06 +0200

Modified: packages/trunk/gravitywars/debian/changelog
===================================================================
--- packages/trunk/gravitywars/debian/changelog	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/changelog	2015-11-21 20:43:43 UTC (rev 15600)
@@ -1,19 +1,38 @@
-gravitywars (1.102-33) UNRELEASED; urgency=low
+gravitywars (1.102-34) unstable; urgency=medium
 
-  [ Barry deFreese ]
-  * Install xpm icon in correct dir. (Closes: #527745).
-  * Move to dh style rules.
-  * Move to source format 3.0 (quilt).
-  * Bump debhelper build-dep and compat to 9.
-  * Bump Standards Version to 3.9.4.
+  * Team upload.
+  * Install gravitywars.xpm to /usr/share/pixmaps, so that the icon is
+    displayed by all menu systems. Thanks to Michael Terry for the report.
+    (Closes: #527745)
+  * Switch to source format 3.0 (quilt).
+  * gravitywars.desktop: Add keywords and a comment in German.
+  * menu: Adjust the icon path.
+  * wrap-and-sort -sa.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Use compat level 9 and require debhelper >= 9.
+  * Use canonical Vcs-URI.
+  * Remove quilt from Build-Depends because source format 3.0 uses quilt by
+    default.
+  * d/control: Add ${misc:Depends} substvar.
+  * Rewrite debian/rules and switch to dh sequencer.
+  * Install man page with manpages file.
+  * Install documentation with docs file.
+  * Create /var/games/gravitywars and /usr/games with dirs file.
+  * Install icons, data and the desktop file with install file.
+  * postrm: Use set -e.
+  * Remove GravityWars101 with clean file.
+  * Add hardening.patch and harden the binary.
 
-** Currently doesn't ship /var/games/high score file.  Should be fixed.
+ -- Markus Koschany <apo at debian.org>  Sat, 21 Nov 2015 21:27:21 +0100
 
-  [ Evgeni Golov ]
-  * Correct Vcs-* URLs to point to anonscm.debian.org
+gravitywars (1.102-33) unstable; urgency=medium
 
- -- Barry deFreese <bdefreese at debian.org>  Fri, 07 Jun 2013 06:17:48 -0400
+  * Team upload.
+  * Do not use the obsolete and incorrect full path to dpkg-statoverride.
+    Closes: #770062
 
+ -- Peter Pentchev <roam at ringlet.net>  Sat, 29 Nov 2014 01:40:39 +0200
+
 gravitywars (1.102-32) unstable; urgency=low
 
   [ Barry deFreese ]

Added: packages/trunk/gravitywars/debian/clean
===================================================================
--- packages/trunk/gravitywars/debian/clean	                        (rev 0)
+++ packages/trunk/gravitywars/debian/clean	2015-11-21 20:43:43 UTC (rev 15600)
@@ -0,0 +1 @@
+GravityWars101

Modified: packages/trunk/gravitywars/debian/control
===================================================================
--- packages/trunk/gravitywars/debian/control	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/control	2015-11-21 20:43:43 UTC (rev 15600)
@@ -2,15 +2,21 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sam Hocevar <sho at debian.org>, Barry deFreese <bdefreese at debian.org>
-Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9.0), quilt, libsdl1.2-dev (>= 1.2.5-8)
+Uploaders:
+ Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+ Barry deFreese <bdefreese at debian.org>
+Standards-Version: 3.9.6
+Build-Depends:
+ debhelper (>= 9),
+ libsdl1.2-dev (>= 1.2.5-8)
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/gravitywars
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/gravitywars/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/gravitywars/
 
 Package: gravitywars
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: clone of Gravity Force
  Gravity Wars is inspired by Gravity Force, one of the greatest games
  for the Amiga. This version is a little different, with a much higher

Modified: packages/trunk/gravitywars/debian/copyright
===================================================================
--- packages/trunk/gravitywars/debian/copyright	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/copyright	2015-11-21 20:43:43 UTC (rev 15600)
@@ -2,10 +2,10 @@
 
 This package was put together by Joey Hess <joeyh at master.debian.org>, using
 sources from the web page at:
-	http://www.kuai.se/~sniemi/gwars.htm
+    http://www.kuai.se/~sniemi/gwars.htm
 (This web page no longer exists.)
 
-Upstream Author: Sami Niemi <sami at niemi.com> 
+Upstream Author: Sami Niemi <sami at niemi.com>
 
 Copyright: Copyright (C) 1995, 1996 Sami Niemi <sami at niemi.com>
 

Added: packages/trunk/gravitywars/debian/dirs
===================================================================
--- packages/trunk/gravitywars/debian/dirs	                        (rev 0)
+++ packages/trunk/gravitywars/debian/dirs	2015-11-21 20:43:43 UTC (rev 15600)
@@ -0,0 +1,2 @@
+var/games/gravitywars
+usr/games

Modified: packages/trunk/gravitywars/debian/docs
===================================================================
--- packages/trunk/gravitywars/debian/docs	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/docs	2015-11-21 20:43:43 UTC (rev 15600)
@@ -1,3 +1,2 @@
 README
 README.announce
-README.joystick

Modified: packages/trunk/gravitywars/debian/gravitywars.6
===================================================================
--- packages/trunk/gravitywars/debian/gravitywars.6	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/gravitywars.6	2015-11-21 20:43:43 UTC (rev 15600)
@@ -1,4 +1,4 @@
-.TH GRAVITYWARS 6 
+.TH GRAVITYWARS 6
 .SH NAME
 gravitywars \- clone of Gravity Force
 .SH SYNOPSIS
@@ -40,4 +40,4 @@
 .P
 This manual page was written by Joey Hess,
 for the Debian GNU/Linux system, with updates
-from Sam Hocevar <sho at debian.org>.
+from Sam Hocevar <sam at zoy.org>.

Modified: packages/trunk/gravitywars/debian/gravitywars.desktop
===================================================================
--- packages/trunk/gravitywars/debian/gravitywars.desktop	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/gravitywars.desktop	2015-11-21 20:43:43 UTC (rev 15600)
@@ -2,9 +2,10 @@
 Name=Gravity Wars
 GenericName=gravitywars
 Comment=Test your skills against gravity
+Comment[de]=Erprobe deine Fähigkeiten gegen die Schwerkraft
 Type=Application
 Exec=gravitywars
 Icon=gravitywars
 Terminal=false
 Categories=Game;ArcadeGame;
-
+Keywords=gravity;space;ship;arcade;

Modified: packages/trunk/gravitywars/debian/install
===================================================================
--- packages/trunk/gravitywars/debian/install	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/install	2015-11-21 20:43:43 UTC (rev 15600)
@@ -1,5 +1,5 @@
-data/* usr/share/games/gravitywars/data/
-levels/* usr/share/games/gravitywars/levels/
-debian/gravitywars.desktop usr/share/applications/
+debian/gravitywars.desktop usr/share/applications
 debian/gravitywars.xpm usr/share/pixmaps
+data usr/share/games/gravitywars
+levels usr/share/games/gravitywars
 

Added: packages/trunk/gravitywars/debian/patches/040_hardening.patch
===================================================================
--- packages/trunk/gravitywars/debian/patches/040_hardening.patch	                        (rev 0)
+++ packages/trunk/gravitywars/debian/patches/040_hardening.patch	2015-11-21 20:43:43 UTC (rev 15600)
@@ -0,0 +1,31 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 21 Nov 2015 20:56:21 +0100
+Subject: hardening
+
+Build the game with hardening build flags.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index bfc9e71..3becd57 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@ DEBUG=1
+ BINDIR=/usr/local/bin
+ 
+ ifeq (1,$(USE_SDL))
+-CFLAGS= -g -Wall -DUSE_SDL -DUSE_JOYSTICK `sdl-config --cflags`
++CFLAGS= -g -Wall -O2 -fstack-protector-strong -Wformat -Werror=format-security -DUSE_SDL -DUSE_JOYSTICK `sdl-config --cflags`
+ LIBS= -lm `sdl-config --libs`
+ else
+ CFLAGS= -O2 -Wall
+@@ -23,7 +23,7 @@ OBJECTS=memory.o macros.o misc.o water.o score.o hole.o bullet.o pixel.o \
+         control.o vgastubs.o GravityWars101.o 
+ 
+ $(TARGET): $(OBJECTS)
+-	$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTS2) -o $(TARGET) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(OBJECTS2) -o $(TARGET) $(LIBS)
+ 
+ GravityWars101.o: GravityWars101.c config.h macros.h
+ 

Modified: packages/trunk/gravitywars/debian/patches/series
===================================================================
--- packages/trunk/gravitywars/debian/patches/series	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/patches/series	2015-11-21 20:43:43 UTC (rev 15600)
@@ -8,3 +8,4 @@
 010_sdl_port.diff
 020_sdl_joystick.diff
 030_ucase_password.diff
+040_hardening.patch

Modified: packages/trunk/gravitywars/debian/postinst
===================================================================
--- packages/trunk/gravitywars/debian/postinst	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/postinst	2015-11-21 20:43:43 UTC (rev 15600)
@@ -22,15 +22,13 @@
     # Cancel my old stupid use of dpkg-statoverride
     if [ "$1" = "configure" ] && [ "$2" != "" ] &&
           dpkg --compare-versions "$2" le "1.102-28" &&
-          [ -x /usr/sbin/dpkg-statoverride ] &&
           dpkg-statoverride --list "$PROG" >/dev/null
     then
         dpkg-statoverride --remove "$PROG"
     fi
 
     # Properly use statoverride
-    if ! [ -x /usr/sbin/dpkg-statoverride ] || \
-        ! dpkg-statoverride --list "$PROG" >/dev/null ; then
+    if ! dpkg-statoverride --list "$PROG" >/dev/null ; then
       chown root:games "$PROG"
       chmod 2755 "$PROG"
     fi

Modified: packages/trunk/gravitywars/debian/postrm
===================================================================
--- packages/trunk/gravitywars/debian/postrm	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/postrm	2015-11-21 20:43:43 UTC (rev 15600)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 PROG=/usr/games/gravitywars
 VARDIR=/var/games/gravitywars

Modified: packages/trunk/gravitywars/debian/rules
===================================================================
--- packages/trunk/gravitywars/debian/rules	2015-11-15 16:10:04 UTC (rev 15599)
+++ packages/trunk/gravitywars/debian/rules	2015-11-21 20:43:43 UTC (rev 15600)
@@ -6,10 +6,13 @@
 override_dh_auto_build:
 	$(MAKE) USE_SDL=1
 
-override_dh_auto_install:
-
 override_dh_install:
-	mkdir -p $(CURDIR)/debian/gravitywars/usr/games/
 	cp GravityWars101 $(CURDIR)/debian/gravitywars/usr/games/gravitywars
-	chmod 755 $(CURDIR)/debian/gravitywars/usr/games/gravitywars
+	$(RM) debian/gravitywars/usr/share/games/gravitywars/data/hscore.gw
 	dh_install
+
+override_dh_auto_install:
+	# Do nothing here to prevent a FTBFS
+
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES

More information about the Pkg-games-commits mailing list