openlp-core team mailing list archive

[Michael Gorven <michael@xxxxxxxxxxxxx>]

Michael Gorven has proposed merging lp:~mgorven/openlp/menu-entry into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Adds a menu entry specification and fixes some source tarball generation issues.
-- 
https://code.launchpad.net/~mgorven/openlp/menu-entry/+merge/19978
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2010-02-14 21:20:13 +0000
+++ MANIFEST.in	2010-02-23 15:55:25 +0000
@@ -6,6 +6,7 @@
 recursive-include resources/i18n *
 recursive-include resources/images *
 recursive-include scripts *.py
+include resources/*.desktop
 include copyright.txt
 include LICENSE
-include version.txt
+include openlp/.version

=== added file 'resources/openlp.desktop'
--- resources/openlp.desktop	1970-01-01 00:00:00 +0000
+++ resources/openlp.desktop	2010-02-23 15:55:25 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=OpenLP
+GenericName=Church lyrics projection
+Exec=openlp
+Icon=openlp
+StartupNotify=true
+Terminal=False
+Type=Application
+Categories=AudioVideo

=== modified file 'setup.py' (properties changed: -x to +x)
--- setup.py	2010-02-22 18:47:29 +0000
+++ setup.py	2010-02-23 15:55:25 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from setuptools import setup, find_packages
 import sys, os
 
@@ -25,7 +27,7 @@
     finally:
         b.unlock()
 except:
-    ver_file = open(VERSION_FILE, u'w')
+    ver_file = open(VERSION_FILE, u'r')
     version = ver_file.read().strip()
     ver_file.close()
 
@@ -43,6 +45,7 @@
     url='http://openlp.org/',
     license='GNU General Public License',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py', 'scripts/bible-1to2-converter.py'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[