[Python-apps-commits] r3500 - in packages/emesene/trunk/debian (8 files)
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Thu Aug 20 23:24:10 UTC 2009
Date: Thursday, August 20, 2009 @ 23:24:07
Author: pochu-guest
Revision: 3500
* New upstream release. Closes: #535648.
- Don't try to connect to a gone dbus service. Closes: #541405.
- No longer hangs on file transfers. Closes: #488774.
- debian/patches/01_from_upstream_fix_logger_exceptions.patch
debian/patches/02_from_upstream_fix_banshee_1.0_support.patch
debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch
debian/patches/04_currentSong_plugin_support_amarok2.patch:
+ Removed, fixed upstream.
Added:
packages/emesene/trunk/debian/patches/20_dont_build_own_libmimic.patch
Modified:
packages/emesene/trunk/debian/changelog
packages/emesene/trunk/debian/control
packages/emesene/trunk/debian/patches/series
Deleted:
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
Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog 2009-08-20 23:13:55 UTC (rev 3499)
+++ packages/emesene/trunk/debian/changelog 2009-08-20 23:24:07 UTC (rev 3500)
@@ -1,4 +1,4 @@
-emesene (1.0.1-3) UNRELEASED; urgency=low
+emesene (1.5-1) UNRELEASED; urgency=low
[ Marco Rodrigues ]
* debian/control:
@@ -35,6 +35,15 @@
* debian/copyright: fix typo. Closes: #528421.
* Use dh --with quilt, build depend on quilt 0.46-7.
+ * New upstream release. Closes: #535648.
+ - Don't try to connect to a gone dbus service. Closes: #541405.
+ - No longer hangs on file transfers. Closes: #488774.
+ - debian/patches/01_from_upstream_fix_logger_exceptions.patch
+ debian/patches/02_from_upstream_fix_banshee_1.0_support.patch
+ debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch
+ debian/patches/04_currentSong_plugin_support_amarok2.patch:
+ + Removed, fixed upstream.
+
-- Emilio Pozuelo Monfort <pochu at ubuntu.com> Thu, 26 Mar 2009 00:17:56 +0100
emesene (1.0.1-2) unstable; urgency=low
Modified: packages/emesene/trunk/debian/control
===================================================================
--- packages/emesene/trunk/debian/control 2009-08-20 23:13:55 UTC (rev 3499)
+++ packages/emesene/trunk/debian/control 2009-08-20 23:24:07 UTC (rev 3500)
@@ -14,7 +14,8 @@
Package: emesene
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
+Depends: ${python:Depends},
+ ${misc:Depends},
python-gtk2 (>= 2.10),
python-cairo,
python-gobject
Deleted: 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-08-20 23:13:55 UTC (rev 3499)
+++ packages/emesene/trunk/debian/patches/01_from_upstream_fix_logger_exceptions.patch 2009-08-20 23:24:07 UTC (rev 3500)
@@ -1,49 +0,0 @@
-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'''
-
-- self.cursor.execute(Logger.USER_EXISTS, (account,))
-+ self.cursor.execute(Logger.USER_EXISTS, (unicode(account),))
-
- result = self.cursor.fetchall()
- if len(result) >= 1:
-@@ -152,7 +152,7 @@
- user_id = self.user_exists(account)
-
- if user_id == -1:
-- self.cursor.execute(Logger.USER_ADD, (account,))
-+ self.cursor.execute(Logger.USER_ADD, (unicode(account),))
- self.connection.commit()
- return self.cursor.lastrowid
-
-@@ -165,7 +165,7 @@
- user_id = self.user_add(account)
- event_id = self.event_add(name, stamp)
- self.cursor.execute(Logger.USER_EVENT_ADD, (event_id,
-- user_id, data))
-+ user_id, data.decode("utf8")))
- self.connection.commit()
- return self.cursor.lastrowid
-
-@@ -173,7 +173,7 @@
- '''add an event with name "name", return the id'''
- if stamp is None:
- stamp = time.time()
-- self.cursor.execute(Logger.EVENT_ADD, (stamp, name))
-+ self.cursor.execute(Logger.EVENT_ADD, (stamp, unicode(name)))
- self.connection.commit()
- return self.cursor.lastrowid
-
-@@ -185,7 +185,7 @@
- event_id = self.event_add(name, stamp)
- user_id = self.user_add(account)
- self.cursor.execute(Logger.CONVERSATION_EVENT_ADD, (event_id,
-- conversation_id, user_id, data))
-+ conversation_id, user_id, data.decode("utf8")))
- self.connection.commit()
- return self.cursor.lastrowid
-
Deleted: 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-08-20 23:13:55 UTC (rev 3499)
+++ packages/emesene/trunk/debian/patches/02_from_upstream_fix_banshee_1.0_support.patch 2009-08-20 23:24:07 UTC (rev 3500)
@@ -1,68 +0,0 @@
-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
-
--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
--
-- return False
-+ if self.iface.GetCurrentState() == "playing":
-+ if self.iface.GetCurrentTrack()["name"] != self.title:
-+ self.setCurrentSongData()
-+ return True
-
-+ return False
Deleted: 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-08-20 23:13:55 UTC (rev 3499)
+++ packages/emesene/trunk/debian/patches/03_from_upstream_fix_file_transfers_wlm2009.patch 2009-08-20 23:24:07 UTC (rev 3500)
@@ -1,13 +0,0 @@
-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
-- if body and bin_header.session_id == 0 and bin_header.flag == 0:
-+ if body and bin_header.session_id == 0 and (bin_header.flag & 0xff) == 0:
- try:
- slp = msn_slp.SLPMessage(body[48:-4])
- except msn_slp.SLPError:
Deleted: packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch
===================================================================
--- packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch 2009-08-20 23:13:55 UTC (rev 3499)
+++ packages/emesene/trunk/debian/patches/04_currentSong_plugin_support_amarok2.patch 2009-08-20 23:24:07 UTC (rev 3500)
@@ -1,75 +0,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 -*-
-+
-+# This file is part of emesene.
-+#
-+# Emesene is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# emesene is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with emesene; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+# Creator: Otávio Souza <leader at kinuxlinux.org>
-+
-+import os
-+import CurrentSong
-+
-+import dbus
-+
-+class Amarok2(CurrentSong.CurrentSong):
-+ def __init__(self):
-+ CurrentSong.CurrentSong.__init__(self)
-+ if self.isRunning():
-+ self.amarok = dbus.SessionBus().get_object('org.kde.amarok','/Player');
-+ self.track = dbus.SessionBus().get_object('org.kde.amarok','/TrackList');
-+
-+ self.check()
-+
-+ def isRunning(self):
-+ if os.popen('ps -A | grep amarok').read() == "":
-+ self.running = False
-+ else:
-+ self.running = True
-+
-+ return self.running
-+
-+ def isPlaying(self):
-+ if self.isRunning():
-+ return bool(self.amarok.PositionGet() > 0)
-+ else:
-+ return False
-+
-+ def getStatus(self):
-+ return (True , 'Ok')
-+
-+ def check(self):
-+ if self.isPlaying():
-+ self.info = self.track.GetMetadata(self.track.GetCurrentTrack());
-+ self.artist = str(self.info['artist'])
-+ self.album = str(self.info['album'])
-+ self.title = str(self.info['title']);
-+ return True
-+ else:
-+ return False;
-+
---- a/plugins_base/currentSong/__init__.py
-+++ b/plugins_base/currentSong/__init__.py
-@@ -19,6 +19,7 @@
- from os import name
- if name == 'posix':
- from Amarok import Amarok
-+ from Amarok2 import Amarok2
- from Exaile import Exaile
- from Xmms import Xmms
- from Banshee import Banshee
Added: packages/emesene/trunk/debian/patches/20_dont_build_own_libmimic.patch
===================================================================
--- packages/emesene/trunk/debian/patches/20_dont_build_own_libmimic.patch (rev 0)
+++ packages/emesene/trunk/debian/patches/20_dont_build_own_libmimic.patch 2009-08-20 23:24:07 UTC (rev 3500)
@@ -0,0 +1,33 @@
+--- a/setup.py
++++ b/setup.py
+@@ -4,18 +4,6 @@
+ import glob, os.path
+ import sys
+
+-for arg in sys.argv:
+- if arg == 'install':
+- print 'Hello.\nYou are trying to do a system-wide install of emesene '\
+- 'using this script, which is a very bad thing to do.\n'\
+- 'Seriously, you do NOT want to do this, since it can break '\
+- 'other python apps, and emesene too!\n'\
+- 'Follow my advice: just run the \"emesene\" script that is '\
+- 'in this very same directory and you\'re done. emesene is running '\
+- 'and your system is safe. It\'s a win-win, don\'t you think?\n'\
+- 'Thanks for trying emesene.'
+- quit()
+-
+ # From apport's setup.py
+ mo_files = []
+ for filepath in glob.glob("po/*/LC_MESSAGES/*.mo"):
+@@ -42,9 +30,10 @@
+ packages = ['', 'abstract', 'emesenelib', 'emesenelib.p2p',
+ 'emesenelib.soap', 'plugins_base', 'plugins_base.currentSong'],
+ scripts = ['emesene'],
++ package_data = {'': ['conversation_themes/*/*', 'smilies/*/*',
++ 'sound_themes/*/*', 'themes/*/*', 'hotmlog.htm']},
+ data_files = [('share/pixmaps', ['misc/emesene.png']),
+ ('share/icons/hicolor/scalable/apps', ['misc/emesene.svg']),
+ ('share/man/man1', ['misc/emesene.1']),
+ ('share/applications', ['misc/emesene.desktop'])] + mo_files,
+- ext_modules = [libmimic_module]
+ )
Modified: packages/emesene/trunk/debian/patches/series
===================================================================
--- packages/emesene/trunk/debian/patches/series 2009-08-20 23:13:55 UTC (rev 3499)
+++ packages/emesene/trunk/debian/patches/series 2009-08-20 23:24:07 UTC (rev 3500)
@@ -1,5 +1 @@
-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
+20_dont_build_own_libmimic.patch
More information about the Python-apps-commits
mailing list