[Python-apps-commits] r1450 - in packages/slingshot/trunk/debian (7 files)

ryanakca-guest at users.alioth.debian.org ryanakca-guest at users.alioth.debian.org
Mon Jun 16 01:39:59 UTC 2008 

    Date: Monday, June 16, 2008 @ 01:39:58
  Author: ryanakca-guest
Revision: 1450

Substituted python2.5 for python in patches, move setup.py to debian/

Added:
  packages/slingshot/trunk/debian/setup.py
Modified:
  packages/slingshot/trunk/debian/changelog
  packages/slingshot/trunk/debian/patches/01_execute_with_python.diff
  packages/slingshot/trunk/debian/patches/03_use_packages.diff
  packages/slingshot/trunk/debian/patches/series
  packages/slingshot/trunk/debian/rules
Deleted:
  packages/slingshot/trunk/debian/patches/02_create_setup.py.diff

Modified: packages/slingshot/trunk/debian/changelog
===================================================================
--- packages/slingshot/trunk/debian/changelog	2008-06-15 23:34:52 UTC (rev 1449)
+++ packages/slingshot/trunk/debian/changelog	2008-06-16 01:39:58 UTC (rev 1450)
@@ -1,16 +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
+  * 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
-    02_create_setup.py.diff
+    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
+    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
+ -- Ryan Kavanagh <ryanakca at kubuntu.org>  Sun, 15 Jun 2008 21:17:28 -0400
 

Modified: packages/slingshot/trunk/debian/patches/01_execute_with_python.diff
===================================================================
--- packages/slingshot/trunk/debian/patches/01_execute_with_python.diff	2008-06-15 23:34:52 UTC (rev 1449)
+++ packages/slingshot/trunk/debian/patches/01_execute_with_python.diff	2008-06-16 01:39:58 UTC (rev 1450)
@@ -1,9 +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
+--- slingshot-0.8.1p.orig/slingshot/slingshot.py	2008-06-15 21:35:16.000000000 -0400
++++ slingshot-0.8.1p/slingshot/slingshot.py	2008-06-15 21:37:40.000000000 -0400
 @@ -1,3 +1,4 @@
-+#!/usr/bin/python2.5
++#!/usr/bin/python
  #    This file is part of Slingshot.
  #
  # Slingshot is a two-dimensional strategy game where two players attempt to shoot one

Deleted: packages/slingshot/trunk/debian/patches/02_create_setup.py.diff
===================================================================
--- packages/slingshot/trunk/debian/patches/02_create_setup.py.diff	2008-06-15 23:34:52 UTC (rev 1449)
+++ packages/slingshot/trunk/debian/patches/02_create_setup.py.diff	2008-06-16 01:39:58 UTC (rev 1450)
@@ -1,40 +0,0 @@
-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

Modified: packages/slingshot/trunk/debian/patches/03_use_packages.diff
===================================================================
--- packages/slingshot/trunk/debian/patches/03_use_packages.diff	2008-06-15 23:34:52 UTC (rev 1449)
+++ packages/slingshot/trunk/debian/patches/03_use_packages.diff	2008-06-16 01:39:58 UTC (rev 1450)
@@ -1,7 +1,7 @@
 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
+--- slingshot-0.8.1p.orig/slingshot/slingshot.py	2008-06-15 21:37:04.000000000 -0400
++++ slingshot-0.8.1p/slingshot/slingshot.py	2008-06-15 21:37:14.000000000 -0400
 @@ -36,12 +36,12 @@
  import sys
  from random import randint
@@ -70,8 +70,8 @@
  		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
+--- slingshot-0.8.1p.orig/slingshot/menu.py	2008-06-15 21:35:15.000000000 -0400
++++ slingshot-0.8.1p/slingshot/menu.py	2008-06-15 21:37:04.000000000 -0400
 @@ -138,7 +138,7 @@
  	
  	def __init__(self):
@@ -92,8 +92,8 @@
  	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
+--- slingshot-0.8.1p.orig/slingshot/particle.py	2008-06-15 21:35:15.000000000 -0400
++++ slingshot-0.8.1p/slingshot/particle.py	2008-06-15 21:37:04.000000000 -0400
 @@ -128,7 +128,7 @@
  
  	def __init__(self, trail_screen):
@@ -112,8 +112,8 @@
 +		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
+--- slingshot-0.8.1p.orig/slingshot/planet.py	2008-06-15 21:35:15.000000000 -0400
++++ slingshot-0.8.1p/slingshot/planet.py	2008-06-15 21:37:04.000000000 -0400
 @@ -39,7 +39,7 @@
  			for p in planets:
  				if self.n == p.get_n():
@@ -125,8 +125,8 @@
  		
 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
+--- slingshot-0.8.1p.orig/slingshot/player.py	2008-06-15 21:35:15.000000000 -0400
++++ slingshot-0.8.1p/slingshot/player.py	2008-06-15 21:37:04.000000000 -0400
 @@ -40,17 +40,17 @@
  		self.shot = False
  		self.attempts = 0
@@ -148,3 +148,9 @@
  			self.rect = pygame.Rect(0,0,40,33)
  			self.rect.midright = (780,randint(100,500))
  			self.color = (132,152,192)
+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 21:37:04.000000000 -0400
+@@ -0,0 +1 @@
++#

Modified: packages/slingshot/trunk/debian/patches/series
===================================================================
--- packages/slingshot/trunk/debian/patches/series	2008-06-15 23:34:52 UTC (rev 1449)
+++ packages/slingshot/trunk/debian/patches/series	2008-06-16 01:39:58 UTC (rev 1450)
@@ -1,3 +1,2 @@
 01_execute_with_python.diff
-02_create_setup.py.diff
 03_use_packages.diff

Modified: packages/slingshot/trunk/debian/rules
===================================================================
--- packages/slingshot/trunk/debian/rules	2008-06-15 23:34:52 UTC (rev 1449)
+++ packages/slingshot/trunk/debian/rules	2008-06-16 01:39:58 UTC (rev 1450)
@@ -9,6 +9,7 @@
 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::
 	# Debian doesn't want scripts ending in .py

Added: packages/slingshot/trunk/debian/setup.py
===================================================================
--- packages/slingshot/trunk/debian/setup.py	                        (rev 0)
+++ packages/slingshot/trunk/debian/setup.py	2008-06-16 01:39:58 UTC (rev 1450)
@@ -0,0 +1,29 @@
+#!/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']
+      )
+

More information about the Python-apps-commits mailing list