[Python-apps-commits] r7733 - in packages/slingshot/trunk/debian (5 files)

[ryanakca-guest at users.alioth.debian.org]

    Date: Sunday, October 30, 2011 @ 15:15:39
  Author: ryanakca-guest
Revision: 7733

Fixes for packaging mistakes in slingshot 0.9-1

Added:
  packages/slingshot/trunk/debian/links
Modified:
  packages/slingshot/trunk/debian/changelog
  packages/slingshot/trunk/debian/control
  packages/slingshot/trunk/debian/patches/01_games_path.diff
  packages/slingshot/trunk/debian/rules

Modified: packages/slingshot/trunk/debian/changelog
===================================================================
--- packages/slingshot/trunk/debian/changelog	2011-10-30 15:12:04 UTC (rev 7732)
+++ packages/slingshot/trunk/debian/changelog	2011-10-30 15:15:39 UTC (rev 7733)
@@ -13,10 +13,13 @@
   * Drop dependency on ttf-freefont, FreeSansBold.ttf is already provided by
     python-pygames
     - Add override for package-contains-broken-symlink
+  * Build dependency on python-support no longer needed, dropped
+  * Bump python build-dep-indep from (>= 2.6) to (>= 2.6.6-3~) for dh's
+    --with python2 support
   * Fix watch file
   * Turn on DM-Upload-Allowed
 
- -- Ryan Kavanagh <ryanakca at kubuntu.org>  Fri, 28 Oct 2011 16:07:20 -0400
+ -- Ryan Kavanagh <ryanakca at kubuntu.org>  Sun, 30 Oct 2011 11:14:24 -0400
 
 slingshot (0.8.1p-4) unstable; urgency=low
 

Modified: packages/slingshot/trunk/debian/control
===================================================================
--- packages/slingshot/trunk/debian/control	2011-10-30 15:12:04 UTC (rev 7732)
+++ packages/slingshot/trunk/debian/control	2011-10-30 15:15:39 UTC (rev 7733)
@@ -4,17 +4,16 @@
 Maintainer: Ryan Kavanagh <ryanakca at kubuntu.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: python (>= 2.6), python-support (>= 0.5.3)
+Build-Depends-Indep: python (>= 2.6.6-3~)
 Standards-Version: 3.9.2
 Homepage: http://github.com/ryanakca/slingshot
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/slingshot/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/slingshot/trunk/
-XS-Python-Version: >=2.6
+X-Python-Version: >=2.6
 DM-Upload-Allowed: yes
 
 Package: slingshot
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends}, 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

Added: packages/slingshot/trunk/debian/links
===================================================================
--- packages/slingshot/trunk/debian/links	                        (rev 0)
+++ packages/slingshot/trunk/debian/links	2011-10-30 15:15:39 UTC (rev 7733)
@@ -0,0 +1 @@
+usr/share/pyshared/pygame/freesansbold.ttf usr/share/games/slingshot/data/FreeSansBold.ttf

Modified: packages/slingshot/trunk/debian/patches/01_games_path.diff
===================================================================
--- packages/slingshot/trunk/debian/patches/01_games_path.diff	2011-10-30 15:12:04 UTC (rev 7732)
+++ packages/slingshot/trunk/debian/patches/01_games_path.diff	2011-10-30 15:15:39 UTC (rev 7733)
@@ -9,31 +9,22 @@
 Last-Update: 2011-10-27
 Index: slingshot-0.9/src/bin/slingshot
 ===================================================================
---- slingshot-0.9.orig/src/bin/slingshot	2011-10-22 15:31:46.000000000 -0400
-+++ slingshot-0.9/src/bin/slingshot	2011-10-27 10:38:23.710508224 -0400
-@@ -41,14 +41,17 @@
+--- slingshot-0.9.orig/src/bin/slingshot	2011-10-30 11:06:24.397311660 -0400
++++ slingshot-0.9/src/bin/slingshot	2011-10-30 11:12:15.379052081 -0400
+@@ -41,6 +41,8 @@
  
  from random import randint
  
--from slingshot.settings import *
--from slingshot.general import *
--from slingshot.player import *
--from slingshot.planet import *
--from slingshot.particle import *
--from slingshot.menu import *
--from slingshot.network import *
--from slingshot.inputbox import *
-+sys.path.insert(0, '/usr/share/games/slingshot')
++sys.path.insert(0, '/usr/share/games')
 +
-+from settings import *
-+from general import *
-+from player import *
-+from planet import *
-+from particle import *
-+from menu import *
-+from network import *
-+from inputbox import *
-+
+ from slingshot.settings import *
+ from slingshot.general import *
+ from slingshot.player import *
+@@ -50,6 +52,7 @@
+ from slingshot.network import *
+ from slingshot.inputbox import *
  
++
  #class Blackhole(object):
  #	softspace = 0
+ #	def write(self, text):

Modified: packages/slingshot/trunk/debian/rules
===================================================================
--- packages/slingshot/trunk/debian/rules	2011-10-30 15:12:04 UTC (rev 7732)
+++ packages/slingshot/trunk/debian/rules	2011-10-30 15:15:39 UTC (rev 7733)
@@ -12,5 +12,3 @@
 	    --install-scripts=/usr/games
 	# Place link to Debian's FreeSansBold
 	rm $(CURDIR)/debian/slingshot/usr/share/games/slingshot/data/FreeSansBold.ttf
-	ln -s ../../../pyshared/pygame/freesansbold.ttf \
-	    $(CURDIR)/debian/slingshot/usr/share/games/slingshot/data/FreeSansBold.ttf