From b80bfb5a80ab9fe302bc43ee2187004d58959319 Mon Sep 17 00:00:00 2001
From: Michael Gorven <michael@gorven.za.net>
Date: Tue, 23 Feb 2010 17:42:17 +0200
Subject: [PATCH 1/6] Add menu entry from old branch.

---
 resources/openlp.desktop | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 resources/openlp.desktop

diff --git a/resources/openlp.desktop b/resources/openlp.desktop
new file mode 100644
index 000000000..8791c2d8f
--- /dev/null
+++ b/resources/openlp.desktop
@@ -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

From a0e56c0d8509dbfad52348406ddcdf2c5027265c Mon Sep 17 00:00:00 2001
From: Michael Gorven <michael@gorven.za.net>
Date: Tue, 23 Feb 2010 17:45:06 +0200
Subject: [PATCH 2/6] Include proper vesion file in tarball and fix reading
 thereof.

---
 MANIFEST.in | 2 +-
 setup.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 0e94db321..3b76a706c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,4 +8,4 @@ recursive-include resources/images *
 recursive-include scripts *.py
 include copyright.txt
 include LICENSE
-include version.txt
+include openlp/.version
diff --git a/setup.py b/setup.py
index 29db13c4b..ccdbd09af 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ try:
     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()
 

From 3b0970d7735942ca2edf2c9d424bc6f07528ef25 Mon Sep 17 00:00:00 2001
From: Michael Gorven <michael@gorven.za.net>
Date: Tue, 23 Feb 2010 17:45:26 +0200
Subject: [PATCH 3/6] Make setup.py executable.

---
 setup.py | 2 ++
 1 file changed, 2 insertions(+)
 mode change 100644 => 100755 setup.py

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index ccdbd09af..975de929d
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from setuptools import setup, find_packages
 import sys, os
 

From 03ae1781c4130d17e9cc6e4dfa9631948dbd7899 Mon Sep 17 00:00:00 2001
From: Michael Gorven <michael@gorven.za.net>
Date: Tue, 23 Feb 2010 17:45:55 +0200
Subject: [PATCH 4/6] Install menu entry.

---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 3b76a706c..73ff3c545 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ recursive-include resources/forms *
 recursive-include resources/i18n *
 recursive-include resources/images *
 recursive-include scripts *.py
+include resources/*.desktop
 include copyright.txt
 include LICENSE
 include openlp/.version

From 7f8c6b6fdd8b0cc4baf9f33709273e9f58152ef6 Mon Sep 17 00:00:00 2001
From: Michael Gorven <michael@gorven.za.net>
Date: Tue, 23 Feb 2010 17:49:39 +0200
Subject: [PATCH 5/6] Install scripts as scripts.

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 975de929d..2429f0d73 100755
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,7 @@ OpenLP (previously openlp.org) is free church presentation software, or lyrics p
     url='http://openlp.org/',
     license='GNU General Public License',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    scripts=['openlp.pyw', 'openlp-1to2-converter.py', 'bible-1to2-converter.py'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[

From 57f685cc60827e6e1e27d8bdf9c20f489aa757b2 Mon Sep 17 00:00:00 2001
From: Michael Gorven <michael@gorven.za.net>
Date: Tue, 23 Feb 2010 17:52:38 +0200
Subject: [PATCH 6/6] Specify correct directory.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2429f0d73..73cecd97a 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ OpenLP (previously openlp.org) is free church presentation software, or lyrics p
     url='http://openlp.org/',
     license='GNU General Public License',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-    scripts=['openlp.pyw', 'openlp-1to2-converter.py', 'bible-1to2-converter.py'],
+    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py', 'scripts/bible-1to2-converter.py'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[