[Python-apps-commits] r2607 - in packages/emesene/trunk/debian (10 files)

pochu-guest at users.alioth.debian.org pochu-guest at users.alioth.debian.org
Sat Mar 14 17:12:16 UTC 2009 

    Date: Saturday, March 14, 2009 @ 17:12:15
  Author: pochu-guest
Revision: 2607

* Switch to debhelper 7.
* Switch to quilt.

Added:
  packages/emesene/trunk/debian/patches/series
Modified:
  packages/emesene/trunk/debian/changelog
  packages/emesene/trunk/debian/compat
  packages/emesene/trunk/debian/control
  packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch
  packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch
  packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch
  packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch
  packages/emesene/trunk/debian/patches/10_use_webbrowser_module_to_open_html_local_files.patch
  packages/emesene/trunk/debian/rules

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/changelog	2009-03-14 17:12:15 UTC (rev 2607)
@@ -25,6 +25,8 @@
   * Improve long description a bit.
   * Put the wrapper script in debian/bin/ and use debian/install to
     install it.
+  * Switch to debhelper 7.
+  * Switch to quilt.
 
  -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 14 Mar 2009 12:31:20 +0100
 

Modified: packages/emesene/trunk/debian/compat
===================================================================
--- packages/emesene/trunk/debian/compat	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/compat	2009-03-14 17:12:15 UTC (rev 2607)
@@ -1 +1 @@
-5
+7

Modified: packages/emesene/trunk/debian/control
===================================================================
--- packages/emesene/trunk/debian/control	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/control	2009-03-14 17:12:15 UTC (rev 2607)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at ubuntu.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.49),
-               debhelper (>= 5.0.51~),
+Build-Depends: debhelper (>= 7),
+               quilt,
                python
 Build-Depends-Indep: python-support
 Standards-Version: 3.8.1

Modified: packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch
===================================================================
--- packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch	2009-03-14 17:12:15 UTC (rev 2607)
@@ -1,7 +1,7 @@
-Index: plugins_base/Logger.py
-===================================================================
---- plugins_base/Logger.py	(revisión: 1480)
-+++ plugins_base/Logger.py	(copia de trabajo)
+Fix Logger plugin exceptions. Patch backported from upstream r1506.
+
+--- a/plugins_base/Logger.py
++++ b/plugins_base/Logger.py
 @@ -137,7 +137,7 @@
      def user_exists(self, account):
          '''return the user id if the account exists -1 otherwise'''

Modified: packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch
===================================================================
--- packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch	2009-03-14 17:12:15 UTC (rev 2607)
@@ -1,8 +1,9 @@
-Index: plugins_base/currentSong/Banshee.py
-===================================================================
---- plugins_base/currentSong/Banshee.py	(revision 1347)
-+++ plugins_base/currentSong/Banshee.py	(revision 1348)
-@@ -16,8 +16,8 @@
+Change from upstream svn r1348 and r1352, fix CurrentSong plugin
+support for Banshee 1.0. It removes support for older Banshee versions.
+
+--- a/plugins_base/currentSong/Banshee.py
++++ b/plugins_base/currentSong/Banshee.py
+@@ -16,9 +16,9 @@
  #    along with emesene; if not, write to the Free Software
  #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  
@@ -14,6 +15,7 @@
 +IFACE_PATH = '/org/bansheeproject/Banshee/PlayerEngine'
  
  import CurrentSong
+ 
 @@ -35,28 +35,31 @@
       
      def setCurrentSongData( self ):
@@ -57,10 +59,10 @@
 -            self.setCurrentSongData()
 -            return True
 -            
+-        return False
 +        if self.iface.GetCurrentState() == "playing":
 +            if self.iface.GetCurrentTrack()["name"] != self.title:
 +                self.setCurrentSongData()
 +                return True
-+
-         return False
--
+ 
++        return False

Modified: packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch
===================================================================
--- packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch	2009-03-14 17:12:15 UTC (rev 2607)
@@ -1,7 +1,8 @@
-=== modified file 'emesenelib/p2p/tlp.py'
---- emesenelib/msn_tlp.py	2008-12-25 15:49:20 +0000
-+++ emesenelib/msn_tlp.py	2009-03-12 20:37:42 +0000
-@@ -241,7 +241,7 @@
+patch from upstream r1578, fix file transfers with WLM2009 clients.
+
+--- a/emesenelib/msn_tlp.py
++++ b/emesenelib/msn_tlp.py
+@@ -215,7 +215,7 @@
              self.send_acknowledge(bin_header)
          
          # session and flag 0 means slp

Modified: packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch
===================================================================
--- packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch	2009-03-14 17:12:15 UTC (rev 2607)
@@ -1,7 +1,7 @@
-Index: plugins_base/currentSong/Amarok2.py
-===================================================================
---- plugins_base/currentSong/Amarok2.py	(revisión: 0)
-+++ plugins_base/currentSong/Amarok2.py	(revisión: 0)
+Add plugin from http://www.emesene.org/trac/ticket/1955 to support Amarok2
+
+--- /dev/null
++++ b/plugins_base/currentSong/Amarok2.py
 @@ -0,0 +1,60 @@
 +# -*- coding: utf-8 -*-
 +
@@ -63,10 +63,8 @@
 +	else:
 +	    return False;
 +	
-Index: plugins_base/currentSong/__init__.py
-===================================================================
---- plugins_base/currentSong/__init__.py	(revisión: 1525)
-+++ plugins_base/currentSong/__init__.py	(copia de trabajo)
+--- a/plugins_base/currentSong/__init__.py
++++ b/plugins_base/currentSong/__init__.py
 @@ -19,6 +19,7 @@
  from os import name
  if name == 'posix':

Modified: packages/emesene/trunk/debian/patches/10_use_webbrowser_module_to_open_html_local_files.patch
===================================================================
--- packages/emesene/trunk/debian/patches/10_use_webbrowser_module_to_open_html_local_files.patch	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/patches/10_use_webbrowser_module_to_open_html_local_files.patch	2009-03-14 17:12:15 UTC (rev 2607)
@@ -1,7 +1,15 @@
-diff -ruNp emesene-1.0-dist.orig/plugins_base/LibNotify.py emesene-1.0-dist/plugins_base/LibNotify.py
---- emesene-1.0-dist.orig/plugins_base/LibNotify.py	2008-03-23 22:56:22.000000000 +0100
-+++ emesene-1.0-dist/plugins_base/LibNotify.py	2008-06-28 00:46:24.000000000 +0200
-@@ -21,6 +21,7 @@ import gobject
+    - Use webbrowser module instead of desktop.py from emesene to open
+      local html files, as desktop.py will use gnome-open for GNOME which
+      uses gnome-vfs, which since 1:2.22.0-4 makes text/* a subgroup of
+      text/plain, making them being opened with a text editor instead of
+      the browser. LP: #241765.
+      For Lenny+1, if upstream doesn't change this code, it could be
+      possible to just switch desktop.py to use gvfs-open.
+
+
+--- a/plugins_base/LibNotify.py
++++ b/plugins_base/LibNotify.py
+@@ -21,6 +21,7 @@
  
  import Plugin
  import desktop
@@ -9,7 +17,7 @@
  from emesenelib.common import escape
  from emesenelib.common import unescape
  from Parser import PangoDataType
-@@ -221,7 +222,7 @@ class MainClass(Plugin.Plugin):
+@@ -221,7 +222,7 @@
  
          elif execute == 'mail':
              def openMail(notification, action):
@@ -18,10 +26,9 @@
                      (data[0], data[1], data[2]))
              notification.add_action('default', 'Open Mail', openMail)
  
-diff -ruNp emesene-1.0-dist.orig/plugins_base/Notification.py emesene-1.0-dist/plugins_base/Notification.py
---- emesene-1.0-dist.orig/plugins_base/Notification.py	2008-03-24 08:03:45.000000000 +0100
-+++ emesene-1.0-dist/plugins_base/Notification.py	2008-06-28 00:46:51.000000000 +0200
-@@ -696,7 +696,7 @@ class MainClass(Plugin.Plugin):
+--- a/plugins_base/Notification.py
++++ b/plugins_base/Notification.py
+@@ -696,7 +696,7 @@
          self.controller.newConversation(None, params[0], params[1], True)
  
      def openMail(self, params):
@@ -30,10 +37,9 @@
                  (params[0], params[1], params[2]))
  
      def start(self):
-diff -ruNp emesene-1.0-dist.orig/UserPanel.py emesene-1.0-dist/UserPanel.py
---- emesene-1.0-dist.orig/UserPanel.py	2008-03-20 01:17:29.000000000 +0100
-+++ emesene-1.0-dist/UserPanel.py	2008-06-28 00:45:39.000000000 +0200
-@@ -22,6 +22,7 @@ import gtk
+--- a/UserPanel.py
++++ b/UserPanel.py
+@@ -22,6 +22,7 @@
  import pango
  
  import desktop
@@ -41,7 +47,7 @@
  import Widgets
  import FancyLabel
  import StatusMenu
-@@ -320,7 +321,7 @@ class UserPanel(gtk.HBox):
+@@ -320,7 +321,7 @@
              self.controller.setMediaEnabled(False)
              
      def onMaiButtonClicked(self, *args):

Added: packages/emesene/trunk/debian/patches/series
===================================================================
--- packages/emesene/trunk/debian/patches/series	                        (rev 0)
+++ packages/emesene/trunk/debian/patches/series	2009-03-14 17:12:15 UTC (rev 2607)
@@ -0,0 +1,5 @@
+01_from_upstream_fix_logger_exceptions.patch
+02_from_upstream_fix_banshee_1.0_support.patch
+03_from_upstream_fix_file_transfers_wlm2009.patch
+04_currentSong_plugin_support_amarok2.patch
+10_use_webbrowser_module_to_open_html_local_files.patch

Modified: packages/emesene/trunk/debian/rules
===================================================================
--- packages/emesene/trunk/debian/rules	2009-03-14 15:57:17 UTC (rev 2606)
+++ packages/emesene/trunk/debian/rules	2009-03-14 17:12:15 UTC (rev 2607)
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
 
-DEB_PYTHON_SYSTEM = pysupport
+%:
+	dh $@
 
-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
+build: $(QUILT_STAMPFN)
+	dh $@
 
-DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=usr/share/emesene
+clean: unpatch
+	dh $@
 
-binary-install/emesene::
-	dh_desktop -pemesene
-	dh_icons -pemesene
+override_dh_auto_install:
+	dh_auto_install -- --install-lib=usr/share/emesene

More information about the Python-apps-commits mailing list