[Python-modules-commits] r28005 - in packages/pyqt5/trunk/debian (4 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Tue Mar 4 07:03:59 UTC 2014
Date: Tuesday, March 4, 2014 @ 07:03:56
Author: mitya57-guest
Revision: 28005
* Backport upstream patch to fix licensing for dbus module.
* Update debian/copyright to use the machine-readable DEP-5 format.
Added:
packages/pyqt5/trunk/debian/patches/fix_license.diff
Modified:
packages/pyqt5/trunk/debian/changelog
packages/pyqt5/trunk/debian/copyright
packages/pyqt5/trunk/debian/patches/series
Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog 2014-03-03 21:04:30 UTC (rev 28004)
+++ packages/pyqt5/trunk/debian/changelog 2014-03-04 07:03:56 UTC (rev 28005)
@@ -5,6 +5,8 @@
* Drop QMAKESPEC export, seems to be not needed anymore.
* Drop hack for alpha, it is no longer supported and qtwebkit is
not built there anyway.
+ * Backport upstream patch to fix licensing for dbus module.
+ * Update debian/copyright to use the machine-readable DEP-5 format.
-- Dmitry Shachnev <mitya57 at gmail.com> Mon, 10 Feb 2014 09:24:20 +0400
Modified: packages/pyqt5/trunk/debian/copyright
===================================================================
--- packages/pyqt5/trunk/debian/copyright 2014-03-03 21:04:30 UTC (rev 28004)
+++ packages/pyqt5/trunk/debian/copyright 2014-03-04 07:03:56 UTC (rev 28005)
@@ -1,172 +1,104 @@
-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
-It was downloaded from http://www.riverbankcomputing.co.uk
+Files: *
+Copyright: 2007-2014, Riverbank Computing Limited
+License: GPL-3
-Copyright (c) 2007-2014 Riverbank Computing Limited
+Files: dbus/*
+Copyright: 2014, Riverbank Computing Limited
+License: Expat
-License:
+Files: examples/*
+Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies)
+ 2013-2014, Riverbank Computing Limited
+License: BSD-3-clause
-PyQt5 is released under the terms of the GNU General Public License v3.
+Files: examples/designer/plugins/python/*
+ examples/designer/plugins/widgets/*
+Copyright: 2006, David Boddie <david at boddie.org.uk>
+ 2005-2006, Trolltech ASA
+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 3.0 as
- published by the Free Software Foundation.
+Files: pyuic/*
+Copyright: 2005, Thorsten Marek <shlomme at gmx.net>
+ 2014, Riverbank Computing Limited
+License: GPL-3 or BSD-3-clause
- 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: debian/*
+Copyright: 2006-2010, Thorsten Marek <shlomme at debian.org>
+ 2011-2014, Scott Kitterman <scott at kitterman.com>
+ 2013-2014, Dmitry Shachnev <mitya57 at gmail.com>
+License: GPL-2+
- On Debian systems, the complete text of the GNU General Public
- License, can be found in /usr/share/common-licenses/GPL.
--------------------------------------------------------------------
+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: 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, can be found in /usr/share/common-licenses/GPL.
-The files in pyuic/ are:
-(c) 2005 Torsten Marek (shlomme at gmx.net),
-(c) 2014 Riverbank Computing Limited,
-and double-licensted under the GPL v3 and the BSD license.
-
-Copyright (c) The Regents of the University of California.
-All rights reserved.
-
-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
+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 are licensed under the BSD license:
-
-#############################################################################
-##
-## Copyright (C) 2013 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 exception are some files in examples/designer/plugins/python and
-examples/designer/plugins/widgets, which are licensed under GNU General
-Public license v2 or later:
-
- Copyright (C) 2006 David Boddie <david at boddie.org.uk>
- Copyright (C) 2005-2006 Trolltech ASA. All rights reserved.
-
- 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.
-
-
-The files dbus/dbus.cpp and dbus/helper.h are:
-
-// Copyright (c) 2014 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
-
- 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: 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: packages/pyqt5/trunk/debian/patches/fix_license.diff
===================================================================
--- packages/pyqt5/trunk/debian/patches/fix_license.diff (rev 0)
+++ packages/pyqt5/trunk/debian/patches/fix_license.diff 2014-03-04 07:03:56 UTC (rev 28005)
@@ -0,0 +1,85 @@
+Description: fix license for dbus/dbus.cpp and dbus/helper.h
+Origin: upstream, changeset 6e831021c4ef
+
+--- a/dbus/dbus.cpp
++++ b/dbus/dbus.cpp
+@@ -3,21 +3,25 @@
+ //
+ // Copyright (c) 2014 Riverbank Computing Limited
+ //
+-// Licensed under the Academic Free License version 2.1
++// 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:
+ //
+-// 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.
++// The above copyright notice and this permission notice shall be
++// included in all copies or substantial portions of the Software.
+ //
+-// 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
++// 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.
+
+
+ #include <dbus/dbus-python.h>
+--- a/dbus/helper.h
++++ b/dbus/helper.h
+@@ -3,21 +3,25 @@
+ //
+ // Copyright (c) 2014 Riverbank Computing Limited
+ //
+-// Licensed under the Academic Free License version 2.1
++// 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:
+ //
+-// 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.
++// The above copyright notice and this permission notice shall be
++// included in all copies or substantial portions of the Software.
+ //
+-// 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
++// 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.
+
+
+ #include <QHash>
Modified: packages/pyqt5/trunk/debian/patches/series
===================================================================
--- packages/pyqt5/trunk/debian/patches/series 2014-03-03 21:04:30 UTC (rev 28004)
+++ packages/pyqt5/trunk/debian/patches/series 2014-03-04 07:03:56 UTC (rev 28005)
@@ -1,2 +1,3 @@
old_qt.diff
fix_qreal_check.diff
+fix_license.diff
More information about the Python-modules-commits
mailing list