[Python-apps-commits] r1448 - in packages/slingshot/trunk (18 files)
ryanakca-guest at users.alioth.debian.org
ryanakca-guest at users.alioth.debian.org
Sun Jun 15 23:18:13 UTC 2008
Date: Sunday, June 15, 2008 @ 23:18:11
Author: ryanakca-guest
Revision: 1448
[svn-inject] Applying Debian modifications to trunk
Added:
packages/slingshot/trunk/debian/
packages/slingshot/trunk/debian/changelog
packages/slingshot/trunk/debian/compat
packages/slingshot/trunk/debian/control
packages/slingshot/trunk/debian/copyright
packages/slingshot/trunk/debian/dirs
packages/slingshot/trunk/debian/docs
packages/slingshot/trunk/debian/menu
packages/slingshot/trunk/debian/patches/
packages/slingshot/trunk/debian/patches/01_execute_with_python.diff
packages/slingshot/trunk/debian/patches/02_create_setup.py.diff
packages/slingshot/trunk/debian/patches/03_use_packages.diff
packages/slingshot/trunk/debian/patches/series
packages/slingshot/trunk/debian/pycompat
packages/slingshot/trunk/debian/pyversions
packages/slingshot/trunk/debian/rules
packages/slingshot/trunk/debian/slingshot.1
packages/slingshot/trunk/debian/watch
Property changes on: packages/slingshot/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/slingshot/trunk/debian/changelog
===================================================================
--- packages/slingshot/trunk/debian/changelog (rev 0)
+++ packages/slingshot/trunk/debian/changelog 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,16 @@
+slingshot (0.8.1p-1) unstable; urgency=low
+
+ * Initial release (Closes: #485522)
+ * Upstream didn't add a #!/usr/bin/python2.5 line to slingshot.py. Users
+ can't be expected to know that they should run `python
+ /usr/games/slingshot`, so it is added in 01_execute_with_python.diff
+ * Upstream doesn't supply a setup.py file, so I created one. See
+ 02_create_setup.py.diff
+ * Upstream expected slingshot.py to be run from the same directory as
+ the libraries/modules. However, this isn't appropriate for a system
+ wide installation. I patched the sources to use the slingshot module
+ package instead of files in slingshot.py's
+ directory. 03_use_packages.diff
+
+ -- Ryan Kavanagh <ryanakca at kubuntu.org> Sun, 15 Jun 2008 12:33:56 -0400
+
Added: packages/slingshot/trunk/debian/compat
===================================================================
--- packages/slingshot/trunk/debian/compat (rev 0)
+++ packages/slingshot/trunk/debian/compat 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1 @@
+5
Added: packages/slingshot/trunk/debian/control
===================================================================
--- packages/slingshot/trunk/debian/control (rev 0)
+++ packages/slingshot/trunk/debian/control 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,26 @@
+Source: slingshot
+Section: games
+Priority: extra
+Maintainer: Ryan Kavanagh <ryanakca at kubuntu.org>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, python (>= 2.5), \
+ python-support (>= 0.5.3)
+Standards-Version: 3.8.0
+Homepage: http://www.slingshot-game.org
+
+Package: slingshot
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, \
+ python (>= 2.5), python-pygame (>= 1.7.1)
+Description: simple 2D shooting strategy game set in space, with gravity
+ Slingshot is a two dimensional, turn based simulation-strategy game
+ set in the gravity fields of several planets. It is a highly
+ addictive game, and never the same from round to round due to its
+ randomly generated playing fields.
+ .
+ It is a deceptively simple game, the goal is to shoot the other
+ spacecraft through the field of planets, but their gravity makes it
+ tricky. The effects of the gravity mean that although it is easy to
+ learn how to play, and to enjoy playing, it could take a lifetime to
+ thoroughly master.
Added: packages/slingshot/trunk/debian/copyright
===================================================================
--- packages/slingshot/trunk/debian/copyright (rev 0)
+++ packages/slingshot/trunk/debian/copyright 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,39 @@
+This package was debianized by Ryan Kavanagh <ryanakca at kubuntu.org> on
+Sat, 14 Jun 2008 21:55:24 -0400.
+
+It was downloaded from http://www.slingshot-game.org/
+
+Upstream Authors:
+
+ Jonathan Musther <jon at slingshot-game.org>
+ Bart Mak
+
+Copyright:
+
+ Slingshot program:
+ Copyright (C) 2007 Jonathan Musther
+ Copyright (C) 2007 Bart Mak
+ slingshot/data/FreeSansBold.ttf:
+ Copyright (C) 2002, 2003, 2005, 2008 Free Software Foundation
+
+License:
+
+ This package 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 package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2008, Ryan Kavanagh <ryanakca at kubuntu.org> and
+is licensed under the GPL, see above.
Added: packages/slingshot/trunk/debian/dirs
===================================================================
--- packages/slingshot/trunk/debian/dirs (rev 0)
+++ packages/slingshot/trunk/debian/dirs 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1 @@
+usr/games
Added: packages/slingshot/trunk/debian/docs
===================================================================
--- packages/slingshot/trunk/debian/docs (rev 0)
+++ packages/slingshot/trunk/debian/docs 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1 @@
+Readme.txt
Added: packages/slingshot/trunk/debian/menu
===================================================================
--- packages/slingshot/trunk/debian/menu (rev 0)
+++ packages/slingshot/trunk/debian/menu 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,2 @@
+?package(slingshot):needs="X11" section="Games/Strategy"\
+ title="slingshot" command="/usr/games/slingshot"
Added: packages/slingshot/trunk/debian/patches/01_execute_with_python.diff
===================================================================
--- packages/slingshot/trunk/debian/patches/01_execute_with_python.diff (rev 0)
+++ packages/slingshot/trunk/debian/patches/01_execute_with_python.diff 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,9 @@
+Index: slingshot-0.8.1p/slingshot/slingshot.py
+===================================================================
+--- slingshot-0.8.1p.orig/slingshot/slingshot.py 2007-07-13 15:57:05.000000000 -0400
++++ slingshot-0.8.1p/slingshot/slingshot.py 2008-06-15 12:30:06.000000000 -0400
+@@ -1,3 +1,4 @@
++#!/usr/bin/python2.5
+ # This file is part of Slingshot.
+ #
+ # Slingshot is a two-dimensional strategy game where two players attempt to shoot one
Added: packages/slingshot/trunk/debian/patches/02_create_setup.py.diff
===================================================================
--- packages/slingshot/trunk/debian/patches/02_create_setup.py.diff (rev 0)
+++ packages/slingshot/trunk/debian/patches/02_create_setup.py.diff 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,40 @@
+Index: slingshot-0.8.1p/setup.py
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ slingshot-0.8.1p/setup.py 2008-06-15 13:39:44.000000000 -0400
+@@ -0,0 +1,29 @@
++#!/usr/bin/python2.5
++"""simple 2D shooting strategy game set in space, with gravity"""
++
++import os
++from distutils.core import setup
++
++DISTUTILS_DEBUG='debug'
++
++setup(name='slingshot',
++ version='0.8.1p',
++ description="simple 2D shooting strategy game set in space, with gravity",
++ long_description="Slingshot is a two dimensional, turn based,"+
++ "simulation-strategy game set in the gravity fields of several planets."+
++ "It is a highly addictive game, and never the same from round to round"+
++ "due to its randomly generated playing fields. It is a deceptively"+
++ "simple game, the goal is to shoot the other spacecraft through the"+
++ "field of planets, but their gravity makes it tricky. The effects of"+
++ "the gravity mean that although it's easy to learn how to play, and to"+
++ "enjoy playing, it could take a lifetime to thoroughly master.",
++ author='Jonathan Musther and Bart Mak',
++ author_email='jon at slingshot-game.org',
++ url='http://www.slingshot-game.org/',
++ license='GPL',
++ packages=['slingshot'],
++ package_dir={'slingshot': 'slingshot'},
++ package_data={'slingshot': ['data/*png', 'data/FreeSansBold.ttf']},
++ scripts=['slingshot/slingshot.py']
++ )
++
+Index: slingshot-0.8.1p/slingshot/__init__.py
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ slingshot-0.8.1p/slingshot/__init__.py 2008-06-15 13:39:36.000000000 -0400
+@@ -0,0 +1 @@
++#!/usr/bin/python2.5
Added: packages/slingshot/trunk/debian/patches/03_use_packages.diff
===================================================================
--- packages/slingshot/trunk/debian/patches/03_use_packages.diff (rev 0)
+++ packages/slingshot/trunk/debian/patches/03_use_packages.diff 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,150 @@
+Index: slingshot-0.8.1p/slingshot/slingshot.py
+===================================================================
+--- slingshot-0.8.1p.orig/slingshot/slingshot.py 2008-06-15 13:53:23.000000000 -0400
++++ slingshot-0.8.1p/slingshot/slingshot.py 2008-06-15 13:53:23.000000000 -0400
+@@ -36,12 +36,12 @@
+ import sys
+ from random import randint
+
+-from settings import *
+-from general import *
+-from player import *
+-from planet import *
+-from particle import *
+-from menu import *
++from slingshot.settings import *
++from slingshot.general import *
++from slingshot.player import *
++from slingshot.planet import *
++from slingshot.particle import *
++from slingshot.menu import *
+
+ class Blackhole(object):
+ softspace = 0
+@@ -54,9 +54,9 @@
+ particle_image_rect = None
+
+ pygame.font.init()
+- Settings.font = pygame.font.Font("data/FreeSansBold.ttf", 14)
+- Settings.menu_font = pygame.font.Font("data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
+- Settings.round_font = pygame.font.Font("data/FreeSansBold.ttf", 100)
++ Settings.font = pygame.font.Font("/usr/share/python-support/slingshot/slingshot/data/FreeSansBold.ttf", 14)
++ Settings.menu_font = pygame.font.Font("/usr/share/python-support/slingshot/slingshot/data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
++ Settings.round_font = pygame.font.Font("/usr/share/python-support/slingshot/slingshot/data/FreeSansBold.ttf", 100)
+
+ def __init__(self):
+ pygame.display.init()
+@@ -64,17 +64,17 @@
+ self.clock = pygame.time.Clock()
+
+ self.screen = pygame.display.set_mode((800, 600))
+- icon, rect = load_image("data/icon64x64.png", (0,0,0))
++ icon, rect = load_image("/usr/share/python-support/slingshot/slingshot/data/icon64x64.png", (0,0,0))
+ pygame.display.set_icon(icon)
+ pygame.display.set_caption('Slingshot')
+
+- Settings.particle_image10, Settings.particle_image10_rect = load_image("data/explosion-10.png", (0,0,0))
+- Settings.particle_image5, Settings.particle_image5_rect = load_image("data/explosion-5.png", (0,0,0))
++ Settings.particle_image10, Settings.particle_image10_rect = load_image("/usr/share/python-support/slingshot/slingshot/data/explosion-10.png", (0,0,0))
++ Settings.particle_image5, Settings.particle_image5_rect = load_image("/usr/share/python-support/slingshot/slingshot/data/explosion-5.png", (0,0,0))
+
+- Settings.menu_background, Settings.menu_rect = load_image("data/menu.png", (0,0,0))
+- Settings.box, rect = load_image("data/box.png", (0,0,0))
+- Settings.tick, rect = load_image("data/tick.png", (0,0,0))
+- Settings.tick_inactive, rect = load_image("data/tick_inactive.png", (0,0,0))
++ Settings.menu_background, Settings.menu_rect = load_image("/usr/share/python-support/slingshot/slingshot/data/menu.png", (0,0,0))
++ Settings.box, rect = load_image("/usr/share/python-support/slingshot/slingshot/data/box.png", (0,0,0))
++ Settings.tick, rect = load_image("/usr/share/python-support/slingshot/slingshot/data/tick.png", (0,0,0))
++ Settings.tick_inactive, rect = load_image("/usr/share/python-support/slingshot/slingshot/data/tick_inactive.png", (0,0,0))
+
+ self.trail_screen = pygame.Surface(self.screen.get_size())
+ self.trail_screen = self.trail_screen.convert()
+@@ -90,7 +90,7 @@
+ self.dim_screen = self.dim_screen.convert_alpha()
+ #self.dim_screen.fill((0,0,0))
+
+- self.background, r = load_image("data/backdrop.png")
++ self.background, r = load_image("/usr/share/python-support/slingshot/slingshot/data/backdrop.png")
+
+ self.players = (Dummy(), Player(1), Player(2))
+ self.playersprites = pygame.sprite.RenderPlain((self.players[1], self.players[2]))
+Index: slingshot-0.8.1p/slingshot/menu.py
+===================================================================
+--- slingshot-0.8.1p.orig/slingshot/menu.py 2008-06-15 13:54:04.000000000 -0400
++++ slingshot-0.8.1p/slingshot/menu.py 2008-06-15 13:54:10.000000000 -0400
+@@ -138,7 +138,7 @@
+
+ def __init__(self):
+ Menu.__init__(self, "", False)
+- self.img, rect = load_image("data/help.png", (0,0,0))
++ self.img, rect = load_image("/usr/share/python-support/slingshot/slingshot/data/help.png", (0,0,0))
+ self.choice = ""
+
+ def select(self):
+@@ -151,7 +151,7 @@
+
+ def __init__(self):
+ Menu.__init__(self, "")
+- self.img, rect = load_image("data/welcome.png", (0,0,0))
++ self.img, rect = load_image("/usr/share/python-support/slingshot/slingshot/data/welcome.png", (0,0,0))
+ self.choice = ""
+
+ def select(self):
+Index: slingshot-0.8.1p/slingshot/particle.py
+===================================================================
+--- slingshot-0.8.1p.orig/slingshot/particle.py 2008-06-15 13:53:51.000000000 -0400
++++ slingshot-0.8.1p/slingshot/particle.py 2008-06-15 13:54:01.000000000 -0400
+@@ -128,7 +128,7 @@
+
+ def __init__(self, trail_screen):
+ Particle.__init__(self) #call Sprite intializer
+- self.image, self.rect = load_image("data/shot.png", (0,0,0))
++ self.image, self.rect = load_image("/usr/share/python-support/slingshot/slingshot/data/shot.png", (0,0,0))
+ self.rect = self.image.get_rect()
+ self.trail_screen = trail_screen
+ self.last_pos = (0.0, 0.0)
+@@ -182,4 +182,4 @@
+ return self.image
+
+ def get_score(self):
+- return self.score
+\ No newline at end of file
++ return self.score
+Index: slingshot-0.8.1p/slingshot/planet.py
+===================================================================
+--- slingshot-0.8.1p.orig/slingshot/planet.py 2008-06-15 13:54:25.000000000 -0400
++++ slingshot-0.8.1p/slingshot/planet.py 2008-06-15 13:54:35.000000000 -0400
+@@ -39,7 +39,7 @@
+ for p in planets:
+ if self.n == p.get_n():
+ unique = False
+- filename = "data/planet_%d.png" %(self.n)
++ filename = "/usr/share/python-support/slingshot/slingshot/data/planet_%d.png" %(self.n)
+ self.orig, self.rect = load_image(filename, (0,0,0))
+ self.image = self.orig
+
+Index: slingshot-0.8.1p/slingshot/player.py
+===================================================================
+--- slingshot-0.8.1p.orig/slingshot/player.py 2008-06-15 13:54:14.000000000 -0400
++++ slingshot-0.8.1p/slingshot/player.py 2008-06-15 13:54:21.000000000 -0400
+@@ -40,17 +40,17 @@
+ self.shot = False
+ self.attempts = 0
+ self.e = 0
+- self.exp, self.rect = load_image("data/explosion.png", (0,0,0))
++ self.exp, self.rect = load_image("/usr/share/python-support/slingshot/slingshot/data/explosion.png", (0,0,0))
+
+ if self.player == 1:
+ self.angle = 90
+- self.orig, self.rect = load_image("data/red_ship.png", (0,0,0))
++ self.orig, self.rect = load_image("/usr/share/python-support/slingshot/slingshot/data/red_ship.png", (0,0,0))
+ self.rect = pygame.Rect(0,0,40,33)
+ self.rect.midleft = (20,randint(100,500))
+ self.color = (209,170,133)
+ elif self.player == 2:
+ self.angle = 270
+- self.orig, self.rect = load_image("data/blue_ship.png", (0,0,0))
++ self.orig, self.rect = load_image("/usr/share/python-support/slingshot/slingshot/data/blue_ship.png", (0,0,0))
+ self.rect = pygame.Rect(0,0,40,33)
+ self.rect.midright = (780,randint(100,500))
+ self.color = (132,152,192)
Added: packages/slingshot/trunk/debian/patches/series
===================================================================
--- packages/slingshot/trunk/debian/patches/series (rev 0)
+++ packages/slingshot/trunk/debian/patches/series 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,3 @@
+01_execute_with_python.diff
+02_create_setup.py.diff
+03_use_packages.diff
Added: packages/slingshot/trunk/debian/pycompat
===================================================================
--- packages/slingshot/trunk/debian/pycompat (rev 0)
+++ packages/slingshot/trunk/debian/pycompat 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1 @@
+2
Added: packages/slingshot/trunk/debian/pyversions
===================================================================
--- packages/slingshot/trunk/debian/pyversions (rev 0)
+++ packages/slingshot/trunk/debian/pyversions 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1 @@
+2.5-
Added: packages/slingshot/trunk/debian/rules
===================================================================
--- packages/slingshot/trunk/debian/rules (rev 0)
+++ packages/slingshot/trunk/debian/rules 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+DEB_PYTHON_SYSTEM = pysupport
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_COMPRESS_EXCLUDE := .py
+DEB_INSTALL_MANPAGES_slingshot := debian/slingshot.1
+DEB_PYTHON_COMPILE_VERSION = 2.5
+DEB_PYTHON_INSTALL_ARGS_ALL := --install-scripts=/usr/games
+
+install/slingshot::
+ # Debian doesn't want scripts ending in .py
+ mv $(CURDIR)/debian/slingshot/usr/games/slingshot.py \
+ $(CURDIR)/debian/slingshot/usr/games/slingshot
Property changes on: packages/slingshot/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/slingshot/trunk/debian/slingshot.1
===================================================================
--- packages/slingshot/trunk/debian/slingshot.1 (rev 0)
+++ packages/slingshot/trunk/debian/slingshot.1 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,51 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH SLINGSHOT 1 "June 14, 2008"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+slingshot \- simple 2D shooting strategy game set in space, with gravity
+.SH SYNOPSIS
+.B slingshot
+.SH DESCRIPTION
+This manual page documents briefly the
+.B slingshot
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBslingshot\fP is a two dimensional, turn based simulation-strategy
+game set in the gravity fields of several planets. It is a highly
+addictive game, and never the same from round to round due to its
+randomly generated playing fields.
+.PP
+It is a deceptively simple game, the goal is to shoot the other
+spacecraft through the field of planets, but their gravity makes it
+tricky. The effects of the gravity mean that although it's easy to
+learn how to play, and to enjoy playing, it could take a lifetime to
+thoroughly master.
+.PP
+In order to hit your opponent, you can rotate you ship to aim in any
+direction, and you can change the power with which your projectile is
+launched - the initial speed at which it flies.
+.SH OPTIONS
+This program has no command line options.
+.br
+.SH AUTHOR
+slingshot was written by Jonathan Musther and Bart Mak.
+.PP
+This manual page was written by Ryan Kavanagh <ryanakca at kubuntu.org>,
+for the Debian project (but may be used by others).
Added: packages/slingshot/trunk/debian/watch
===================================================================
--- packages/slingshot/trunk/debian/watch (rev 0)
+++ packages/slingshot/trunk/debian/watch 2008-06-15 23:18:11 UTC (rev 1448)
@@ -0,0 +1,6 @@
+# Compulsory line, this is a version 3 file
+version=3
+
+http://sf.net/slingshot/slingshot-(.*)\.tar\.gz
+
+
More information about the Python-apps-commits
mailing list