lp:~springermac/openlp/packaging

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/packaging at revision 28

Tomas Groth: Approve on 2015-12-26

Raoul Snyman: Approve on 2015-12-26

Diff: 122 lines (+3/-54)

5 files modified

osx/Info.plist (+0/-2)
osx/macosx-builder.py (+1/-4)
pyinstaller-hooks/hook-openlp.core.ui.media.py (+1/-1)
pyinstaller-hooks/rthook_openlp_pyqt4.py (+0/-43)
windows/windows-builder.py (+1/-4)

api

Superseded for merging into lp:openlp

Tomas Groth: Needs Fixing on 2015-12-25

Diff: 4744 lines (+4439/-0) (has conflicts)

51 files modified

.bzrignore (+36/-0)
gentoo/openlp-1.9.4.ebuild (+31/-0)
launchpad-ppa/Makefile (+17/-0)
launchpad-ppa/debian/changelog (+389/-0)
launchpad-ppa/debian/compat (+1/-0)
launchpad-ppa/debian/control (+20/-0)
launchpad-ppa/debian/copyright (+10/-0)
launchpad-ppa/debian/docs (+1/-0)
launchpad-ppa/debian/openlp.install (+1/-0)
launchpad-ppa/debian/pycompat (+1/-0)
launchpad-ppa/debian/pyversions (+1/-0)
launchpad-ppa/debian/rules (+21/-0)
osx/Info.plist (+126/-0)
osx/LICENSE.txt (+339/-0)
osx/applescript-adjust-dmg-view.master (+31/-0)
osx/config.ini.default (+23/-0)
osx/macosx-builder.py (+768/-0)
pyinstaller-hooks/hook-mysql.connector.py (+23/-0)
pyinstaller-hooks/hook-openlp.core.ui.media.py (+25/-0)
pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py (+26/-0)
pyinstaller-hooks/hook-openlp.py (+31/-0)
pyinstaller-hooks/hook-ssl.py (+10/-0)
pyinstaller-hooks/rthook_ssl.py (+5/-0)
scripts/backup_georss.sh (+12/-0)
scripts/build_dev_deb.sh (+46/-0)
scripts/build_docs.sh (+39/-0)
scripts/build_nightly_deb.sh (+47/-0)
scripts/build_release_deb.sh (+19/-0)
scripts/deb_version.py (+40/-0)
scripts/dev_build.sh (+42/-0)
scripts/fix_bzr.py (+29/-0)
scripts/natsort.py (+35/-0)
scripts/nightly_build.sh (+78/-0)
scripts/notify_build.sh (+40/-0)
scripts/openlp_tweeter.py (+60/-0)
scripts/openlp_version.py (+57/-0)
scripts/openlptweet.py (+48/-0)
scripts/release_build.sh (+34/-0)
scripts/upload_build.sh (+59/-0)
windows/LICENSE.txt (+339/-0)
windows/OpenLP.iss.default (+185/-0)
windows/OpenLPPortable/App/Appinfo/Launcher/OpenLPPortable.ini (+10/-0)
windows/OpenLPPortable/App/Readme.txt (+3/-0)
windows/OpenLPPortable/Other/Source/LauncherLicense.txt (+339/-0)
windows/OpenLPPortable/Other/Source/OpenLPPortable.ini (+6/-0)
windows/OpenLPPortable/Other/Source/Readme.txt (+47/-0)
windows/OpenLPPortable/help.html (+160/-0)
windows/appinfo.ini.default (+32/-0)
windows/config.ini.default (+22/-0)
windows/openlp.conf (+26/-0)
windows/windows-builder.py (+649/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1450596: Failure to verify SSL cert in SongSelect importer

Medium

Fix Released

Link a bug report

Related blueprints

26. By Jonathan Springer on 2015-12-23

merge trunk

25. By Jonathan Springer on 2015-12-23

Changes for Qt5

24. By Jonathan Springer on 2015-10-17

Merge trunk

23. By Jonathan Springer on 2015-09-28

Fix windows-builder
Fix ssl hook due to PyInstaller changes

22. By Jonathan Springer on 2015-08-28

Add missed values in default config(OS X).

21. By Jonathan Springer on 2015-08-24

merge trunk

20. By Jonathan Springer on 2015-08-24

Add codesigning(OS X).
Add apple help file(OS X).

19. By Jonathan Springer on 2015-08-24

Show PyInstaller DEBUG output when run with verbose option.
Use debug bootloader when building devel version.
Add ssl hook and runtime hook to include certificates for Mac OS X(OS X).
Fix release app version(OS X).
Fix converting bytes to megabytes(OS X).
Fix argument to cp command(OS X).

18. By Jonathan Springer on 2015-07-27

merge trunk

17. By Jonathan Springer on 2015-05-26

Fix bundle identifier for Mac OS X