[Python-apps-commits] r2691 - in packages/sonata/trunk/debian (5 files)

[nijel at users.alioth.debian.org]

    Date: Monday, April 6, 2009 @ 13:17:43
  Author: nijel
Revision: 2691

Add patches for Python 2.5 compatibility.

Added:
  packages/sonata/trunk/debian/patches/
  packages/sonata/trunk/debian/patches/python-2.5.patch
  packages/sonata/trunk/debian/patches/series
Modified:
  packages/sonata/trunk/debian/changelog
  packages/sonata/trunk/debian/rules

Modified: packages/sonata/trunk/debian/changelog
===================================================================
--- packages/sonata/trunk/debian/changelog	2009-04-06 13:11:27 UTC (rev 2690)
+++ packages/sonata/trunk/debian/changelog	2009-04-06 13:17:43 UTC (rev 2691)
@@ -4,8 +4,9 @@
     - Fixes changing of cover art (Closes: #480758).
     - Fixes handling options without MPD connection (Closes: #503435).
     - Fixes typos in man page (Closes: #517503).
+  * Add patches for Python 2.5 compatibility.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 06 Apr 2009 15:09:25 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 06 Apr 2009 15:17:28 +0200
 
 sonata (1.5.3-3) unstable; urgency=low
 

Added: packages/sonata/trunk/debian/patches/python-2.5.patch
===================================================================
--- packages/sonata/trunk/debian/patches/python-2.5.patch	                        (rev 0)
+++ packages/sonata/trunk/debian/patches/python-2.5.patch	2009-04-06 13:17:43 UTC (rev 2691)
@@ -0,0 +1,12 @@
+Fixed compatibility with python 2.5
+--- a/sonata/svnversion.py
++++ b/sonata/svnversion.py
+@@ -41,4 +41,7 @@
+ 	VERSION = consts.HEAD_URL.split("/tags/")[1].split("/")[0]
+ else:
+ 	revision = find_svnrev()
+-	VERSION = "svn%s" % (revision if revision else "????")
++	if revision:
++		VERSION = "svn%s" % revision
++	else:
++		VERSION = "svn%s" % "????"

Added: packages/sonata/trunk/debian/patches/series
===================================================================
--- packages/sonata/trunk/debian/patches/series	                        (rev 0)
+++ packages/sonata/trunk/debian/patches/series	2009-04-06 13:17:43 UTC (rev 2691)
@@ -0,0 +1 @@
+python-2.5.patch

Modified: packages/sonata/trunk/debian/rules
===================================================================
--- packages/sonata/trunk/debian/rules	2009-04-06 13:11:27 UTC (rev 2690)
+++ packages/sonata/trunk/debian/rules	2009-04-06 13:17:43 UTC (rev 2691)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
   py_sitename = site-packages
@@ -41,12 +43,12 @@
 
 build: build-stamp
 
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh build
 	chmod -x sonata/pixmaps/*
 	touch $@
 
-clean:
+clean: unpatch
 	dh $@
 
 install: build