[Python-apps-commits] r1456 - in packages/slingshot/trunk/debian (9 files)
ryanakca-guest at users.alioth.debian.org
ryanakca-guest at users.alioth.debian.org
Tue Jun 17 00:28:38 UTC 2008
Date: Tuesday, June 17, 2008 @ 00:28:37
Author: ryanakca-guest
Revision: 1456
* Removed the setup.py file, use dh_install instead
* Add a desktop file
* Move some Build-Depends to Build-Depends-Indep
* Install the data files to the appropriate directory
(under /usr/share/games/slingshot/)
* Drop the inclusion of upstream's Readme.txt
Added:
packages/slingshot/trunk/debian/slingshot.desktop
packages/slingshot/trunk/debian/slingshot.install
Modified:
packages/slingshot/trunk/debian/changelog
packages/slingshot/trunk/debian/control
packages/slingshot/trunk/debian/dirs
packages/slingshot/trunk/debian/patches/03_use_packages.diff
packages/slingshot/trunk/debian/rules
Deleted:
packages/slingshot/trunk/debian/docs
packages/slingshot/trunk/debian/setup.py
Modified: packages/slingshot/trunk/debian/changelog
===================================================================
--- packages/slingshot/trunk/debian/changelog 2008-06-16 21:55:37 UTC (rev 1455)
+++ packages/slingshot/trunk/debian/changelog 2008-06-17 00:28:37 UTC (rev 1456)
@@ -4,13 +4,12 @@
* Upstream didn't add a #!/usr/bin/python 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
- debian/setup.py
* 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
+ * Created a desktop file
- -- Ryan Kavanagh <ryanakca at kubuntu.org> Sun, 15 Jun 2008 21:17:28 -0400
+ -- Ryan Kavanagh <ryanakca at kubuntu.org> Mon, 16 Jun 2008 19:12:53 -0400
Modified: packages/slingshot/trunk/debian/control
===================================================================
--- packages/slingshot/trunk/debian/control 2008-06-16 21:55:37 UTC (rev 1455)
+++ packages/slingshot/trunk/debian/control 2008-06-17 00:28:37 UTC (rev 1456)
@@ -3,18 +3,18 @@
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)
+Build-Depends: cdbs, debhelper (>= 5), quilt
+Build-Depends-Indep: python (>= 2.5), python-support (>= 0.5.3)
Standards-Version: 3.8.0
Homepage: http://www.slingshot-game.org
-XS-Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/slingshot/
-XS-Vcs-Browse: http://svn.debian.org/wsvn/python-apps/packages/slingshot/
+Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/slingshot/
+Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/slingshot/
Package: slingshot
Architecture: all
XB-Python-Version: ${python:Versions}
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, \
- python (>= 2.5), python-pygame (>= 1.7.1)
+ 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
Modified: packages/slingshot/trunk/debian/dirs
===================================================================
--- packages/slingshot/trunk/debian/dirs 2008-06-16 21:55:37 UTC (rev 1455)
+++ packages/slingshot/trunk/debian/dirs 2008-06-17 00:28:37 UTC (rev 1456)
@@ -1 +1,5 @@
usr/games
+usr/share/python-support/slingshot/slingshot
+usr/share/games/applications
+usr/share/games/slingshot
+usr/share/games/slingshot/data
Deleted: packages/slingshot/trunk/debian/docs
===================================================================
--- packages/slingshot/trunk/debian/docs 2008-06-16 21:55:37 UTC (rev 1455)
+++ packages/slingshot/trunk/debian/docs 2008-06-17 00:28:37 UTC (rev 1456)
@@ -1 +0,0 @@
-Readme.txt
Modified: packages/slingshot/trunk/debian/patches/03_use_packages.diff
===================================================================
--- packages/slingshot/trunk/debian/patches/03_use_packages.diff 2008-06-16 21:55:37 UTC (rev 1455)
+++ packages/slingshot/trunk/debian/patches/03_use_packages.diff 2008-06-17 00:28:37 UTC (rev 1456)
@@ -28,9 +28,9 @@
- 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)
++ Settings.font = pygame.font.Font("/usr/share/games/slingshot/data/FreeSansBold.ttf", 14)
++ Settings.menu_font = pygame.font.Font("/usr/share/games/slingshot/data/FreeSansBold.ttf", Settings.MENU_FONT_SIZE)
++ Settings.round_font = pygame.font.Font("/usr/share/games/slingshot/data/FreeSansBold.ttf", 100)
def __init__(self):
pygame.display.init()
@@ -39,23 +39,23 @@
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))
++ icon, rect = load_image("/usr/share/games/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.particle_image10, Settings.particle_image10_rect = load_image("/usr/share/games/slingshot/data/explosion-10.png", (0,0,0))
++ Settings.particle_image5, Settings.particle_image5_rect = load_image("/usr/share/games/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))
++ Settings.menu_background, Settings.menu_rect = load_image("/usr/share/games/slingshot/data/menu.png", (0,0,0))
++ Settings.box, rect = load_image("/usr/share/games/slingshot/data/box.png", (0,0,0))
++ Settings.tick, rect = load_image("/usr/share/games/slingshot/data/tick.png", (0,0,0))
++ Settings.tick_inactive, rect = load_image("/usr/share/games/slingshot/data/tick_inactive.png", (0,0,0))
self.trail_screen = pygame.Surface(self.screen.get_size())
self.trail_screen = self.trail_screen.convert()
@@ -64,7 +64,7 @@
#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.background, r = load_image("/usr/share/games/slingshot/data/backdrop.png")
self.players = (Dummy(), Player(1), Player(2))
self.playersprites = pygame.sprite.RenderPlain((self.players[1], self.players[2]))
@@ -77,7 +77,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.img, rect = load_image("/usr/share/games/slingshot/data/help.png", (0,0,0))
self.choice = ""
def select(self):
@@ -86,7 +86,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.img, rect = load_image("/usr/share/games/slingshot/data/welcome.png", (0,0,0))
self.choice = ""
def select(self):
@@ -99,7 +99,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.image, self.rect = load_image("/usr/share/games/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)
@@ -119,7 +119,7 @@
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)
++ filename = "/usr/share/games/slingshot/data/planet_%d.png" %(self.n)
self.orig, self.rect = load_image(filename, (0,0,0))
self.image = self.orig
@@ -132,19 +132,19 @@
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))
++ self.exp, self.rect = load_image("/usr/share/games/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.orig, self.rect = load_image("/usr/share/games/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.orig, self.rect = load_image("/usr/share/games/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)
Modified: packages/slingshot/trunk/debian/rules
===================================================================
--- packages/slingshot/trunk/debian/rules 2008-06-16 21:55:37 UTC (rev 1455)
+++ packages/slingshot/trunk/debian/rules 2008-06-17 00:28:37 UTC (rev 1456)
@@ -1,17 +1,17 @@
#!/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
-DEB_PYTHON_SETUP_CMD := debian/setup.py
-install/slingshot::
+binary-post-install/slingshot::
# Debian doesn't want scripts ending in .py
mv $(CURDIR)/debian/slingshot/usr/games/slingshot.py \
$(CURDIR)/debian/slingshot/usr/games/slingshot
+ dh_pysupport
+ # We don't need the graphics and fonts to be executable
+ chmod 644 $(CURDIR)/debian/slingshot/usr/share/games/slingshot/data/*
+ install --mode=644 $(CURDIR)/debian/slingshot.desktop \
+ $(CURDIR)/debian/slingshot/usr/share/games/applications/
Deleted: packages/slingshot/trunk/debian/setup.py
===================================================================
--- packages/slingshot/trunk/debian/setup.py 2008-06-16 21:55:37 UTC (rev 1455)
+++ packages/slingshot/trunk/debian/setup.py 2008-06-17 00:28:37 UTC (rev 1456)
@@ -1,29 +0,0 @@
-#!/usr/bin/python
-"""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']
- )
-
Added: packages/slingshot/trunk/debian/slingshot.desktop
===================================================================
--- packages/slingshot/trunk/debian/slingshot.desktop (rev 0)
+++ packages/slingshot/trunk/debian/slingshot.desktop 2008-06-17 00:28:37 UTC (rev 1456)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Slingshot
+Name[xx]=xxslingshotxx
+Exec=slingshot
+Icon=slingshot
+Type=Application
+GenericName=2D space shooting game with gravity
+GenericName[fr]=Jeu d'espace 2D avec gravité
+Categories=Game;StrategyGame;
Added: packages/slingshot/trunk/debian/slingshot.install
===================================================================
--- packages/slingshot/trunk/debian/slingshot.install (rev 0)
+++ packages/slingshot/trunk/debian/slingshot.install 2008-06-17 00:28:37 UTC (rev 1456)
@@ -0,0 +1,3 @@
+slingshot/slingshot.py usr/games
+slingshot/*.py usr/share/python-support/slingshot/slingshot
+slingshot/data/* usr/share/games/slingshot/data
More information about the Python-apps-commits
mailing list