r9177 - in packages/trunk/pathological/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Tue Mar 17 16:21:33 UTC 2009
Author: bdefreese
Date: 2009-03-17 16:21:33 +0000 (Tue, 17 Mar 2009)
New Revision: 9177
Added:
packages/trunk/pathological/debian/patches/
packages/trunk/pathological/debian/patches/10_makefile.patch
packages/trunk/pathological/debian/patches/20_highscores.patch
packages/trunk/pathological/debian/patches/30_no_soundcard.patch
packages/trunk/pathological/debian/patches/series
Modified:
packages/trunk/pathological/debian/changelog
packages/trunk/pathological/debian/control
packages/trunk/pathological/debian/rules
Log:
* Add myself to uploaders.
* Add quilt patching system.
* Move old inline changes to quilt patches.
+ 10_makefile.patch.
+ 20_highscores.patch.
* 30_no_soundcard.patch. Start with no soundcard. (Closes: #461330).
+ Thanks to Emanuele Rocca for the patch!
* Bump Standards Version to 3.8.1. (No changes needed).
Refresh changelog.
Modified: packages/trunk/pathological/debian/changelog
===================================================================
--- packages/trunk/pathological/debian/changelog 2009-03-17 16:15:54 UTC (rev 9176)
+++ packages/trunk/pathological/debian/changelog 2009-03-17 16:21:33 UTC (rev 9177)
@@ -1,4 +1,4 @@
-pathological (1.1.3-9) UNRELEASED; urgency=low
+pathological (1.1.3-9) unstable; urgency=low
[ Gonéri Le Bouder ]
* call dh_desktop to run update-desktop-database
@@ -18,6 +18,14 @@
* Add watch file
* Make distclean not ignore errors
* Make debhelper b-d, not b-d-i. (Used in clean target).
+ * Add myself to uploaders.
+ * Add quilt patching system.
+ * Move old inline changes to quilt patches.
+ + 10_makefile.patch.
+ + 20_highscores.patch.
+ * 30_no_soundcard.patch. Start with no soundcard. (Closes: #461330).
+ + Thanks to Emanuele Rocca for the patch!
+ * Bump Standards Version to 3.8.1. (No changes needed).
[ Ansgar Burchardt ]
* debian/control: Change XS-Vcs-* to Vcs-*
@@ -26,7 +34,7 @@
[ Alexander Reichle-Schmehl ]
* Adopt debian/control to my new name
- -- Alexander Reichle-Schmehl <tolimar at debian.org> Wed, 25 Feb 2009 17:29:03 +0100
+ -- Barry deFreese <bdefreese at debian.org> Tue, 17 Mar 2009 11:18:43 -0400
pathological (1.1.3-8) unstable; urgency=low
Modified: packages/trunk/pathological/debian/control
===================================================================
--- packages/trunk/pathological/debian/control 2009-03-17 16:15:54 UTC (rev 9176)
+++ packages/trunk/pathological/debian/control 2009-03-17 16:21:33 UTC (rev 9177)
@@ -2,10 +2,10 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Alexander Reichle-Schmehl <tolimar at debian.org>
-Build-Depends: debhelper (>> 5.0.0)
+Uploaders: Alexander Reichle-Schmehl <tolimar at debian.org>, Barry deFreese <bdefreese at debian.org>
+Build-Depends: debhelper (>> 5.0.0), quilt
Build-Depends-Indep: netpbm
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
Homepage: http://pathological.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pathological/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/pathological/?op=log
Added: packages/trunk/pathological/debian/patches/10_makefile.patch
===================================================================
--- packages/trunk/pathological/debian/patches/10_makefile.patch (rev 0)
+++ packages/trunk/pathological/debian/patches/10_makefile.patch 2009-03-17 16:21:33 UTC (rev 9177)
@@ -0,0 +1,96 @@
+Description: Add docs and clean targets. Fix datadir paths.
+
+Index: pathological-1.1.3.orig/Makefile
+===================================================================
+--- pathological-1.1.3.orig.orig/Makefile 2009-03-17 11:59:04.000000000 -0400
++++ pathological-1.1.3.orig/Makefile 2009-03-17 11:59:29.000000000 -0400
+@@ -2,59 +2,60 @@
+
+ DATADIR = $(DESTDIR)/usr/share/games/pathological
+
+-all: write-highscores html/wheel.png
++all: write-highscores docs
+
+ write-highscores: write-highscores.c
+ gcc -s -o write-highscores write-highscores.c
+
++docs: html/wheel.png
+ html/wheel.png:
+ ./makehtml
+
+-install: all
+- mkdir -p $(DATADIR)
+- cp pathological.py $(DATADIR)/
+- cp -r circuits graphics music sounds $(DATADIR)/
++install: install-dep install-indep install-scores
++
++# Install architecture-independent data
++install-indep:
++ install -d $(DATADIR)
++ install -D -m 755 pathological.py $(DATADIR)/pathological.py
++ cp -r circuits graphics sounds $(DATADIR)/
+ rm -f $(DATADIR)/graphics/*.xcf
+ rm -f $(DATADIR)/sounds/*.orig
+
+- mkdir -p $(DESTDIR)/usr/games
+- cp pathological $(DESTDIR)/usr/games/
+-
+- mkdir -p $(DESTDIR)/usr/lib/pathological/bin
+- cp write-highscores $(DESTDIR)/usr/lib/pathological/bin
+-
+- # The following changes should also be performed in a post-install script
+- -chgrp games $(DESTDIR)/usr/lib/pathological/bin/write-highscores
+- -chmod 2755 $(DESTDIR)/usr/lib/pathological/bin/write-highscores
++ install -D -m 755 pathological $(DESTDIR)/usr/games/pathological
+
+- mkdir -p $(DESTDIR)/usr/X11R6/include/X11/pixmaps
+- cp pathological.xpm $(DESTDIR)/usr/X11R6/include/X11/pixmaps
++ zcat pathological.6.gz > pathological.6
++ install -D -m 644 pathological.6 $(DESTDIR)/usr/share/man/man6/pathological.6
+
+- mkdir -p $(DESTDIR)/var/games
+- cp pathological_scores $(DESTDIR)/var/games
+-
+- # The following changes should also be performed in a post-install script
+- -chgrp games $(DESTDIR)/var/games/pathological_scores
+- -chmod 664 $(DESTDIR)/var/games/pathological_scores
++ install -d $(DESTDIR)/usr/share/doc/pathological
++ cp -r html $(DESTDIR)/usr/share/doc/pathological
+
+- mkdir -p $(DESTDIR)/usr/share/man/man6
+- cp pathological.6.gz $(DESTDIR)/usr/share/man/man6
++ install -D -m 644 pathological.xpm $(DESTDIR)/usr/share/pixmaps/pathological.xpm
+
+- mkdir -p $(DESTDIR)/usr/share/doc/pathological
+- cp -r html $(DESTDIR)/usr/share/doc/pathological
++# Install architecture-dependent data
++install-dep:
++ install -d $(DESTDIR)/var/games
++ install -D -m 2755 --owner=root --group=games write-highscores $(DESTDIR)/usr/lib/games/pathological/bin/write-highscores
++
++# Install the scores file, if it doesn't already exist.
++install-scores:
++ if [ ! -e $(DESTDIR)/var/games/pathological_scores ]; then \
++ install -D -m 644 pathological_scores $(DESTDIR)/var/games/pathological_scores; \
++ fi
+
+ uninstall:
+ rm -rf $(DATADIR)
+- rm -rf $(DESTDIR)/usr/lib/pathological
++ rm -rf $(DESTDIR)/usr/lib/games/pathological
+ rm -f $(DESTDIR)/usr/games/pathological
+- rm -f $(DESTDIR)/usr/X11R6/include/X11/pixmaps/pathological.xpm
++ rm -f $(DESTDIR)/usr/share/pixmaps/pathological.xpm
+ rm -f $(DESTDIR)/usr/share/man/man6/pathological.6.gz
+
+ purge: uninstall
+ rm -f $(DESTDIR)/var/games/pathological_scores
+
+ empty: distclean
++distclean: clean
+
+-distclean:
++clean:
+ rm -f write-highscores
+ rm -f html/*.png
++ rm -f pathological.6
Added: packages/trunk/pathological/debian/patches/20_highscores.patch
===================================================================
--- packages/trunk/pathological/debian/patches/20_highscores.patch (rev 0)
+++ packages/trunk/pathological/debian/patches/20_highscores.patch 2009-03-17 16:21:33 UTC (rev 9177)
@@ -0,0 +1,172 @@
+Description: Fix handling of high scores file.
+
+Index: pathological-1.1.3.orig/pathological.py
+===================================================================
+--- pathological-1.1.3.orig.orig/pathological.py 2009-03-17 12:00:37.000000000 -0400
++++ pathological-1.1.3.orig/pathological.py 2009-03-17 12:00:55.000000000 -0400
+@@ -1,6 +1,8 @@
+ #!/usr/bin/python
++# -*- coding: iso-8859-1 -*-
+ """
+ Copyright (C) 2003 John-Paul Gignac
++ (C) 2004 Joe Wreschnig
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -22,7 +24,7 @@
+ from pygame.locals import *
+
+ # Parse the command line
+-highscores_file = "pathological_scores"
++highscores_file = os.path.join(os.environ["HOME"], ".pathological_scores")
+ screenshot = 0
+ fullscreen = 0
+ colorblind = 0
+@@ -51,7 +53,7 @@
+
+ # The location of the setgid script for writing highscores
+ # This script is only used if the highscores file is not writable directly
+-write_highscores = "/usr/lib/pathological/bin/write-highscores"
++write_highscores = "/usr/lib/games/pathological/bin/write-highscores"
+
+ # Game constants
+ wheel_steps = 9
+@@ -1562,7 +1564,7 @@
+ pygame.display.update( popup_rc[1])
+
+ class Game:
+- def __init__(self, screen, circuit, highscores):
++ def __init__(self, screen, circuit, highscores, level = 0):
+ self.screen = screen
+ self.circuit = circuit
+ self.highscores = highscores
+@@ -1578,7 +1580,7 @@
+ f.close()
+ self.numlevels = j / vert_tiles
+
+- self.level = 0
++ self.level = level
+ self.score = 0
+ self.lives = initial_lives
+
+@@ -1829,6 +1831,7 @@
+ class IntroScreen:
+ menu = ("Start Game", "High Scores", "Fullscreen:", "Music:",
+ "Sound Effects:", "Quit Game")
++ start_level = 1
+ menu_width = 240
+ menu_pos = ((800 - menu_width)/2, 145)
+ menu_font_height = 32
+@@ -1914,6 +1917,14 @@
+ self.screen.blit( menu_option, (self.menu_pos[0], y))
+ y += self.menu_font_height
+
++ levelt = self.menu_font.render("(Lvl. %d)" %
++ IntroScreen.start_level,
++ 1, self.menu_color)
++ lt_r = levelt.get_rect()
++ lt_r.right = self.menu_pos[0] + self.menu_option_left + 40
++ lt_r.top = self.menu_pos[1]
++ self.screen.blit(levelt, lt_r)
++
+ if fullscreen: offon = 'On'
+ else: offon = 'Off'
+ offon = self.menu_font.render( offon, 1, self.menu_color)
+@@ -1966,6 +1977,15 @@
+ self.curpage = 1
+ self.draw_menu()
+
++ def inc_level(self):
++ if (IntroScreen.start_level <
++ max([s[2] for s in self.highscores.scores])):
++ IntroScreen.start_level += 1
++
++ def dec_level(self):
++ if IntroScreen.start_level > 1:
++ IntroScreen.start_level -= 1
++
+ def do(self, show_highscores=0):
+ self.scroller_pos = -self.scroller_rect[2]
+
+@@ -2028,7 +2048,15 @@
+ self.draw_menu()
+ elif event.key == K_SPACE or event.key == K_RETURN:
+ rc = self.menu_select( self.menu_cursor)
+- if rc < 1: return rc
++ if rc: return rc
++ elif event.key == K_LEFT:
++ if self.menu_cursor == 0:
++ self.dec_level()
++ self.draw_menu()
++ elif event.key == K_RIGHT:
++ if self.menu_cursor == 0:
++ self.inc_level()
++ self.draw_menu()
+ continue
+ elif event.type is MOUSEBUTTONDOWN:
+ if self.curpage == 1:
+@@ -2044,9 +2072,8 @@
+ if pos[1] < self.menu_pos[1]: continue
+ i = (pos[1] - self.menu_pos[1]) / self.menu_font_height
+ if i >= len(self.menu): continue
+-
+ rc = self.menu_select( i)
+- if rc < 1: return rc
++ if rc: return rc
+
+ pygame.display.update( self.dirty_rects)
+
+@@ -2057,7 +2084,7 @@
+ # 1 - Unknown option
+ def menu_select( self, i):
+ if i == 0:
+- return 0
++ return IntroScreen.start_level
+ elif i == 1:
+ play_sound( menu_select)
+ self.go_to_highscores()
+@@ -2075,7 +2102,7 @@
+ self.draw_menu()
+ elif i == 5:
+ return -1
+- return 1
++ return 0
+
+ hs_font_height = 24
+ hs_width = 320
+@@ -2157,7 +2184,10 @@
+ pygame.mixer.pre_init(44100,-16,1,4096)
+
+ # Initialize the game module
+- pygame.init()
++ pygame.display.init()
++ pygame.mixer.init()
++ pygame.font.init()
++ pygame.key.set_repeat(500, 30)
+
+ if not pygame.font: print 'Warning, fonts disabled'
+ if not pygame.mixer: print 'Warning, sound disabled'
+@@ -2189,7 +2219,8 @@
+
+ if rc < 0: break # Handle the QUIT message
+
+- game = Game(screen, 'all-boards', highscores)
++ # If rc is positive, it's a level.
++ game = Game(screen, 'all-boards', highscores, rc - 1)
+
+ show_highscores = 1
+
+Index: pathological-1.1.3.orig/pathological
+===================================================================
+--- pathological-1.1.3.orig.orig/pathological 2009-03-17 12:01:14.000000000 -0400
++++ pathological-1.1.3.orig/pathological 2009-03-17 12:01:22.000000000 -0400
+@@ -32,8 +32,4 @@
+
+ cd /usr/share/games/pathological
+
+-if [ -z "$scoresfile" ]; then
+- scoresfile=/var/games/pathological_scores
+-fi
+-
+-exec ./pathological.py $options $scoresfile
++exec ./pathological.py $options
Added: packages/trunk/pathological/debian/patches/30_no_soundcard.patch
===================================================================
--- packages/trunk/pathological/debian/patches/30_no_soundcard.patch (rev 0)
+++ packages/trunk/pathological/debian/patches/30_no_soundcard.patch 2009-03-17 16:21:33 UTC (rev 9177)
@@ -0,0 +1,20 @@
+Description: Load game even if no soundcard is detected. (BTS #461330).
+
+Index: pathological-1.1.3/pathological.py
+===================================================================
+--- pathological-1.1.3.orig/pathological.py 2009-03-17 11:14:18.000000000 -0400
++++ pathological-1.1.3/pathological.py 2009-03-17 11:16:19.000000000 -0400
+@@ -2185,7 +2185,12 @@
+
+ # Initialize the game module
+ pygame.display.init()
+- pygame.mixer.init()
++ try:
++ pygame.mixer.init()
++ except:
++ print "error on pygame.mixer.init() inside setup_everything():"
++ print sys.exc_info()[0],":",sys.exc_info()[1]
++ print "...ignoring it"
+ pygame.font.init()
+ pygame.key.set_repeat(500, 30)
+
Added: packages/trunk/pathological/debian/patches/series
===================================================================
--- packages/trunk/pathological/debian/patches/series (rev 0)
+++ packages/trunk/pathological/debian/patches/series 2009-03-17 16:21:33 UTC (rev 9177)
@@ -0,0 +1,3 @@
+10_makefile.patch
+20_highscores.patch
+30_no_soundcard.patch
Modified: packages/trunk/pathological/debian/rules
===================================================================
--- packages/trunk/pathological/debian/rules 2009-03-17 16:15:54 UTC (rev 9176)
+++ packages/trunk/pathological/debian/rules 2009-03-17 16:21:33 UTC (rev 9177)
@@ -18,17 +18,25 @@
configure: configure-stamp
configure-stamp:
dh_testdir
+
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
touch configure-stamp
-build:
+build: configure-stamp
$(MAKE) docs
clean:
dh_testdir
dh_testroot
+
+ [ ! -f configure-stamp ] || [ ! -f Makefile ] || $(MAKE) clean
+
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+
rm -f configure-stamp
-
- [ ! -f Makefile ] || $(MAKE) clean
+ rm -rf .pc
+ rm -rf .version
dh_clean
More information about the Pkg-games-commits
mailing list