From 62d86bb4d0d82013c1c5c7b05d181bf46da207af Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 16 Jun 2015 22:07:34 +0200 Subject: [PATCH] Fixed copyright for TRB143 --- gentoo/openlp-1.9.4.ebuild | 5 +++-- launchpad-ppa/debian/copyright | 2 +- osx/macosx-builder.py | 9 +-------- .../hook-mysql-connector-python.py | 9 +-------- .../hook-openlp.core.ui.media.py | 9 +-------- ...lugins.presentations.presentationplugin.py | 9 +-------- pyinstaller-hooks/hook-openlp.py | 9 +-------- pyinstaller-hooks/rthook_openlp_pyqt4.py | 9 +-------- scripts/deb_version.py | 19 ++++++++++++++++++ scripts/fix_bzr.py | 18 +++++++++++++++++ scripts/openlp_tweeter.py | 20 ++++++++++++++++++- scripts/openlp_version.py | 19 ++++++++++++++++++ scripts/openlptweet.py | 20 ++++++++++++++++++- windows/windows-builder.py | 9 +-------- 14 files changed, 105 insertions(+), 61 deletions(-) diff --git a/gentoo/openlp-1.9.4.ebuild b/gentoo/openlp-1.9.4.ebuild index 4e87a27..ed5d551 100644 --- a/gentoo/openlp-1.9.4.ebuild +++ b/gentoo/openlp-1.9.4.ebuild @@ -1,5 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Copyright 2010 Jaak Ristioja +# Copyright 2015 OpenLP Developers # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -15,7 +16,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 x86-fbsd x86-freebsd amd64-linux x86-linux x86-macos x86-solaris" -RDEPEND=">=dev-lang/python-2.5.0 +RDEPEND=">=dev-lang/python-3.4.0 dev-python/beautifulsoup dev-python/chardet dev-python/lxml @@ -24,7 +25,7 @@ RDEPEND=">=dev-lang/python-2.5.0 dev-python/sqlalchemy" DEPEND="${RDEPEND}" -PYTHON_DEPEND="2:2.5" +PYTHON_DEPEND="3:3.4" PYTHON_MODNAME="openlp" S=${WORKDIR}/OpenLP-${PV}-src diff --git a/launchpad-ppa/debian/copyright b/launchpad-ppa/debian/copyright index 54e52a3..6518f3d 100644 --- a/launchpad-ppa/debian/copyright +++ b/launchpad-ppa/debian/copyright @@ -4,7 +4,7 @@ Upstream-Maintainer: OpenLP Developers Upstream-Source: http://openlp.org/ Files: * -Copyright: (c) 2008-2009 Raoul Snyman +Copyright: (c) 2008-2015 OpenLP Developers 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 diff --git a/osx/macosx-builder.py b/osx/macosx-builder.py index fb8cc53..92a9916 100644 --- a/osx/macosx-builder.py +++ b/osx/macosx-builder.py @@ -4,14 +4,7 @@ ############################################################################### # OpenLP - Open Source Lyrics Projection # # --------------------------------------------------------------------------- # -# Copyright (c) 2008-2014 Raoul Snyman # -# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # -# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # -# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # -# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # -# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # -# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # -# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# Copyright (c) 2008-2015 OpenLP Developers # # --------------------------------------------------------------------------- # # 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 # diff --git a/pyinstaller-hooks/hook-mysql-connector-python.py b/pyinstaller-hooks/hook-mysql-connector-python.py index 917b938..f8ba46f 100644 --- a/pyinstaller-hooks/hook-mysql-connector-python.py +++ b/pyinstaller-hooks/hook-mysql-connector-python.py @@ -4,14 +4,7 @@ ############################################################################### # OpenLP - Open Source Lyrics Projection # # --------------------------------------------------------------------------- # -# Copyright (c) 2008-2014 Raoul Snyman # -# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # -# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # -# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # -# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # -# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # -# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # -# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# Copyright (c) 2008-2015 OpenLP Developers # # --------------------------------------------------------------------------- # # 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 # diff --git a/pyinstaller-hooks/hook-openlp.core.ui.media.py b/pyinstaller-hooks/hook-openlp.core.ui.media.py index 5d1828c..c4af859 100644 --- a/pyinstaller-hooks/hook-openlp.core.ui.media.py +++ b/pyinstaller-hooks/hook-openlp.core.ui.media.py @@ -4,14 +4,7 @@ ############################################################################### # OpenLP - Open Source Lyrics Projection # # --------------------------------------------------------------------------- # -# Copyright (c) 2008-2014 Raoul Snyman # -# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # -# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # -# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # -# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # -# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # -# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # -# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# Copyright (c) 2008-2015 OpenLP Developers # # --------------------------------------------------------------------------- # # 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 # diff --git a/pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py b/pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py index 39318ce..9fe30ad 100644 --- a/pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py +++ b/pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py @@ -4,14 +4,7 @@ ############################################################################### # OpenLP - Open Source Lyrics Projection # # --------------------------------------------------------------------------- # -# Copyright (c) 2008-2014 Raoul Snyman # -# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # -# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # -# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # -# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # -# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # -# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # -# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# Copyright (c) 2008-2015 OpenLP Developers # # --------------------------------------------------------------------------- # # 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 # diff --git a/pyinstaller-hooks/hook-openlp.py b/pyinstaller-hooks/hook-openlp.py index 984f16f..c14ed1b 100644 --- a/pyinstaller-hooks/hook-openlp.py +++ b/pyinstaller-hooks/hook-openlp.py @@ -4,14 +4,7 @@ ############################################################################### # OpenLP - Open Source Lyrics Projection # # --------------------------------------------------------------------------- # -# Copyright (c) 2008-2014 Raoul Snyman # -# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # -# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # -# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # -# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # -# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # -# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # -# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# Copyright (c) 2008-2015 OpenLP Developers # # --------------------------------------------------------------------------- # # 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 # diff --git a/pyinstaller-hooks/rthook_openlp_pyqt4.py b/pyinstaller-hooks/rthook_openlp_pyqt4.py index d49b3fa..1142f28 100644 --- a/pyinstaller-hooks/rthook_openlp_pyqt4.py +++ b/pyinstaller-hooks/rthook_openlp_pyqt4.py @@ -4,14 +4,7 @@ ############################################################################### # OpenLP - Open Source Lyrics Projection # # --------------------------------------------------------------------------- # -# Copyright (c) 2008-2013 Raoul Snyman # -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # -# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # -# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # -# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # -# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # -# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # -# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# Copyright (c) 2008-2015 OpenLP Developers # # --------------------------------------------------------------------------- # # 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 # diff --git a/scripts/deb_version.py b/scripts/deb_version.py index 12e4657..c14e60b 100755 --- a/scripts/deb_version.py +++ b/scripts/deb_version.py @@ -1,5 +1,24 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2015 OpenLP Developers # +# --------------------------------------------------------------------------- # +# 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. # +# # +# 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 program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### + from bzrlib.branch import Branch from natsort import nsorted diff --git a/scripts/fix_bzr.py b/scripts/fix_bzr.py index 0e52540..b035ce6 100755 --- a/scripts/fix_bzr.py +++ b/scripts/fix_bzr.py @@ -1,4 +1,22 @@ #!/usr/bin/python +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2015 OpenLP Developers # +# --------------------------------------------------------------------------- # +# 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. # +# # +# 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 program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### import sys diff --git a/scripts/openlp_tweeter.py b/scripts/openlp_tweeter.py index 10ef2ce..594cfa6 100755 --- a/scripts/openlp_tweeter.py +++ b/scripts/openlp_tweeter.py @@ -1,5 +1,23 @@ #!/home/openlp/VirtualEnv/stats/bin/python - +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2015 OpenLP Developers # +# --------------------------------------------------------------------------- # +# 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. # +# # +# 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 program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### + import sys import tweepy diff --git a/scripts/openlp_version.py b/scripts/openlp_version.py index bfaa23f..a77eafe 100755 --- a/scripts/openlp_version.py +++ b/scripts/openlp_version.py @@ -1,5 +1,24 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2015 OpenLP Developers # +# --------------------------------------------------------------------------- # +# 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. # +# # +# 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 program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### + import sys import os diff --git a/scripts/openlptweet.py b/scripts/openlptweet.py index ad15604..23b5052 100755 --- a/scripts/openlptweet.py +++ b/scripts/openlptweet.py @@ -1,5 +1,23 @@ -#! /usr/bin/python +#!/usr/bin/env python2 # -*- coding: utf-8 -*- +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2015 OpenLP Developers # +# --------------------------------------------------------------------------- # +# 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. # +# # +# 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 program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### from optparse import OptionParser diff --git a/windows/windows-builder.py b/windows/windows-builder.py index a0a91bb..ec8b426 100644 --- a/windows/windows-builder.py +++ b/windows/windows-builder.py @@ -4,14 +4,7 @@ ############################################################################### # OpenLP - Open Source Lyrics Projection # # --------------------------------------------------------------------------- # -# Copyright (c) 2008-2014 Raoul Snyman # -# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # -# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # -# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # -# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # -# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # -# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # -# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# Copyright (c) 2008-2015 OpenLP Developers # # --------------------------------------------------------------------------- # # 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 #