r15588 - in packages/trunk/monsterz/debian: . patches

Sat Nov 7 14:07:45 UTC 2015

Author: apo-guest
Date: 2015-11-07 14:07:45 +0000 (Sat, 07 Nov 2015)
New Revision: 15588

Added:
   packages/trunk/monsterz/debian/patches/hardening.patch
Modified:
   packages/trunk/monsterz/debian/changelog
   packages/trunk/monsterz/debian/control
   packages/trunk/monsterz/debian/copyright
   packages/trunk/monsterz/debian/docs
   packages/trunk/monsterz/debian/monsterz-data.install
   packages/trunk/monsterz/debian/monsterz.desktop
   packages/trunk/monsterz/debian/monsterz.install
   packages/trunk/monsterz/debian/patches/series
   packages/trunk/monsterz/debian/rules
Log:
Debian release 0.7.1-9


Modified: packages/trunk/monsterz/debian/changelog
===================================================================

--- packages/trunk/monsterz/debian/changelog	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/changelog	2015-11-07 14:07:45 UTC (rev 15588)
@@ -1,3 +1,15 @@
+monsterz (0.7.1-9) unstable; urgency=medium
+
+  * Team upload.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Vcs-Browser: Use https.
+  * wrap-and-sort -sa.
+  * Remove hardening-wrapper and use dpkg-buildflags instead. Fix Lintian error
+    build-depends-on-obsolete-package. Add hardening.patch.
+  * Add keywords to desktop file.
+
+ -- Markus Koschany <apo at debian.org>  Sat, 07 Nov 2015 03:28:57 +0100
+
 monsterz (0.7.1-8) unstable; urgency=medium
 
   * Team upload.

Modified: packages/trunk/monsterz/debian/control
===================================================================
--- packages/trunk/monsterz/debian/control	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/control	2015-11-07 14:07:45 UTC (rev 15588)
@@ -2,17 +2,25 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Barry deFreese <bdefreese at debian.org>,
+Uploaders:
+ Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+ Barry deFreese <bdefreese at debian.org>,
  Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 9), hardening-wrapper, imagemagick, python-dev
-Standards-Version: 3.9.4
+Build-Depends:
+ debhelper (>= 9),
+ imagemagick,
+ python-dev
+Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/monsterz/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/monsterz/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/monsterz/
 Homepage: http://sam.zoy.org/monsterz/
 
 Package: monsterz
 Architecture: any
-Depends: monsterz-data (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ monsterz-data (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: arcade puzzle game
  Monsterz is similar to the Bejeweled, Zookeeper or Zooo games.
  The goal is to swap adjacent tiles to create alignments,
@@ -20,9 +28,14 @@
 
 Package: monsterz-data
 Architecture: all
-Depends: ${misc:Depends}, python-pygame, python
-Replaces: monsterz (<< 0.7.1-5)
-Breaks: monsterz (<< 0.7.1-5)
+Depends:
+ python,
+ python-pygame,
+ ${misc:Depends}
+Replaces:
+ monsterz (<< 0.7.1-5)
+Breaks:
+ monsterz (<< 0.7.1-5)
 Description: graphics and audio data for monsterz
  Monsterz is an arcade puzzle game, similar to the Bejeweled, Zookeeper
  or Zooo games. The goal is to swap adjacent tiles to create alignments,

Modified: packages/trunk/monsterz/debian/copyright
===================================================================
--- packages/trunk/monsterz/debian/copyright	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/copyright	2015-11-07 14:07:45 UTC (rev 15588)
@@ -66,4 +66,3 @@
 Public License can be found in `/usr/share/common-licenses/GPL-2' and the
 complete text of the GNU Lesser General Public License can be found in
 `/usr/share/common-licenses/LGPL-2.1'.
-

Modified: packages/trunk/monsterz/debian/docs
===================================================================
--- packages/trunk/monsterz/debian/docs	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/docs	2015-11-07 14:07:45 UTC (rev 15588)
@@ -1,3 +1,3 @@
+AUTHORS
 README
 TODO
-AUTHORS

Modified: packages/trunk/monsterz/debian/monsterz-data.install
===================================================================
--- packages/trunk/monsterz/debian/monsterz-data.install	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/monsterz-data.install	2015-11-07 14:07:45 UTC (rev 15588)
@@ -1,3 +1,3 @@
-/usr/share/games/monsterz/sound
 /usr/share/games/monsterz/*.py
 /usr/share/games/monsterz/graphics/*.png
+/usr/share/games/monsterz/sound

Modified: packages/trunk/monsterz/debian/monsterz.desktop
===================================================================
--- packages/trunk/monsterz/debian/monsterz.desktop	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/monsterz.desktop	2015-11-07 14:07:45 UTC (rev 15588)
@@ -7,3 +7,4 @@
 Terminal=false
 Type=Application
 Categories=Game;ArcadeGame;
+Keywords=arcade;puzzle;bejeweled;monster;

Modified: packages/trunk/monsterz/debian/monsterz.install
===================================================================
--- packages/trunk/monsterz/debian/monsterz.install	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/monsterz.install	2015-11-07 14:07:45 UTC (rev 15588)
@@ -1,4 +1,4 @@
-/var
 /usr/games
+/usr/share/applications
 /usr/share/games/monsterz/graphics/icon.xpm
-/usr/share/applications
+/var

Added: packages/trunk/monsterz/debian/patches/hardening.patch
===================================================================
--- packages/trunk/monsterz/debian/patches/hardening.patch	                        (rev 0)
+++ packages/trunk/monsterz/debian/patches/hardening.patch	2015-11-07 14:07:45 UTC (rev 15588)
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 7 Nov 2015 09:43:31 +0100
+Subject: hardening
+
+Add hardening support for monsterz.
+
+Forwarded: no
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 6db0ff8..c968d03 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ INKSCAPE = inkscape -z
+ all: monsterz
+ 
+ monsterz: monsterz.c
+-	$(CC) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\" -DSCOREFILE=\"$(scorefile)\" -o monsterz
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\" -DSCOREFILE=\"$(scorefile)\" -o monsterz
+ 
+ bitmap: $(BITMAP)
+ 

Modified: packages/trunk/monsterz/debian/patches/series
===================================================================
--- packages/trunk/monsterz/debian/patches/series	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/patches/series	2015-11-07 14:07:45 UTC (rev 15588)
@@ -1,3 +1,4 @@
 010_64-bit-alignment-issues-with-python2.5.diff
 020_fix_blit_crash.diff
 030_startup_screen.patch
+hardening.patch

Modified: packages/trunk/monsterz/debian/rules
===================================================================
--- packages/trunk/monsterz/debian/rules	2015-11-05 16:42:47 UTC (rev 15587)
+++ packages/trunk/monsterz/debian/rules	2015-11-07 14:07:45 UTC (rev 15588)
@@ -4,8 +4,6 @@
 
 #export DH_VERBOSE=1
 
-export DEB_BUILD_HARDENING=1
-
 %:
 	dh $@ --with python2
 


