Skip to content

Commit

Permalink
Completed work with setup.py, thanks deluge.
Browse files Browse the repository at this point in the history
Fixed messagingmenu search for emesene.desktop
Fixed MANIFEST.in
Added DEPENDS
Fixed setup.py
  • Loading branch information
c10ud committed Jun 2, 2010
1 parent 6003702 commit 187f6a4
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 28 deletions.
14 changes: 14 additions & 0 deletions DEPENDS
@@ -0,0 +1,14 @@
=== Core ===
* python >= 2.5

=== Libs ===
* papyon >= 0.4.8
* xmppy

=== Gtk ===
* python-notify (libnotify python wrapper)
* pygtk >= 2.12

=== Indicators ===
* python-appindicator

12 changes: 3 additions & 9 deletions MANIFEST.in
@@ -1,9 +1,3 @@
include COPYING
include GPL
include LGPL
include emesene-logo.png
recursive-include docs *
recursive-include e3 *
recursive-include themes *
recursive-include misc *
recursive-include po *
recursive-include docs/man *
recursive-include emesene *

Binary file removed emesene/emesene-logo.png
Binary file not shown.
3 changes: 2 additions & 1 deletion emesene/gui/gtkui/MessagingMenu.py
Expand Up @@ -23,7 +23,8 @@ def __init__ (self, handler, main_window=None):
self.desktop_file = os.path.join("/usr/share/applications/",
"emesene.desktop")
if not utils.file_readable(self.desktop_file):
self.desktop_file = os.path.join(os.getcwd(), "emesene.desktop")
self.desktop_file = os.path.join(os.getcwd(),
"data/share/applications/emesene.desktop")

self.indicator_dict = {}
self.r_indicator_dict = {}
Expand Down
36 changes: 18 additions & 18 deletions setup.py
Expand Up @@ -7,6 +7,16 @@
ez_setup.use_setuptools()
from setuptools import setup, find_packages, Extension

import platform

python_version = platform.python_version()[0:3]

def windows_check():
return platform.system() in ('Windows', 'Microsoft')

def osx_check():
return platform.system() == "Darwin"

# Data files to be installed to the system
_data_files = [
('share/icons/scalable/apps', ['emesene/data/icons/scalable/apps/emesene.svg']),
Expand All @@ -28,11 +38,18 @@
]

setup(

name = 'emesene',
version = '2.0',
version = '1.9.0',
description = 'MSN messenger client',
author = 'Luis Mariano Guerra',
author_email = 'luismarianoguerra@gmail.com',
keywords = "messenger im msn jabber gtalk live facebook",
long_description = """emesene is an istant messenger capable of connecting
to various networks and utilizing different graphical toolkits.
Currently msn and jabber are supported through papyon and xmppy,
which allows emesene to connect to various IM services such as
Windows Live Messenger, GTalk, Facebook Chat, etc.""",
url = 'http://www.emesene.org/',
license = 'GNU GPL 3',

Expand All @@ -45,20 +62,3 @@
packages = find_packages(exclude=["plugins", "docs", "tests"]),

)

'''
['', 'e3', 'e3.base', 'e3.cache', 'e3.common',
'e3.dummy', 'e3.jabber', 'e3.jabber.xmpp', 'e3.msn',
'e3.msn.msgs', 'e3.msn.p2p', 'e3.papylib', 'gui',
'gui.base', 'gui.gtkui', 'interfaces', 'plugins.music',
'plugins.music.thirdparty', 'plugins.ye_old_status_combo'],
scripts = ['emesene'],
package_data = {'': ['docs/*', 'e3/msn/xml templates/*',
'e3/papylib/papyon', 'test/*', 'themes/*/*',
'plugins/link.py', 'plugins/plugin.pylint.rc', 'test/test_all.sh'],
'gui.base': ['template.html'],
'gui.gtkui': ['conversation.html'],
'plugins.music.thirdparty': ['README.txt']},
data_files = [('share/pixmaps', ['emesene-logo.png']),
('share/applications', ['emesene.desktop'])]
'''

0 comments on commit 187f6a4

Please sign in to comment.