[Python-modules-commits] r31428 - in packages/python-qt4/trunk/debian (4 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Wed Nov 12 18:15:59 UTC 2014
Date: Wednesday, November 12, 2014 @ 18:15:58
Author: mitya57-guest
Revision: 31428
* New upstream bugfix release.
* Switch debian/copyright to copyright-format 1.0.
* Add missing licensing information.
* Use Files-Excluded instead of get-orig-source.
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/copyright
packages/python-qt4/trunk/debian/rules
Deleted:
packages/python-qt4/trunk/debian/get-orig-source.sh
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2014-11-12 09:01:19 UTC (rev 31427)
+++ packages/python-qt4/trunk/debian/changelog 2014-11-12 18:15:58 UTC (rev 31428)
@@ -1,3 +1,12 @@
+python-qt4 (4.11.3+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream bugfix release.
+ * Switch debian/copyright to copyright-format 1.0.
+ * Add missing licensing information.
+ * Use Files-Excluded instead of get-orig-source.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 12 Nov 2014 21:14:41 +0300
+
python-qt4 (4.11.2+dfsg-1) unstable; urgency=medium
* New upstream bugfix release.
Modified: packages/python-qt4/trunk/debian/copyright
===================================================================
--- packages/python-qt4/trunk/debian/copyright 2014-11-12 09:01:19 UTC (rev 31427)
+++ packages/python-qt4/trunk/debian/copyright 2014-11-12 18:15:58 UTC (rev 31428)
@@ -1,177 +1,176 @@
-This package was debianized by Torsten Marek <shlomme at gmx.net> on
-Fri, 2 Dec 2005 11:43:16 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: pyqt at riverbankcomputing.com
+Files-Excluded: doc/html/_static
+ doc/html/searchindex.js
+ examples/webkit/fancybrowser/jquery.min.js
+ examples/webkit/fancybrowser/jquery_rc2.py
+ examples/webkit/fancybrowser/jquery_rc3.py
-It was downloaded from http://www.riverbankcomputing.co.uk
+Files: *
+Copyright: 2007-2014, Riverbank Computing Limited
+License: GPL-2 or GPL-3
-Copyright (c) 2007,2010,2011,2012 Riverbank Computing Limited
+Files: contrib/lang/lang.py
+Copyright: 2006, Hans-Peter Jansen <hpj at urpla.net>
+License: WTFPL-2
-License:
+Files: contrib/modeltest/*
+Copyright: 2007, Trolltech ASA
+License: GPL-2
-PyQt4 is released under the terms of the GNU General Public License.
+Files: contrib/sandbox/sandbox.*
+Copyright: 2007-2009, Mark Summerfield
+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; either version 2 or version 3 of the
- License.
+Files: dbus/*
+Copyright: 2012, Riverbank Computing Limited
+License: GPL-2+
- 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.
+Files: elementtree/*
+Copyright: 1999-2004, Fredrik Lundh
+License: SecretLabs
- You should have received a copy of the GNU General Public License with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
- if not, write to the Free Software Foundation, Inc., 51 Franklin St,
- Fifth Floor, Boston, MA 02110-1301 USA
--------------------------------------------------------------------
+Files: examples/*
+Copyright: 1992-2007, Trolltech ASA
+ 2006-2007, David Boddie <david at boddie.org.uk>
+ 2007-2011, Riverbank Computing Limited
+ 2010-2011, Nokia Corporation and/or its subsidiary(-ies)
+ 2012, Digia Plc and/or its subsidiary(-ies)
+ 2010-2012, Hans-Peter Jansen <hpj at urpla.net>
+ 2014, Moritz Warning <moritzwarning at web.de>
+License: BSD-3-clause
+Files: examples/demos/*
+ examples/draganddrop/delayedencoding/images/example.svg
+ examples/ipc/*
+Copyright: 2010, Hans-Peter Jansen <hpj at urpla.net>
+ 2010, Nokia Corporation and/or its subsidiary(-ies)
+License: LGPL-2.1 with Nokia-1.1 exception or GPL-3
-The files in pyuic/ are (c) 2005 Torsten Marek (shlomme at gmx.net) and
-double-licensted under the GPL and the BSD license.
+Files: examples/designer/plugins/python/*
+ examples/designer/plugins/widgets/*
+Copyright: 2006, David Boddie <david at boddie.org.uk>
+ 2005-2006, Trolltech ASA
+ 2008, Denviso GmbH <ulrich.berning at denviso.de>
+License: GPL-2+
-Copyright (c) The Regents of the University of California.
-All rights reserved.
+Files: pyuic/*
+Copyright: 2006, Thorsten Marek <shlomme at gmx.net>
+ 2011-2014, Riverbank Computing Limited
+License: GPL-2 or BSD-3-clause
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
+Files: debian/*
+Copyright: 2006-2010, Thorsten Marek <shlomme at debian.org>
+ 2011-2014, Scott Kitterman <scott at kitterman.com>
+ 2013-2014, Dmitry Shachnev <mitya57 at debian.org>
+ 2001-2014, Other Debian contributors
+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 version 2.0 as
+ published by the Free Software Foundation.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+License: GPL-3
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3.0 as
+ published by the Free Software Foundation.
+ .
+ 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.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 3, can be found in /usr/share/common-licenses/GPL-3.
+
+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; either 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.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+License: LGPL-2.1 with Nokia-1.1 exception
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version
+ 2.1 as published by the Free Software Foundation.
+ .
+ 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 Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License, version 2.1, can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+ .
+ As an additional permission to the GNU Lesser General Public License version
+ 2.1, the object code form of a "work that uses the Library" may incorporate
+ material from a header file that is part of the Library. You may distribute
+ such object code under terms of your choice, provided that:
+ (i) the header files of the Library have not been modified; and
+ (ii) the incorporated material is limited to numerical parameters, data
+ structure layouts, accessors, macros, inline functions and
+ templates; and
+ (iii) you comply with the terms of Section 6 of the GNU Lesser General
+ Public License version 2.1.
+ .
+ Moreover, you may apply this exception to a modified version of the Library,
+ provided that such modification does not involve copying material from the
+ Library into the modified Library's header files unless such material is
+ limited to (i) numerical parameters; (ii) data structure layouts;
+ (iii) accessors; and (iv) small macros, templates and inline functions of
+ five lines or less in length.
+ .
+ Furthermore, you are not required to apply this additional permission to a
+ modified version of the Library.
+
+License: BSD-3-clause:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ * Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
+ * Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-3. Neither the name of the University nor the names of its contributors
+ * Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
--------------------------------------------------------------------
-
-files in examples (except examples/designer/plugins, which are licensed under
-the same terms as the rest of the package) are licensed under the BSD license:
-
-#############################################################################
-##
-## Copyright (C) 2010 Riverbank Computing Limited.
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-##
-## This file is part of the examples of PyQt.
-##
-## $QT_BEGIN_LICENSE:BSD$
-## You may use this file under the terms of the BSD license as follows:
-##
-## "Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions are
-## met:
-## * Redistributions of source code must retain the above copyright
-## notice, this list of conditions and the following disclaimer.
-## * Redistributions in binary form must reproduce the above copyright
-## notice, this list of conditions and the following disclaimer in
-## the documentation and/or other materials provided with the
-## distribution.
-## * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-## the names of its contributors may be used to endorse or promote
-## products derived from this software without specific prior written
-## permission.
-##
-## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-
-The files in elementtree/ are (c) 1999-2004 by Fredrik Lundh.
-By obtaining, using, and/or copying this software and/or its
-associated documentation, you agree that you have read, understood,
-and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and
-its associated documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice appears in
-all copies, and that both that copyright notice and this permission
-notice appear in supporting documentation, and that the name of
-Secret Labs AB or the author not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.
-
-SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
-ABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
---------------------------------------------------------------------
-
-The files dbus/dbus.cpp and dbus/dbus.h are:
-
-// Copyright (c) 2012 Riverbank Computing Limited
-//
-// Licensed under the Academic Free License version 2.1
-//
-// 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; either version 2 of the License, or
-// (at your option) any later version.
-//
-// 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Copyright and licensing for contrib/sandbox/sandbox.* are:
-Copyright (c) 2007-9 Mark Summerfield. All rights reserved.</font>
-
-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, or version 3 of the
-License or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-<i>without any warranty</i>; without even the implied warranty of
-<i>merchantability</i> or <i>fitness for a particular purpose</i>.
-See the <a href="http://www.gnu.org/licenses/">GNU General Public
-License</a> for more details."""
-
-The Debian packaging is © 2006-2008, Torsten Marek <shlomme at debian.org>
-and licensed under the GPL.
-
- 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; either 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 with
- the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
- if not, write to the Free Software Foundation, Inc., 51 Franklin St,
- Fifth Floor, Boston, MA 02110-1301 USA
+License: WTFPL-2
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+ .
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
Deleted: packages/python-qt4/trunk/debian/get-orig-source.sh
===================================================================
--- packages/python-qt4/trunk/debian/get-orig-source.sh 2014-11-12 09:01:19 UTC (rev 31427)
+++ packages/python-qt4/trunk/debian/get-orig-source.sh 2014-11-12 18:15:58 UTC (rev 31428)
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-export TAR_OPTIONS='--owner root --group root --mode a+rX'
-export GZIP_OPTIONS='-9n'
-pwd=$(pwd)
-dfsg_version="$1"
-if [ -z "$dfsg_version" ]
-then
- printf 'Usage: %s <version>\n' "$0"
- exit 1
-fi
-upstream_version="${dfsg_version%+dfsg*}"
-cd "$(dirname "$0")/../"
-tmpdir=$(mktemp -t -d get-orig-source.XXXXXX)
-uscan --noconf --force-download --rename --download-version="$upstream_version" --destdir="$tmpdir"
-cd "$tmpdir"
-tar -xzf python-qt4_*.orig.tar.gz
-rm python-qt4_*.orig.tar.gz
-
-mv PyQt-x11-gpl-* "python-qt4-${dfsg_version}.orig"
-
-# minimized jquery and underscore
-rm -rf "python-qt4-${dfsg_version}.orig/doc/html/_static"
-rm -f "python-qt4-${dfsg_version}.orig/doc/html/searchindex.js"
-rm -f "python-qt4-${dfsg_version}.orig/examples/webkit/fancybrowser/jquery.min.js"
-rm -f "python-qt4-${dfsg_version}.orig/examples/webkit/fancybrowser/jquery_rc2.py"
-rm -f "python-qt4-${dfsg_version}.orig/examples/webkit/fancybrowser/jquery_rc3.py"
-
-tar -czf "$pwd/python-qt4_${dfsg_version}.orig.tar.gz" "python-qt4-${dfsg_version}.orig"
-rm -rf "$tmpdir"
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2014-11-12 09:01:19 UTC (rev 31427)
+++ packages/python-qt4/trunk/debian/rules 2014-11-12 18:15:58 UTC (rev 31428)
@@ -306,6 +306,6 @@
binary: binary-arch binary-indep
get-orig-source:
- sh $(CURDIR)/debian/get-orig-source.sh $(upstream_dfsg_version)
+ uscan --verbose --download-current-version
.PHONY: build-indep build-arch build clean binary-indep binary-arch binary configure get-orig-source
More information about the Python-modules-commits
mailing list