Author: bdefreese Date: 2013-05-27 17:07:07 +0000 (Mon, 27 May 2013) New Revision: 14170
Added: packages/trunk/monsterz/debian/monsterz.manpages packages/trunk/monsterz/debian/patches/030_startup_screen.patch packages/trunk/monsterz/debian/patches/040_makefile_cflags.patch Removed: packages/trunk/monsterz/debian/monsterz.1 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/monsterz-data.install packages/trunk/monsterz/debian/monsterz.install packages/trunk/monsterz/debian/monsterz.postrm packages/trunk/monsterz/debian/patches/010_64-bit-alignment-issues-with-python2.5.diff packages/trunk/monsterz/debian/patches/series packages/trunk/monsterz/debian/rules Log: Move packaging to dh7. Add startup animation patch. Add CFLAGS patch. Move .1 manpage to .6 and install. Modified: packages/trunk/monsterz/debian/changelog =================================================================== --- packages/trunk/monsterz/debian/changelog 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/changelog 2013-05-27 17:07:07 UTC (rev 14170) @@ -1,5 +1,19 @@ -monsterz (0.7.1-4) UNRELEASED; urgency=low +monsterz (0.7.1-5) unstable; urgency=low + * Add startup animation patch. (Closes: #439807). + - Thanks to A Mennucc for the patch. + * Move existing manpage to section 6. (Closes: #605981). + * Change packaging to dh7 style. + * Add patch to pass CFLAGS to Makefile. + - Add hardening flags. + * Change to source format 3.0 quilt. + - Drop quilt build-dep. + * Bump Standards Version to 3.9.4. + + -- Barry deFreese <[email protected]> Sun, 26 May 2013 21:35:56 -0400 + +monsterz (0.7.1-4) unstable; urgency=low + * Add monsterz.postrm to purge /var/games/monsterz * Add myself in Uploaders * Standards-Version: 3.8.2, no change Modified: packages/trunk/monsterz/debian/compat =================================================================== --- packages/trunk/monsterz/debian/compat 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/compat 2013-05-27 17:07:07 UTC (rev 14170) @@ -1 +1 @@ -5 +7 Modified: packages/trunk/monsterz/debian/control =================================================================== --- packages/trunk/monsterz/debian/control 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/control 2013-05-27 17:07:07 UTC (rev 14170) @@ -2,9 +2,10 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Sam Hocevar <[email protected]>, Barry deFreese <[email protected]> -Build-Depends: debhelper (>= 5.0), quilt, imagemagick -Standards-Version: 3.8.2 +Uploaders: Sam Hocevar (Debian packages) <[email protected]>, Barry deFreese <[email protected]>, + Gonéri Le Bouder <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), 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 Homepage: http://sam.zoy.org/monsterz/ Modified: packages/trunk/monsterz/debian/copyright =================================================================== --- packages/trunk/monsterz/debian/copyright 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/copyright 2013-05-27 17:07:07 UTC (rev 14170) @@ -1,12 +1,12 @@ This package was downloaded from http://sam.zoy.org/monsterz/ Files: debian/* -Copyright: © 2004-2007 Sam Hocevar <[email protected]> +Copyright: © 2004-2007 Sam Hocevar <[email protected]> License: GPL-2+ The Debian packaging information is under the GPL, version 2 or later Files: *.c, *.py -Copyright: © 2004-2005 Sam Hocevar <[email protected]> +Copyright: © 2004-2005 Sam Hocevar <[email protected]> License: other-BSD | DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | Version 2, December 2004 @@ -46,7 +46,7 @@ Files: boing.wav, ding.wav, duh.wav, grunt.wav, laugh.wav, whip.wav Copyright: © 2003 by David White <[email protected]> and the Battle for Wesnoth project - © 2006 Sam Hocevar <[email protected]> + © 2006 Sam Hocevar <[email protected]> License: GPL-any boing.wav was taken from Wesnoth's spear.wav and reworked by Sam Hocevar, ding.wav was taken from receive.wav, duh.wav was taken from Modified: packages/trunk/monsterz/debian/monsterz-data.install =================================================================== --- packages/trunk/monsterz/debian/monsterz-data.install 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/monsterz-data.install 2013-05-27 17:07:07 UTC (rev 14170) @@ -1,3 +1,3 @@ /usr/share/games/monsterz/sound /usr/share/games/monsterz/*.py -/usr/share/games/monsterz/graphics/{board,bigtiles,background,tiles,logo}.png +/usr/share/games/monsterz/graphics/*.png Deleted: packages/trunk/monsterz/debian/monsterz.1 =================================================================== --- packages/trunk/monsterz/debian/monsterz.1 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/monsterz.1 2013-05-27 17:07:07 UTC (rev 14170) @@ -1,53 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH MONSTERZ "1" "October 2007" "monsterz 0.7.0" "User Commands" -.SH NAME -monsterz \- a puzzle game of monsters -.SH SYNOPSIS -.B monsterz -[\fIOPTION\fR]... -.SH DESCRIPTION -Options -.TP -\fB\-h\fR, \fB\-\-help\fR -display this help and exit -.TP -\fB\-v\fR, \fB\-\-version\fR -display version information and exit -.TP -\fB\-f\fR, \fB\-\-fullscreen\fR -start in full screen mode -.TP -\fB\-m\fR, \fB\-\-nomusic\fR -disable music -.TP -\fB\-s\fR, \fB\-\-nosfx\fR -disable sound effects -.TP -\fB\-\-outfd\fR <fd> -output scores to file descriptor <fd> -.TP -\fB\-\-data\fR <dir> -set alternate data directory to <dir> -.HP -\fB\-\-score\fR <file> set score file to <file> -.SH AUTHOR -Written by Sam Hocevar, music by MenTaLguY, sound effects by Sun Microsystems, -Inc., Michael Speck, David White and the Battle for Wesnoth project, Mike -Kershaw and Sam Hocevar. -.SH "REPORTING BUGS" -Report bugs or suggestions to <[email protected]>. -.SH COPYRIGHT -Copyright \(co 2005, 2006 Sam Hocevar <[email protected]> - (C) 1998 MenTaLguY <[email protected]> - (C) 2002, 2005 Sun Microsystems, Inc. - (C) Michael Speck <[email protected]> - (C) 2003 by David White <[email protected]> and the - Battle for Wesnoth project - (C) Mike Kershaw <[email protected]> -This program is free software; you can redistribute it and/or modify it under -the terms of the Do What The Fuck You Want To Public License, Version 2, as -published by Sam Hocevar. See http://sam.zoy.org/wtfpl/ for more details. -The sound effects are released under their own licences: applause.wav and -pop.wav are covered by the LGPL, the others are covered by the GPL. -.SH "SEE ALSO" -The in-game help option. Modified: packages/trunk/monsterz/debian/monsterz.install =================================================================== --- packages/trunk/monsterz/debian/monsterz.install 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/monsterz.install 2013-05-27 17:07:07 UTC (rev 14170) @@ -1,4 +1,4 @@ /var /usr/games -/usr/share/games/monsterz/graphics/icon* +/usr/share/games/monsterz/graphics/icon.xpm /usr/share/applications Added: packages/trunk/monsterz/debian/monsterz.manpages =================================================================== --- packages/trunk/monsterz/debian/monsterz.manpages (rev 0) +++ packages/trunk/monsterz/debian/monsterz.manpages 2013-05-27 17:07:07 UTC (rev 14170) @@ -0,0 +1 @@ +debian/monsterz.6 Modified: packages/trunk/monsterz/debian/monsterz.postrm =================================================================== --- packages/trunk/monsterz/debian/monsterz.postrm 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/monsterz.postrm 2013-05-27 17:07:07 UTC (rev 14170) @@ -1,5 +1,7 @@ #! /bin/sh +set -e + case "$1" in purge|remove) rm -f /var/games/monsterz Modified: packages/trunk/monsterz/debian/patches/010_64-bit-alignment-issues-with-python2.5.diff =================================================================== --- packages/trunk/monsterz/debian/patches/010_64-bit-alignment-issues-with-python2.5.diff 2013-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/patches/010_64-bit-alignment-issues-with-python2.5.diff 2013-05-27 17:07:07 UTC (rev 14170) @@ -1,3 +1,5 @@ +Author: Unknown +Description: Fix issues with alignment on 64 bit systems. Index: monsterz-0.7.1/monsterz.py =================================================================== --- monsterz-0.7.1.orig/monsterz.py 2008-05-09 16:35:25.000000000 +0000 Added: packages/trunk/monsterz/debian/patches/030_startup_screen.patch =================================================================== --- packages/trunk/monsterz/debian/patches/030_startup_screen.patch (rev 0) +++ packages/trunk/monsterz/debian/patches/030_startup_screen.patch 2013-05-27 17:07:07 UTC (rev 14170) @@ -0,0 +1,85 @@ +Author: A Mennucc <[email protected]> +Description: Add startup animation with random monster. +Index: monsterz-0.7.1/monsterz.py +=================================================================== +--- monsterz-0.7.1.orig/monsterz.py 2013-05-26 22:22:45.000000000 -0400 ++++ monsterz-0.7.1/monsterz.py 2013-05-26 22:28:08.000000000 -0400 +@@ -17,7 +17,7 @@ + from random import randint + from sys import argv, exit, platform + from os.path import join, isdir, isfile, dirname, expanduser +-from os import write, mkdir ++from os import write, mkdir, getenv + + # String constants + VERSION = '0.7.1' +@@ -40,6 +40,16 @@ + ITEM_METAL = ITEMS + 2 + ITEM_PUZZLE = ITEMS + 3 + ++LANG = getenv('LC_MESSAGES') or getenv('LC_ALL') or getenv('LANG') or '' ++ ++ITEM_NAMES = ['hairy','cloudy','cyclop','auntie','roswell','horny', ++ 'bluewhale','octopie','ghost'] ++ ++if LANG[:2] == 'it': ++ ITEM_NAMES=['buffopelo','nuvolastra','ciclope', ++ 'ziantonietta','roswell','cornutazzo', ++ 'balenablu','polipetto','fantasmino'] ++ + STATUS_MENU = 0 + STATUS_NEW = 1 + STATUS_GAME = 2 +@@ -890,6 +900,10 @@ + w, h = text.get_rect().size + system.blit(text, (192 - w / 2 - 8, 24 + 288 - h / 2)) + system.blit(data.normal[self.lucky], (192 + w / 2, 288)) ++ text = fonter.render(ITEM_NAMES[self.lucky],20) ++ wn, hn = text.get_rect().size ++ system.blit(text, (192 + w/2 - wn/2 + ITEM_SIZE/2, ++ 24 + 288 + ITEM_SIZE - h/2 - hn/2)) + elif self.lost_timer != -1: + # Draw pieces + self.board_draw() +@@ -1374,6 +1388,33 @@ + return True + return False + ++ wander_monster=randint(0,ITEMS-1) ++ wander_x=None ++ wander_y=0 ++ def wanderer_draw(self): ++ if self.wander_x==None : ++ if randint(0,30) == 1 : ++ self.wander_monster = (self.wander_monster+1)%ITEMS ++ self.wander_y=randint(20,SCREEN_HEIGHT-ITEM_SIZE-20) ++ self.wander_x=-ITEM_SIZE ++ return ++ if randint(0,10) == 1 : ++ monster = data.blink[self.wander_monster] ++ else: ++ monster = data.normal[self.wander_monster] ++ system.blit(monster, (self.wander_x, self.wander_y)) ++ system.blit(fonter.render(ITEM_NAMES[self.wander_monster], ++ 30, (250,250,250)), ++ (self.wander_x+ITEM_SIZE, self.wander_y+ITEM_SIZE/2-15)) ++ if self.wander_x < SCREEN_WIDTH/3 or self.wander_x > (SCREEN_WIDTH/3)*2 : ++ self.wander_x += randint(4,8) ++ self.wander_y += randint(-2,2) ++ else: ++ self.wander_x += 3 ++ self.wander_y += randint(-1,1) ++ if self.wander_x > SCREEN_WIDTH : ++ self.wander_x=None ++ + msat = [0] * 4 + marea = None + def iterate_menu(self): +@@ -1403,6 +1444,7 @@ + # Print logo and menu + w, h = data.logo.get_size() + system.blit(data.logo, (24 + 192 - w / 2, 24 + 96 - h / 2)) ++ self.wanderer_draw() + for x in range(4): + if self.msat[x] > 180: + monster = data.surprise[shapes[x]] Added: packages/trunk/monsterz/debian/patches/040_makefile_cflags.patch =================================================================== --- packages/trunk/monsterz/debian/patches/040_makefile_cflags.patch (rev 0) +++ packages/trunk/monsterz/debian/patches/040_makefile_cflags.patch 2013-05-27 17:07:07 UTC (rev 14170) @@ -0,0 +1,15 @@ +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-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/patches/series 2013-05-27 17:07:07 UTC (rev 14170) @@ -1,2 +1,4 @@ 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-05-27 16:33:34 UTC (rev 14169) +++ packages/trunk/monsterz/debian/rules 2013-05-27 17:07:07 UTC (rev 14170) @@ -4,65 +4,21 @@ #export DH_VERBOSE=1 -build: build-stamp -build-stamp: - dh_testdir - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - $(MAKE) prefix=/usr - touch build-stamp +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk -clean: - dh_testdir - dh_testroot - rm -f build-stamp - [ ! -f Makefile ] || $(MAKE) distclean - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - dh_clean +%: + dh $@ --with python2, yes -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +override_dh_auto_build: + $(MAKE) prefix=/usr + +override_dh_auto_install: $(MAKE) install prefix=/usr DESTDIR=$(CURDIR)/debian/tmp + +override_dh_install: convert graphics/icon.png -sample 32x32 debian/tmp/usr/share/games/monsterz/graphics/icon.xpm mkdir -p debian/tmp/usr/share/applications cp debian/monsterz.desktop debian/tmp/usr/share/applications rm -f debian/tmp/var/games/monsterz - dh_install --fail-missing --sourcedir=debian/tmp - -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_link -i - dh_installdocs -i - dh_installexamples -i - dh_installmenu -i - dh_installcron -i - dh_installman -i debian/monsterz.1 - dh_installinfo -i - dh_installchangelogs -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installmenu -a - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install + dh_install _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
