Commit fa7878d2 authored by Markus Koschany's avatar Markus Koschany

Debian release 1.1.3-11.

parent ffa17102
pathological (1.1.3-11) UNRELEASED; urgency=low
pathological (1.1.3-11) unstable; urgency=low
* Team upload.
* Remove GenericName field from desktop file (Closes: #641824)
* Switch to 3.0 (quilt) source format and drop quilt dependency
* debian/copyright: fix license path
* Bump debhelper compat level
* Add depends on ${misc:Depends}
* Switch to dh rules.tiny
* Add doc-base registration for html docs
* Bump standards version to 3.9.3 (no changes needed)
-- Evgeniy Dolgikh <marcondream@gmail.com> Sun, 06 May 2012 16:07:16 +0300
[ Evgeniy Dolgikh ]
* Remove GenericName field from desktop file. (Closes: #641824)
* Switch to 3.0 (quilt) source format and drop quilt dependency.
* Bump debhelper compat level to 9, require debhelper >= 9.
* Add depends on ${misc:Depends}.
* Switch to dh rules.tiny.
* Add doc-base registration for html docs.
[ Markus Koschany ]
* Improve watch file and make the extension regex more flexible.
* Bump standards version to 3.9.4, no changes needed.
* debian/control:
- Use canonical Vcs-URI.
- Revert the decision to split the music files in a separate source
package. Do not depend on pathological-music anymore and install the
music from the pathological package again. Use Provides,
Conflicts and Replaces relationship to ensure a smooth upgrade.
- Drop Conflicts on pathological-scores.
- Add python and python-pygame to Build-Depends-Indep.
- Replace python with ${phython:Depends}.
* pathological.desktop: Add Keywords and a comment in German.
* pathological.menu: Add longtitle.
* debian/patches:
- Update 10_makefile.patch and install the music files again.
- Add define-music_pending_song.patch which fixes an exception that was
caused by an uninitialized game variable. (Closes: #705417)
* Add DEP-3 headers to all patches.
* Update debian/copyright to copyright format 1.0.
* debian/rules: Use xz compression and build --with python2.
-- Markus Koschany <apo@gambaru.de> Thu, 02 May 2013 20:21:59 +0200
pathological (1.1.3-10) unstable; urgency=low
......
......@@ -2,18 +2,32 @@ Source: pathological
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Uploaders: Alexander Reichle-Schmehl <tolimar@debian.org>, Barry deFreese <bdefreese@debian.org>
Build-Depends: debhelper (>= 9)
Build-Depends-Indep: netpbm
Standards-Version: 3.9.3
Uploaders:
Alexander Reichle-Schmehl <tolimar@debian.org>,
Barry deFreese <bdefreese@debian.org>
Build-Depends:
debhelper (>= 9)
Build-Depends-Indep:
netpbm,
python,
python-pygame
Standards-Version: 3.9.4
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
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/pathological/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/pathological/
Package: pathological
Architecture: all
Depends: python, python-pygame, pathological-music, ${misc:Depends}
Conflicts: pathological-scores
Depends:
python-pygame,
${misc:Depends},
${python:Depends}
Provides:
pathological-music
Conflicts:
pathological-music
Replaces:
pathological-music
Description: puzzle game involving paths and marbles
Pathological is an enriched clone of the game "Logical" by Rainbow Arts.
To solve a level, fill each wheel with four marbles of matching color.
......
This package was debianized by Joe Wreschnig <piman@debian.org> on
Sat, 19 Jul 2003 13:40:00 -0500.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Pathological
Source: http://pathological.sourceforge.net/
The Debian Games Team took over maintenance of this package
on Fri, 12 Jan 2007 18:01:07 +0100.
Files: *
Copyright: 2003, John-Paul Gignac
License: GPL-2+
It was downloaded from http://pathological.sourceforge.net/
Files: debian/*
Copyright: 2003-2005, Joe Wreschnig <piman@debian.org>
2007,2009 Alexander Schmehl <tolimar@debian.org>
2009, Barry deFreese <bdefreese@debian.org>
2009, Cyril Brulebois, Eddy Petrișor, Gonéri Le Bouder
Ansgar Burchardt
2012, Evgeniy Dolgikh
2013, Markus Koschany <apo@gambaru.de>
License: GPL-2+
Copyright (C) 2003 John-Paul Gignac
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
License: GPL-2+
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
Description: Add docs and clean targets. Fix datadir paths.
From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Date: Thu, 11 Apr 2013 01:16:52 +0200
Subject: 10_makefile
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 @@
---
Makefile | 55 ++++++++++++++++++++++++++++---------------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index dc42b93..432353b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,59 +2,60 @@ DESTDIR =
DATADIR = $(DESTDIR)/usr/share/games/pathological
......@@ -21,14 +27,13 @@ Index: pathological-1.1.3.orig/Makefile
-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)/
cp -r circuits graphics music sounds $(DATADIR)/
rm -f $(DATADIR)/graphics/*.xcf
rm -f $(DATADIR)/sounds/*.orig
......@@ -50,24 +55,23 @@ Index: pathological-1.1.3.orig/Makefile
- mkdir -p $(DESTDIR)/var/games
- cp pathological_scores $(DESTDIR)/var/games
-
+ install -d $(DESTDIR)/usr/share/doc/pathological
+ cp -r html $(DESTDIR)/usr/share/doc/pathological
- # 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
+ install -D -m 644 pathological.xpm $(DESTDIR)/usr/share/pixmaps/pathological.xpm
- 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
+
- mkdir -p $(DESTDIR)/usr/share/doc/pathological
- cp -r html $(DESTDIR)/usr/share/doc/pathological
+# Install the scores file, if it doesn't already exist.
+install-scores:
+ if [ ! -e $(DESTDIR)/var/games/pathological_scores ]; then \
......
Description: Fix handling of high scores file.
From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Date: Thu, 11 Apr 2013 01:16:52 +0200
Subject: 20_highscores
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
---
pathological | 6 +-----
pathological.py | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/pathological b/pathological
index ca356b3..8a77cb7 100755
--- a/pathological
+++ b/pathological
@@ -32,8 +32,4 @@ done
cd /usr/share/games/pathological
-if [ -z "$scoresfile" ]; then
- scoresfile=/var/games/pathological_scores
-fi
-
-exec ./pathological.py $options $scoresfile
+exec ./pathological.py $options
diff --git a/pathological.py b/pathological.py
index 5c15009..d86c6ca 100755
--- a/pathological.py
+++ b/pathological.py
@@ -1,6 +1,8 @@
#!/usr/bin/python
+# -*- coding: iso-8859-1 -*-
......@@ -13,7 +34,7 @@ Index: pathological-1.1.3.orig/pathological.py
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 @@
@@ -22,7 +24,7 @@ import os, pygame, random, time, math, re, sys, md5
from pygame.locals import *
# Parse the command line
......@@ -22,7 +43,7 @@ Index: pathological-1.1.3.orig/pathological.py
screenshot = 0
fullscreen = 0
colorblind = 0
@@ -51,7 +53,7 @@
@@ -51,7 +53,7 @@ else:
# The location of the setgid script for writing highscores
# This script is only used if the highscores file is not writable directly
......@@ -31,7 +52,7 @@ Index: pathological-1.1.3.orig/pathological.py
# Game constants
wheel_steps = 9
@@ -1562,7 +1564,7 @@
@@ -1562,7 +1564,7 @@ def popdown( popup_rc):
pygame.display.update( popup_rc[1])
class Game:
......@@ -40,7 +61,7 @@ Index: pathological-1.1.3.orig/pathological.py
self.screen = screen
self.circuit = circuit
self.highscores = highscores
@@ -1578,7 +1580,7 @@
@@ -1578,7 +1580,7 @@ class Game:
f.close()
self.numlevels = j / vert_tiles
......@@ -49,7 +70,7 @@ Index: pathological-1.1.3.orig/pathological.py
self.score = 0
self.lives = initial_lives
@@ -1829,6 +1831,7 @@
@@ -1829,6 +1831,7 @@ def get_name( screen, font, cursor_box, backcol, forecol):
class IntroScreen:
menu = ("Start Game", "High Scores", "Fullscreen:", "Music:",
"Sound Effects:", "Quit Game")
......@@ -57,7 +78,7 @@ Index: pathological-1.1.3.orig/pathological.py
menu_width = 240
menu_pos = ((800 - menu_width)/2, 145)
menu_font_height = 32
@@ -1914,6 +1917,14 @@
@@ -1914,6 +1917,14 @@ class IntroScreen:
self.screen.blit( menu_option, (self.menu_pos[0], y))
y += self.menu_font_height
......@@ -72,7 +93,7 @@ Index: pathological-1.1.3.orig/pathological.py
if fullscreen: offon = 'On'
else: offon = 'Off'
offon = self.menu_font.render( offon, 1, self.menu_color)
@@ -1966,6 +1977,15 @@
@@ -1966,6 +1977,15 @@ class IntroScreen:
self.curpage = 1
self.draw_menu()
......@@ -88,7 +109,7 @@ Index: pathological-1.1.3.orig/pathological.py
def do(self, show_highscores=0):
self.scroller_pos = -self.scroller_rect[2]
@@ -2028,7 +2048,15 @@
@@ -2028,7 +2048,15 @@ class IntroScreen:
self.draw_menu()
elif event.key == K_SPACE or event.key == K_RETURN:
rc = self.menu_select( self.menu_cursor)
......@@ -105,7 +126,7 @@ Index: pathological-1.1.3.orig/pathological.py
continue
elif event.type is MOUSEBUTTONDOWN:
if self.curpage == 1:
@@ -2044,9 +2072,8 @@
@@ -2044,9 +2072,8 @@ class IntroScreen:
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
......@@ -116,7 +137,7 @@ Index: pathological-1.1.3.orig/pathological.py
pygame.display.update( self.dirty_rects)
@@ -2057,7 +2084,7 @@
@@ -2057,7 +2084,7 @@ class IntroScreen:
# 1 - Unknown option
def menu_select( self, i):
if i == 0:
......@@ -125,7 +146,7 @@ Index: pathological-1.1.3.orig/pathological.py
elif i == 1:
play_sound( menu_select)
self.go_to_highscores()
@@ -2075,7 +2102,7 @@
@@ -2075,7 +2102,7 @@ class IntroScreen:
self.draw_menu()
elif i == 5:
return -1
......@@ -134,7 +155,7 @@ Index: pathological-1.1.3.orig/pathological.py
hs_font_height = 24
hs_width = 320
@@ -2157,7 +2184,10 @@
@@ -2157,7 +2184,10 @@ def setup_everything():
pygame.mixer.pre_init(44100,-16,1,4096)
# Initialize the game module
......@@ -146,7 +167,7 @@ Index: pathological-1.1.3.orig/pathological.py
if not pygame.font: print 'Warning, fonts disabled'
if not pygame.mixer: print 'Warning, sound disabled'
@@ -2189,7 +2219,8 @@
@@ -2189,7 +2219,8 @@ while 1:
if rc < 0: break # Handle the QUIT message
......@@ -156,17 +177,3 @@ Index: pathological-1.1.3.orig/pathological.py
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
Description: Load game even if no soundcard is detected. (BTS #461330).
From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Date: Thu, 11 Apr 2013 01:16:52 +0200
Subject: 30_no_soundcard
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 @@
---
pathological.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pathological.py b/pathological.py
index d86c6ca..e8b1f84 100755
--- a/pathological.py
+++ b/pathological.py
@@ -2185,7 +2185,12 @@ def setup_everything():
# Initialize the game module
pygame.display.init()
......
#Description: Patch to run with pygame 1.8.1.
Index: pathological-1.1.3.orig/pathological.py
From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Date: Thu, 11 Apr 2013 01:16:52 +0200
Subject: 40_pygame_181
===================================================================
--- pathological-1.1.3.orig.orig/pathological.py 2009-04-15 10:50:11.000000000 -0400
+++ pathological-1.1.3.orig/pathological.py 2009-04-15 10:50:56.000000000 -0400
@@ -169,6 +169,7 @@
---
pathological.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pathological.py b/pathological.py
index e8b1f84..1bf5b3d 100755
--- a/pathological.py
+++ b/pathological.py
@@ -169,6 +169,7 @@ def start_music(name, volume=-1):
if not pygame.mixer or not pygame.mixer.music:
print "Background music not available."
return
......
From: Markus Koschany <apo@gambaru.de>
Date: Mon, 15 Apr 2013 00:27:06 +0200
Subject: define music_pending_song
Bug: http://bugs.debian.org/705417
Taken from the Gentoo distribution, pathological-1.1.3-music-py.patch.
The original patch was presumably created by "vapier". See also
http://bugs.gentoo.org/109272
---
pathological.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pathological.py b/pathological.py
index e8b1f84..8ccadc6 100755
--- a/pathological.py
+++ b/pathological.py
@@ -30,6 +30,7 @@ fullscreen = 0
colorblind = 0
sound_on = 1
music_on = 1
+music_pending_song = 0
for arg in sys.argv[1:]:
if arg == '-s':
screenshot = 1
@@ -196,7 +197,7 @@ def toggle_sound():
sound_on = sound_on ^ 1
def toggle_music():
- global music_on
+ global music_pending_song, music_on
music_on = music_on ^ 1
if music_on:
if music_pending_song:
......@@ -2,3 +2,4 @@
20_highscores.patch
30_no_soundcard.patch
40_pygame_181.patch
define-music_pending_song.patch
......@@ -3,5 +3,7 @@ Type=Application
Name=Pathological
Icon=pathological
Comment=Solve puzzles involving paths and marbles
Comment[de]=Rätselspiel mit Wegen und Murmeln
Exec=pathological
Categories=Game;LogicGame;
Keywords=game;logic;marbles;puzzle;
Document: pathological
Title: How to Play Pathological
Abstract: This document explains how to play Pathological puzzle game.
Abstract: This document explains how to play the puzzle game Pathological.
Section: Games/Puzzles
Format: HTML
......
?package(pathological):needs="X11" section="Games/Puzzles"\
title="Pathological" command="/usr/games/pathological"\
?package(pathological):needs="X11" \
section="Games/Puzzles" \
title="Pathological" \
longtitle="Pathological - puzzle game involving paths and marbles" \
command="/usr/games/pathological" \
icon="/usr/share/pixmaps/pathological.xpm"
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
%:
dh $@
dh $@ --with python2
override_dh_auto_install:
$(MAKE) install-indep DESTDIR=$(CURDIR)/debian/pathological
override_dh_builddeb:
dh_builddeb -- -Zxz
version=3
http://sf.net/pathological/pathological-(\d+.+)\.tar\.gz
http://sf.net/pathological/pathological-(\d+.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment