openlp-core team mailing list archive

[Bastian Germann <bastiangermann@xxxxxxxxxxx>]

Bastian Germann has proposed merging lp:~bastian-germann/openlp/packaging into lp:openlp/packaging.

Commit message:
The openlp.py starter module was renamed. Use run_openlp over openlp module.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~bastian-germann/openlp/packaging/+merge/357789
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~bastian-germann/openlp/packaging into lp:openlp/packaging.

=== modified file 'builders/builder.py'
--- builders/builder.py	2018-07-12 19:41:00 +0000
+++ builders/builder.py	2018-10-24 22:57:18 +0000
@@ -269,7 +269,7 @@
         Run PyInstaller on the branch to build an executable.
         """
         self._print('Running PyInstaller...')
-        copy(os.path.join(self.work_path, 'openlp.py'), self.openlp_script)
+        copy(os.path.join(self.work_path, 'run_openlp.py'), self.openlp_script)
         os.chdir(self.work_path)
         cmd = [self.python,
                self.pyinstaller_exe,

=== modified file 'launchpad-ppa/debian/rules'
--- launchpad-ppa/debian/rules	2012-11-21 21:29:26 +0000
+++ launchpad-ppa/debian/rules	2018-10-24 22:57:18 +0000
@@ -18,4 +18,4 @@
 	mkdir -p debian/openlp/usr/share/icons/hicolor/scalable/apps && \
 	cp resources/images/openlp-logo.svg debian/openlp/usr/share/icons/hicolor/scalable/apps/openlp.svg
 
-	cd debian/openlp/usr/bin/ && mv openlp.pyw openlp
+	cd debian/openlp/usr/bin/ && mv run_openlp.pyw openlp