[Python-modules-commits] r22152 - in packages/circuits/trunk/debian (changelog copyright)

Wed Jun 13 05:40:52 UTC 2012

Date: Wednesday, June 13, 2012 @ 05:40:50
  Author: eriol-guest
Revision: 22152

Made debian/copyright DEP5 compliant

Modified:
  packages/circuits/trunk/debian/changelog
  packages/circuits/trunk/debian/copyright

Modified: packages/circuits/trunk/debian/changelog
===================================================================

--- packages/circuits/trunk/debian/changelog	2012-06-13 05:09:51 UTC (rev 22151)
+++ packages/circuits/trunk/debian/changelog	2012-06-13 05:40:50 UTC (rev 22152)
@@ -30,6 +30,8 @@
     - Added python-serial, python-routes, python-imaging, python-greenlet
       to python-circuits' Recommends and python3-serial to python3-circuits'
       Recommends
+  * debian/copyright
+    - Made DEP5 compliant
   * debian/patches/01_use_issuetraker_instead_of_bitbucket.patch
     - Use python-sphinxcontrib.issuetracker instead of sphinxcontrib-bitbucket
       because the latter is not packaged for Debian and it does't add more
@@ -61,7 +63,7 @@
   * debian/watch
     - Updated to new upstream download location (PyPI)
 
- -- Daniele Tricoli <eriol at mornie.org>  Wed, 13 Jun 2012 07:07:45 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Wed, 13 Jun 2012 07:31:45 +0200
 
 circuits (1.2.1-1) unstable; urgency=low
 

Modified: packages/circuits/trunk/debian/copyright
===================================================================
--- packages/circuits/trunk/debian/copyright	2012-06-13 05:09:51 UTC (rev 22151)
+++ packages/circuits/trunk/debian/copyright	2012-06-13 05:40:50 UTC (rev 22152)
@@ -1,75 +1,83 @@
-This package was debianized by Sandro Tosi <morph at debian.org> on
-Fri, 07 Nov 2008 17:19:27 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: circuits
+Upstream-Contact: James Mills <prologic at shortcircuit.net.au>
+Source: http://pypi.python.org/pypi/circuits
 
-It was downloaded from http://code.google.com/p/circuits/
+Files: *
+Copyright: 2004-2011, James Mills
+License: Expat
 
-Upstream Author:
+Files: debian/*
+Copyright: 2008-2010, Sandro Tosi <morph at debian.org>
+           2011-2012, Daniele Tricoli <eriol at mornie.org>
+License: Expat
 
-    James Mills <prologic at shortcircuit.net.au>
+Files: circuits/web/_httpauth.py
+Copyright: 2005, Tiago Cogumbreiro <cogumbreiro at users.sf.net>
+License: BSD-3-clause
 
-Copyright:
+Files: examples/web/terminal/static/js/jquery.terminal.js
+Copyright: 2009, Sagie Maoz <n0nick at php.net>
+License: GPL-3
 
-    Copyright (C) 2004-2010 by James Mills
+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.
 
-License:
+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.
+ * 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 Sylvain Hellegouarch nor the names of his 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.
 
-    Circuits is covered by the MIT license:
-
-    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.
-
-The Debian packaging is Copyright (C) 2008-2010, Sandro Tosi <morph at debian.org>
-and is licensed under the same terms as the upstream code (see above).
-
-This file has different copyright and license information:
- 
-circuits/version.py
-    # Copyright (C) 2005, 2006, 2008 by Intevation GmbH
-    # Author(s):
-    # Thomas Arendsen Hein <thomas at intevation.de>
-    #
-    # This program is free software under the GNU GPL (>=v2)
-    On a Debian system it is available at: /usr/share/common-licenses/GPL-2
-
-circuits/lib/web/_httpauth.py
-Copyright (c) 2005, Tiago Cogumbreiro <cogumbreiro at users.sf.net>
-All rights reserved.
-
-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 Sylvain Hellegouarch nor the names of his 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.
+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 as published by
+ the Free Software Foundation, either 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 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, see <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.


