[Python-apps-commits] r1439 - in packages/emesene/trunk/debian (4 files)

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

    Date: Friday, June 13, 2008 @ 15:35:29
  Author: pochu-guest
Revision: 1439

* debian/patches/from_upstream_fix_banshee_1.0_support.patch:
  - Change from upstream svn r1348 and r1352, fix CurrentSong plugin
    support for Banshee 1.0. It removes support for older Banshee versions.
    Closes: #486102.
* debian/rules:
  - Include simple-patchsys.

Added:
  packages/emesene/trunk/debian/patches/
  packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch
Modified:
  packages/emesene/trunk/debian/changelog
  packages/emesene/trunk/debian/rules

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2008-06-12 21:46:26 UTC (rev 1438)
+++ packages/emesene/trunk/debian/changelog	2008-06-13 15:35:29 UTC (rev 1439)
@@ -1,3 +1,14 @@
+emesene (1.0-dist-2) unstable; urgency=low
+
+  * debian/patches/from_upstream_fix_banshee_1.0_support.patch:
+    - Change from upstream svn r1348 and r1352, fix CurrentSong plugin
+      support for Banshee 1.0. It removes support for older Banshee versions.
+      Closes: #486102.
+  * debian/rules:
+    - Include simple-patchsys.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Fri, 13 Jun 2008 17:11:15 +0200
+
 emesene (1.0-dist-1) unstable; urgency=low
 
   * New upstream stable release from the emesene-1.0-dist upstream tarball

Added: packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch
===================================================================
--- packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch	                        (rev 0)
+++ packages/emesene/trunk/debian/patches/from_upstream_fix_banshee_1.0_support.patch	2008-06-13 15:35:29 UTC (rev 1439)
@@ -0,0 +1,66 @@
+Index: plugins_base/currentSong/Banshee.py
+===================================================================
+--- plugins_base/currentSong/Banshee.py	(revision 1347)
++++ plugins_base/currentSong/Banshee.py	(revision 1348)
+@@ -16,8 +16,8 @@
+ #    along with emesene; if not, write to the Free Software
+ #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+-VERSION = '0.02'
+-IFACE_NAME = 'org.gnome.Banshee'
+-IFACE_PATH = '/org/gnome/Banshee/Player'
++VERSION = '1.0'
++IFACE_NAME = 'org.bansheeproject.Banshee'
++IFACE_PATH = '/org/bansheeproject/Banshee/PlayerEngine'
+ 
+ import CurrentSong
+@@ -35,28 +35,31 @@
+      
+     def setCurrentSongData( self ):
+         if self.iface:
+-            self.title = self.iface.GetPlayingTitle()
+-            self.artist = self.iface.GetPlayingArtist()
+-            self.album = self.iface.GetPlayingAlbum()
++            info = self.iface.GetCurrentTrack()
++            self.title = info["name"]
++            self.artist = info["artist"]
++            self.album = info["album"]
+             
+     def isPlaying( self ):
+-        if not self.iface: return False
+-
+-        if not self.iface.GetPlayingTitle():
+-            print "nao passou teste"
+-            return False 
+-        if self.iface.GetPlayingTitle() != None:
+-            print "passou teste"
++        if not self.isNameActive(IFACE_NAME):
++            return False
++        if not self.iface:
++            return False
++        
++        if self.iface.GetCurrentState() == "playing":
+             return True
+-        return False
++        else: 
++            return False
+         
+     def check( self ):
+-        if not self.iface or not self.isNameActive(IFACE_NAME):
+-            return
++        if not self.isNameActive(IFACE_NAME):
++            return False
++        if not self.iface:
++            return False
+         
+-        if self.iface.GetPlayingTitle() != self.title:
+-            self.setCurrentSongData()
+-            return True
+-            
++        if self.iface.GetCurrentState() == "playing":
++            if self.iface.GetCurrentTrack()["name"] != self.title:
++                self.setCurrentSongData()
++                return True
++
+         return False
+-

Modified: packages/emesene/trunk/debian/rules
===================================================================
--- packages/emesene/trunk/debian/rules	2008-06-12 21:46:26 UTC (rev 1438)
+++ packages/emesene/trunk/debian/rules	2008-06-13 15:35:29 UTC (rev 1439)
@@ -5,6 +5,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 cdbs_python_compile_version := 2.5 # workaround FTBFS with python2.4's distutils. emesene runs fine with python2.4 though
 DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=usr/share/emesene