Author: apo-guest
Date: 2013-07-01 10:55:10 +0000 (Mon, 01 Jul 2013)
New Revision: 14386
Removed:
packages/trunk/monsterz/debian/patches/040_makefile_cflags.patch
Modified:
packages/trunk/monsterz/debian/changelog
packages/trunk/monsterz/debian/compat
packages/trunk/monsterz/debian/control
packages/trunk/monsterz/debian/copyright
packages/trunk/monsterz/debian/patches/series
packages/trunk/monsterz/debian/rules
Log:
Fix RC bug #710733. Harden monsterz. Release 0.7.1-7.
Modified: packages/trunk/monsterz/debian/changelog
===================================================================
--- packages/trunk/monsterz/debian/changelog 2013-07-01 07:17:14 UTC (rev
14385)
+++ packages/trunk/monsterz/debian/changelog 2013-07-01 10:55:10 UTC (rev
14386)
@@ -1,3 +1,20 @@
+monsterz (0.7.1-7) unstable; urgency=low
+
+ * Team upload.
+ * debian/control:
+ - Use canonical VCS-URI.
+ - Add Breaks and Replaces relation to monsterz-data. This prevents that
+ monsterz fails to upgrade. (Closes: #710733)
+ - monsterz: Tighten dependency on monsterz-data (>= ${source:Version}).
+ * Bump compatibility level to 9 and require debhelper >= 9 for automatic
+ hardening build flags.
+ * Use hardening-wrapper to harden the monsterz binary completely hence we can
+ drop 040_makefile_cflags.patch.
+ * Fix lintian issue copyright-refers-to-symlink-license and point to GPL-2
+ and LGPL-2.1 licenses.
+
+ -- Markus Koschany <a...@gambaru.de> Mon, 01 Jul 2013 12:02:42 +0200
+
monsterz (0.7.1-6) unstable; urgency=low
* Remove yes flag from --with-python2. (Closes: #710376).
Modified: packages/trunk/monsterz/debian/compat
===================================================================
--- packages/trunk/monsterz/debian/compat 2013-07-01 07:17:14 UTC (rev
14385)
+++ packages/trunk/monsterz/debian/compat 2013-07-01 10:55:10 UTC (rev
14386)
@@ -1 +1 @@
-7
+9
Modified: packages/trunk/monsterz/debian/control
===================================================================
--- packages/trunk/monsterz/debian/control 2013-07-01 07:17:14 UTC (rev
14385)
+++ packages/trunk/monsterz/debian/control 2013-07-01 10:55:10 UTC (rev
14386)
@@ -4,15 +4,15 @@
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Uploaders: Sam Hocevar (Debian packages) <sam+...@zoy.org>, Barry deFreese
<bdefre...@debian.org>,
Gonéri Le Bouder <gon...@rulezlan.org>
-Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), imagemagick,
python-dev
+Build-Depends: debhelper (>= 9), hardening-wrapper, imagemagick, python-dev
Standards-Version: 3.9.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/monsterz/
-Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/packages/trunk/monsterz/?op=log
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/monsterz/
+Vcs-Browser:
http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/monsterz/
Homepage: http://sam.zoy.org/monsterz/
Package: monsterz
Architecture: any
-Depends: monsterz-data, ${shlibs:Depends}, ${misc:Depends}
+Depends: monsterz-data (>= ${source:Version}), ${shlibs:Depends},
${misc: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,
@@ -21,6 +21,8 @@
Package: monsterz-data
Architecture: all
Depends: ${misc:Depends}, python-pygame, python
+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 2013-07-01 07:17:14 UTC (rev
14385)
+++ packages/trunk/monsterz/debian/copyright 2013-07-01 10:55:10 UTC (rev
14386)
@@ -63,7 +63,7 @@
the terms of the GNU General Public License.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL' and the
+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'.
+`/usr/share/common-licenses/LGPL-2.1'.
Deleted: packages/trunk/monsterz/debian/patches/040_makefile_cflags.patch
===================================================================
--- packages/trunk/monsterz/debian/patches/040_makefile_cflags.patch
2013-07-01 07:17:14 UTC (rev 14385)
+++ packages/trunk/monsterz/debian/patches/040_makefile_cflags.patch
2013-07-01 10:55:10 UTC (rev 14386)
@@ -1,15 +0,0 @@
-Author: Barry deFreese
-Description: Modify Makefile to accept CFLAGS from the environment.
-Index: monsterz-0.7.1/Makefile
-===================================================================
---- monsterz-0.7.1.orig/Makefile 2007-12-17 17:05:00.000000000 -0500
-+++ monsterz-0.7.1/Makefile 2013-05-27 12:44:41.000000000 -0400
-@@ -22,7 +22,7 @@
- all: monsterz
-
- monsterz: monsterz.c
-- $(CC) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\"
-DSCOREFILE=\"$(scorefile)\" -o monsterz
-+ $(CC) $(CFLAGS) monsterz.c -DDATADIR=\"$(pkgdatadir)\"
-DSCOREFILE=\"$(scorefile)\" -o monsterz
-
- bitmap: $(BITMAP)
-
Modified: packages/trunk/monsterz/debian/patches/series
===================================================================
--- packages/trunk/monsterz/debian/patches/series 2013-07-01 07:17:14 UTC
(rev 14385)
+++ packages/trunk/monsterz/debian/patches/series 2013-07-01 10:55:10 UTC
(rev 14386)
@@ -1,4 +1,3 @@
010_64-bit-alignment-issues-with-python2.5.diff
020_fix_blit_crash.diff
030_startup_screen.patch
-040_makefile_cflags.patch
Modified: packages/trunk/monsterz/debian/rules
===================================================================
--- packages/trunk/monsterz/debian/rules 2013-07-01 07:17:14 UTC (rev
14385)
+++ packages/trunk/monsterz/debian/rules 2013-07-01 10:55:10 UTC (rev
14386)
@@ -4,8 +4,7 @@
#export DH_VERBOSE=1
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+export DEB_BUILD_HARDENING=1
%:
dh $@ --with python2
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
