openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #06822
[Merge] lp:~raoul-snyman/openlp/debian into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/debian into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/debian/+merge/52646
Add the debian stuff into the main repository.
--
https://code.launchpad.net/~raoul-snyman/openlp/debian/+merge/52646
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/debian into lp:openlp.
=== added directory 'resources/debian'
=== added file 'resources/debian/Makefile'
--- resources/debian/Makefile 1970-01-01 00:00:00 +0000
+++ resources/debian/Makefile 2011-03-09 07:49:58 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+build:
+ mkdir -p openlp/i18n
+ for TSFILE in resources/i18n/*.ts; do\
+ lrelease-qt4 $$TSFILE -qm openlp/i18n/`basename $$TSFILE .ts`.qm;\
+ done
+
+install:
+
+clean:
+
=== added directory 'resources/debian/debian'
=== added file 'resources/debian/debian/changelog'
--- resources/debian/debian/changelog 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/changelog 2011-03-09 07:49:58 +0000
@@ -0,0 +1,389 @@
+openlp (1.9.4+bzr1355-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 06 Mar 2011 00:10:03 -0500
+
+openlp (1.9.4+bzr1355-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 06 Mar 2011 00:07:03 -0500
+
+openlp (1.9.4+bzr1355-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 06 Mar 2011 00:05:27 -0500
+
+openlp (1.9.4+bzr1355-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 06 Mar 2011 00:03:17 -0500
+
+openlp (1.9.4+bzr1350-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 05 Mar 2011 00:08:15 -0500
+
+openlp (1.9.4+bzr1350-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 05 Mar 2011 00:06:40 -0500
+
+openlp (1.9.4+bzr1350-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 05 Mar 2011 00:05:09 -0500
+
+openlp (1.9.4+bzr1350-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 05 Mar 2011 00:03:14 -0500
+
+openlp (1.9.4+bzr1347-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Fri, 04 Mar 2011 00:04:49 -0500
+
+openlp (1.9.4+bzr1347-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Fri, 04 Mar 2011 00:04:15 -0500
+
+openlp (1.9.4+bzr1347-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Fri, 04 Mar 2011 00:03:34 -0500
+
+openlp (1.9.4+bzr1347-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Fri, 04 Mar 2011 00:02:43 -0500
+
+openlp (1.9.4+bzr1344-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Thu, 03 Mar 2011 00:03:56 -0500
+
+openlp (1.9.4+bzr1344-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Thu, 03 Mar 2011 00:03:30 -0500
+
+openlp (1.9.4+bzr1344-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Thu, 03 Mar 2011 00:03:05 -0500
+
+openlp (1.9.4+bzr1344-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Thu, 03 Mar 2011 00:02:26 -0500
+
+openlp (1.9.4+bzr1342-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Tue, 01 Mar 2011 00:03:44 -0500
+
+openlp (1.9.4+bzr1342-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Tue, 01 Mar 2011 00:03:28 -0500
+
+openlp (1.9.4+bzr1342-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Tue, 01 Mar 2011 00:03:03 -0500
+
+openlp (1.9.4+bzr1342-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Tue, 01 Mar 2011 00:02:28 -0500
+
+openlp (1.9.4+bzr1341-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 27 Feb 2011 00:04:05 -0500
+
+openlp (1.9.4+bzr1341-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 27 Feb 2011 00:03:48 -0500
+
+openlp (1.9.4+bzr1341-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 27 Feb 2011 00:03:20 -0500
+
+openlp (1.9.4+bzr1341-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 27 Feb 2011 00:02:34 -0500
+
+openlp (1.9.4+bzr1337-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 26 Feb 2011 00:04:02 -0500
+
+openlp (1.9.4+bzr1337-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 26 Feb 2011 00:03:44 -0500
+
+openlp (1.9.4+bzr1337-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 26 Feb 2011 00:03:18 -0500
+
+openlp (1.9.4+bzr1337-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 26 Feb 2011 00:02:32 -0500
+
+openlp (1.9.4+bzr1332-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Fri, 25 Feb 2011 00:04:00 -0500
+
+openlp (1.9.4+bzr1332-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Fri, 25 Feb 2011 00:03:41 -0500
+
+openlp (1.9.4+bzr1332-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Fri, 25 Feb 2011 00:03:16 -0500
+
+openlp (1.9.4+bzr1332-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Fri, 25 Feb 2011 00:02:36 -0500
+
+openlp (1.9.4+bzr1328-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Thu, 24 Feb 2011 00:03:47 -0500
+
+openlp (1.9.4+bzr1328-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Thu, 24 Feb 2011 00:03:31 -0500
+
+openlp (1.9.4+bzr1328-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Thu, 24 Feb 2011 00:03:07 -0500
+
+openlp (1.9.4+bzr1328-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Thu, 24 Feb 2011 00:02:28 -0500
+
+openlp (1.9.4+bzr1324-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Wed, 23 Feb 2011 00:03:48 -0500
+
+openlp (1.9.4+bzr1324-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Wed, 23 Feb 2011 00:03:33 -0500
+
+openlp (1.9.4+bzr1324-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Wed, 23 Feb 2011 00:03:08 -0500
+
+openlp (1.9.4+bzr1324-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Wed, 23 Feb 2011 00:02:28 -0500
+
+openlp (1.9.4+bzr1322-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Tue, 22 Feb 2011 00:04:06 -0500
+
+openlp (1.9.4+bzr1322-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Tue, 22 Feb 2011 00:03:52 -0500
+
+openlp (1.9.4+bzr1322-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Tue, 22 Feb 2011 00:03:28 -0500
+
+openlp (1.9.4+bzr1322-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Tue, 22 Feb 2011 00:02:42 -0500
+
+openlp (1.9.4+bzr1320-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Mon, 21 Feb 2011 00:03:59 -0500
+
+openlp (1.9.4+bzr1320-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Mon, 21 Feb 2011 00:03:45 -0500
+
+openlp (1.9.4+bzr1320-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Mon, 21 Feb 2011 00:03:21 -0500
+
+openlp (1.9.4+bzr1320-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Mon, 21 Feb 2011 00:02:41 -0500
+
+openlp (1.9.4+bzr1316-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 20 Feb 2011 05:32:08 -0500
+
+openlp (1.9.4+bzr1316-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 20 Feb 2011 05:31:51 -0500
+
+openlp (1.9.4+bzr1316-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 20 Feb 2011 05:31:28 -0500
+
+openlp (1.9.4+bzr1316-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sun, 20 Feb 2011 05:30:49 -0500
+
+openlp (1.9.4+bzr1315-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 16:24:12 -0500
+
+openlp (1.9.4+bzr1315-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 16:23:51 -0500
+
+openlp (1.9.4+bzr1315-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 16:23:28 -0500
+
+openlp (1.9.4+bzr1315-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 16:22:49 -0500
+
+openlp (1.9.4+bzr1314-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 15:35:36 -0500
+
+openlp (1.9.4+bzr1314-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 15:35:21 -0500
+
+openlp (1.9.4+bzr1314-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 15:34:53 -0500
+
+openlp (1.9.4+bzr1314-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 15:34:10 -0500
+
+openlp (1.9.4+bzr1313-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 13:58:14 -0500
+
+openlp (1.9.4+bzr1313-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 13:57:40 -0500
+
+openlp (1.9.4+bzr1313-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 13:57:11 -0500
+
+openlp (1.9.4+bzr1313-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- <openlp@xxxxxxxxxxxxx> Sat, 19 Feb 2011 13:56:17 -0500
+
+openlp (0.0.0+bzr664-0ubuntu1) karmic; urgency=low
+
+ * Initial release
+
+ -- Michael Gorven <michael@xxxxxxxxxxxxx> Fri, 06 Nov 2009 09:46:40 +0200
=== added file 'resources/debian/debian/compat'
--- resources/debian/debian/compat 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/compat 2011-03-09 07:49:58 +0000
@@ -0,0 +1,1 @@
+5
=== added file 'resources/debian/debian/control'
--- resources/debian/debian/control 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/control 2011-03-09 07:49:58 +0000
@@ -0,0 +1,19 @@
+Source: openlp
+Section: python
+Priority: extra
+Maintainer: OpenLP Developers <openlp-dev@xxxxxxxxxxxxxxxxxxx>
+Build-Depends: cdbs, debhelper (>= 5), python-setuptools, python-support,
+ python, qt4-dev-tools
+Standards-Version: 3.8.3
+Homepage: http://openlp.org/
+
+Package: openlp
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4,
+ python-qt4-phonon, python-sqlalchemy, python-chardet, python-beautifulsoup,
+ python-lxml, python-sqlite, python-enchant
+Conflicts: python-openlp
+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 'resources/debian/debian/copyright'
--- resources/debian/debian/copyright 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/copyright 2011-03-09 07:49:58 +0000
@@ -0,0 +1,10 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: OpenLP
+Upstream-Maintainer: OpenLP Developers <openlp-dev@xxxxxxxxxxxxxxxxxxx>
+Upstream-Source: http://openlp.org/
+
+Files: *
+Copyright: (c) 2008-2009 Raoul Snyman
+License: GPL-2
+X-Comment: On Debian GNU/Linux systems, the complete text of the
+ GPL-2 License can be found in /usr/share/common-licenses/GPL-2
=== added file 'resources/debian/debian/docs'
--- resources/debian/debian/docs 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/docs 2011-03-09 07:49:58 +0000
@@ -0,0 +1,1 @@
+documentation
=== added file 'resources/debian/debian/openlp.install'
--- resources/debian/debian/openlp.install 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/openlp.install 2011-03-09 07:49:58 +0000
@@ -0,0 +1,1 @@
+resources/openlp.desktop /usr/share/applications
=== added file 'resources/debian/debian/pycompat'
--- resources/debian/debian/pycompat 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/pycompat 2011-03-09 07:49:58 +0000
@@ -0,0 +1,1 @@
+2
=== added file 'resources/debian/debian/pyversions'
--- resources/debian/debian/pyversions 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/pyversions 2011-03-09 07:49:58 +0000
@@ -0,0 +1,1 @@
+2.5-
=== added file 'resources/debian/debian/rules'
--- resources/debian/debian/rules 1970-01-01 00:00:00 +0000
+++ resources/debian/debian/rules 2011-03-09 07:49:58 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM := pysupport
+DEB_MAKE_BUILD_TARGET := build
+DEB_MAKE_INSTALL_TARGET :=
+DEB_MAKE_CLEAN_TARGET :=
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+binary-post-install/openlp::
+ 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
+
+ cd debian/openlp/usr/bin/ && mv openlp.pyw openlp
Follow ups
