Unit 193 has proposed merging lp:~unit193/openlp/debian-package into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~unit193/openlp/debian-package/+merge/152365 Quick and small fix to the patches -- https://code.launchpad.net/~unit193/openlp/debian-package/+merge/152365 Your team OpenLP Core is requested to review the proposed merge of lp:~unit193/openlp/debian-package into lp:openlp.
=== added directory '.bzr-builddeb' === added file '.bzr-builddeb/default.conf' --- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000 +++ .bzr-builddeb/default.conf 2013-03-08 10:18:22 +0000 @@ -0,0 +1,2 @@ +[BUILDDEB] +merge = True === added directory 'debian' === added file 'debian/changelog' --- debian/changelog 1970-01-01 00:00:00 +0000 +++ debian/changelog 2013-03-08 10:18:22 +0000 @@ -0,0 +1,32 @@ +openlp (2.0.1-1) experimental; urgency=low + + * New upstream release + * Patched source to remove version check + + -- Raoul Snyman <[email protected]> Fri, 22 Feb 2013 21:39:51 +0200 + +openlp (1.9.12-1) experimental; urgency=low + + * New upstream release + * Updated watch file to only find tarballs with a version number in them + + -- Raoul Snyman <[email protected]> Fri, 09 Nov 2012 19:23:16 +0200 + +openlp (1.9.11-1) experimental; urgency=low + + * New upstream release + * Removed the unnecessary resources directory + + -- Raoul Snyman <[email protected]> Tue, 21 Aug 2012 21:37:26 +0200 + +openlp (1.9.10-1) unstable; urgency=low + + * New upstream release + + -- Raoul Snyman <[email protected]> Sat, 23 Jun 2012 21:54:30 +0200 + +openlp (1.9.9-1) unstable; urgency=low + + * Closes: #671117: Initial release + + -- Raoul Snyman <[email protected]> Wed, 09 May 2012 18:40:30 +0200 === added file 'debian/clean' --- debian/clean 1970-01-01 00:00:00 +0000 +++ debian/clean 2013-03-08 10:18:22 +0000 @@ -0,0 +1,2 @@ +resources/i18n/qm/* +*.egg-info/* === added file 'debian/compat' --- debian/compat 1970-01-01 00:00:00 +0000 +++ debian/compat 2013-03-08 10:18:22 +0000 @@ -0,0 +1,1 @@ +7 === added file 'debian/control' --- debian/control 1970-01-01 00:00:00 +0000 +++ debian/control 2013-03-08 10:18:22 +0000 @@ -0,0 +1,36 @@ +Source: openlp +Section: x11 +Priority: optional +Maintainer: Raoul Snyman <[email protected]> +Build-Depends: + debhelper (>= 7.0.50~), + python (>= 2.6.6-3~), + python-setuptools, + qt4-linguist-tools +Standards-Version: 3.9.3 +Vcs-Bzr: lp:openlp/debian-package +Vcs-Browser: http://bazaar.launchpad.net/~openlp-core/openlp/debian-package/files +Homepage: http://openlp.org/ + +Package: openlp +Architecture: all +Depends: + libjs-jquery, + python-beautifulsoup, + python-chardet, + python-enchant, + python-lxml, + python-mako, + python-migrate, + python-qt4, + python-qt4-gl, + python-qt4-phonon, + python-sqlalchemy, + python-sqlite, + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Church lyrics projection application + OpenLP is free church presentation software, or lyrics projection software, + used to display slides of songs, Bible verses, videos, images, and even + presentations for church worship using a computer and a data projector. === added file 'debian/copyright' --- debian/copyright 1970-01-01 00:00:00 +0000 +++ debian/copyright 2013-03-08 10:18:22 +0000 @@ -0,0 +1,79 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: OpenLP +Upstream-Contact: Raoul Snyman <[email protected]> +Source: http://openlp.org/ + +Files: * +Copyright: 2004, Raoul Snyman <[email protected]> and others +License: GPL-2 + +Files: openlp/plugins/remotes/html/jquery.js + openlp/plugins/remotes/html/jquery.mobile.js +Copyright: 2011, John Resig, + 2011, The Dojo Foundation +License: Expat or GPL-2 + +Files: resources/*.png +Copyright: 2005, David Vignoni, + 2005, Nuno Pinheiro, + 2005, Kenneth Wimer, + 2005, Johann Ollivier Lapeyre, +License: LGPL-2 + +Files: resources/openlp* + resources/about-new.bmp + resources/android_app_qr.png + resources/images/README.txt + resources/images/splash-screen-new.bmp + resources/images/wizard_createtheme.bmp + resources/images/wizard_exportsong.bmp + resources/images/wizard_firsttime.bmp + resources/images/wizard_importbible.bmp + resources/images/wizard_importsong.bmp +Copyright: 2004, Raoul Snyman <[email protected]> and others +License: GPL-2 + +License: GPL-2 + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; version + 2 of the License only. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: LGPL-2 + On Debian GNU/Linux systems, the complete text of the GNU Library General + Public License can be found in `/usr/share/common-licenses/LGPL-2' + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. === added file 'debian/docs' --- debian/docs 1970-01-01 00:00:00 +0000 +++ debian/docs 2013-03-08 10:18:22 +0000 @@ -0,0 +1,1 @@ +documentation/* === added file 'debian/install' --- debian/install 1970-01-01 00:00:00 +0000 +++ debian/install 2013-03-08 10:18:22 +0000 @@ -0,0 +1,2 @@ +resources/openlp.desktop /usr/share/applications +resources/i18n/qm/*.qm /usr/share/openlp/i18n === added file 'debian/links' --- debian/links 1970-01-01 00:00:00 +0000 +++ debian/links 2013-03-08 10:18:22 +0000 @@ -0,0 +1,2 @@ +/usr/share/openlp/openlp.pyw /usr/bin/openlp +/usr/share/javascript/jquery/jquery.js /usr/share/openlp/openlp/plugins/remotes/html/jquery.js === added file 'debian/openlp.manpages' --- debian/openlp.manpages 1970-01-01 00:00:00 +0000 +++ debian/openlp.manpages 2013-03-08 10:18:22 +0000 @@ -0,0 +1,1 @@ +documentation/openlp.1 === added directory 'debian/patches' === added file 'debian/patches/disable-version-check.patch' --- debian/patches/disable-version-check.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/disable-version-check.patch 2013-03-08 10:18:22 +0000 @@ -0,0 +1,16 @@ +Description: Remove the check for update feature from OpenLP. +Author: Raoul Snyman <[email protected]> +Forwarded: not-needed +--- old/openlp/core/__init__.py 2012-12-30 19:41:24 +0000 ++++ new/openlp/core/__init__.py 2013-02-21 11:38:27 +0000 +@@ -149,9 +149,6 @@ + self.processEvents() + if not has_run_wizard: + self.main_window.first_time() +- update_check = Settings().value(u'general/update check') +- if update_check: +- VersionThread(self.main_window).start() + self.main_window.is_display_blank() + self.main_window.app_startup() + return self.exec_() + === added file 'debian/patches/hide-check-setting.patch' --- debian/patches/hide-check-setting.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/hide-check-setting.patch 2013-03-08 10:18:22 +0000 @@ -0,0 +1,13 @@ +Description: Remove the "check for updates" setting from OpenLP. +Author: Raoul Snyman <[email protected]> +--- old/openlp/core/ui/generaltab.py 2012-12-30 19:41:24 +0000 ++++ new/openlp/core/ui/generaltab.py 2013-02-22 20:32:35 +0000 +@@ -165,6 +165,7 @@ + self.startupLayout.addWidget(self.showSplashCheckBox) + self.checkForUpdatesCheckBox = QtGui.QCheckBox(self.startupGroupBox) + self.checkForUpdatesCheckBox.setObjectName(u'checkForUpdatesCheckBox') ++ self.checkForUpdatesCheckBox.setVisible(False) + self.startupLayout.addWidget(self.checkForUpdatesCheckBox) + self.rightLayout.addWidget(self.startupGroupBox) + # Application Settings + === added file 'debian/patches/series' --- debian/patches/series 1970-01-01 00:00:00 +0000 +++ debian/patches/series 2013-03-08 10:18:22 +0000 @@ -0,0 +1,2 @@ +disable-version-check.patch +hide-check-setting.patch === added file 'debian/rules' --- debian/rules 1970-01-01 00:00:00 +0000 +++ debian/rules 2013-03-08 10:18:22 +0000 @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +%: + dh $@ --with python2 + +override_dh_auto_build: + dh_auto_build + mkdir -p resources/i18n/qm + set -e; \ + for TSFILE in resources/i18n/*.ts; do \ + lrelease-qt4 $$TSFILE -qm resources/i18n/qm/`basename $$TSFILE .ts`.qm; \ + done + +override_dh_auto_install: + dh_auto_install -- --install-lib /usr/share/openlp \ + --install-scripts /usr/share/openlp + +override_dh_install: + dh_install + set -e; \ + for SIZE in 16x16 32x32 48x48 64x64 128x128 256x256; do \ + mkdir -p debian/openlp/usr/share/icons/hicolor/$$SIZE/apps && \ + cp resources/images/openlp-logo-$$SIZE.png debian/openlp/usr/share/icons/hicolor/$$SIZE/apps/openlp.png; \ + done + 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 + rm -r debian/openlp/usr/share/openlp/resources === added directory 'debian/source' === added file 'debian/source/format' --- debian/source/format 1970-01-01 00:00:00 +0000 +++ debian/source/format 2013-03-08 10:18:22 +0000 @@ -0,0 +1,1 @@ +3.0 (quilt) === added file 'debian/watch' --- debian/watch 1970-01-01 00:00:00 +0000 +++ debian/watch 2013-03-08 10:18:22 +0000 @@ -0,0 +1,3 @@ +# watch control file for uscan +version=3 +http://sf.net/openlp/OpenLP-([\d\.]+)\.tar\.gz
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
