OpenLP

Merge lp:~mgorven/openlp/menu-entry into lp:openlp

  1. menu-entry
  2. Merge into trunk
Proposed by Michael Gorven
Status: Merged
Approved by: Michael Gorven
Approved revision: not available
Merged at revision: 713
Proposed branch: lp:~mgorven/openlp/menu-entry
Merge into: lp:openlp
Diff against target: 54 lines (+16/-2)
3 files modified
MANIFEST.in (+2/-1)
resources/openlp.desktop (+10/-0)
setup.py (+4/-1)
To merge this branch: bzr merge lp:~mgorven/openlp/menu-entry
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+19978@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Gorven (mgorven) wrote :

Adds a menu entry specification and fixes some source tarball generation issues.

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2010-02-14 21:20:13 +0000
3+++ MANIFEST.in 2010-02-23 15:55:25 +0000
4@@ -6,6 +6,7 @@
5 recursive-include resources/i18n *
6 recursive-include resources/images *
7 recursive-include scripts *.py
8+include resources/*.desktop
9 include copyright.txt
10 include LICENSE
11-include version.txt
12+include openlp/.version
13
14=== added file 'resources/openlp.desktop'
15--- resources/openlp.desktop 1970-01-01 00:00:00 +0000
16+++ resources/openlp.desktop 2010-02-23 15:55:25 +0000
17@@ -0,0 +1,10 @@
18+[Desktop Entry]
19+Encoding=UTF-8
20+Name=OpenLP
21+GenericName=Church lyrics projection
22+Exec=openlp
23+Icon=openlp
24+StartupNotify=true
25+Terminal=False
26+Type=Application
27+Categories=AudioVideo
28
29=== modified file 'setup.py' (properties changed: -x to +x)
30--- setup.py 2010-02-22 18:47:29 +0000
31+++ setup.py 2010-02-23 15:55:25 +0000
32@@ -1,3 +1,5 @@
33+#!/usr/bin/env python
34+
35 from setuptools import setup, find_packages
36 import sys, os
37
38@@ -25,7 +27,7 @@
39 finally:
40 b.unlock()
41 except:
42- ver_file = open(VERSION_FILE, u'w')
43+ ver_file = open(VERSION_FILE, u'r')
44 version = ver_file.read().strip()
45 ver_file.close()
46
47@@ -43,6 +45,7 @@
48 url='http://openlp.org/',
49 license='GNU General Public License',
50 packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
51+ scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py', 'scripts/bible-1to2-converter.py'],
52 include_package_data=True,
53 zip_safe=False,
54 install_requires=[