[Python-apps-commits] r8815 - in packages/hellanzb/trunk/debian (changelog copyright)

dandrimont-guest at users.alioth.debian.org dandrimont-guest at users.alioth.debian.org
Fri Jun 1 05:23:06 UTC 2012 

    Date: Friday, June 1, 2012 @ 05:22:58
  Author: dandrimont-guest
Revision: 8815

Update copyright to machine-readable format 1.0

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

Modified: packages/hellanzb/trunk/debian/changelog
===================================================================
--- packages/hellanzb/trunk/debian/changelog	2012-06-01 05:15:58 UTC (rev 8814)
+++ packages/hellanzb/trunk/debian/changelog	2012-06-01 05:22:58 UTC (rev 8815)
@@ -14,6 +14,7 @@
     - Drop README.source
   * Convert debian/rules to dh short form
   * Bump debhelper compatibility level to 8
+  * Update debian/copyright file to machine-readable format version 1.0
 
  -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Fri, 01 Jun 2012 06:24:48 +0200
 

Modified: packages/hellanzb/trunk/debian/copyright
===================================================================
--- packages/hellanzb/trunk/debian/copyright	2012-06-01 05:15:58 UTC (rev 8814)
+++ packages/hellanzb/trunk/debian/copyright	2012-06-01 05:22:58 UTC (rev 8815)
@@ -1,91 +1,98 @@
-This package was debianized by Adam Cécile (Le_Vert) <gandalf at le-vert.net> on
-Fri,  8 Sep 2006 21:12:36 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source:  http://www.hellanzb.com/
+Upstream-Contact: Philip Jenvey <pjenvey at groovie.org>, Ben Bangert <ben at groovie.org>
 
-It was downloaded from http://www.hellanzb.com/
+Files: *
+Copyright: 2005, Philip Jenvey <pjenvey at groovie.org>
+           2005, Ben Bangert <ben at groovie.org>
+License: BSD-3-clause
 
-Upstream Author: Philip Jenvey <pjenvey at groovie.org>
-                 Ben Bangert <ben at groovie.org>
+Files: Hellanzb/Growl.py
+Copyright: 2004, Rui Carmo
+License: BSD-3-clause
 
-Copyright: (C) 2005, Philip Jenvey <pjenvey at groovie.org>
-           (C) 2005, Ben Bangert <ben at groovie.org>
+Files: Hellanzb/external/elementtree/SimpleXMLWriter.py
+Copyright: 2001-2004, Fredrik Lundh
+License:
+ 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.
 
+Files: Hellanzb/HellaXMLRPC/xmlrpc.py Hellanzb/NZBLeecher/nntp.py
+Copyright: 2001-2004, Twisted Matrix Laboratories
 License:
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted under the terms of the BSD 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.
 
-   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: debian/*
+Copyright: 2006-2009, Adam Cécile (Le_Vert) <gandalf at le-vert.net>
+           2012, Nicolas Dandrimont <nicolas.dandrimont at crans.org>
+License: 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, or (at your option) any later
+ version.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
-On Debian systems, the complete text of the BSD License can be
-found in `/usr/share/common-licenses/BSD'.
-
-All files except those listed below are distributed under the terms of the
-BSD license with the copyright above.
-
-
-
-"Hellanzb/Growl.py" is (C) 2004 Rui Carmo and released under the terms of
-the BSD License.
-
-"Hellanzb/external/elementtree/SimpleXMLWriter.py" is (C) 2001-2004
-Fredrik Lundh and distributed under the terms of the license below :
-
-   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.
-
-"Hellanzb/HellaXMLRPC/xmlrpc.py" and "Hellanzb/NZBLeecher/nntp.py" are
-(C) 2001-2004 Twisted Matrix Laboratories and distributed under the terms
-of the license below :
-
-   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) 2006-2009, Adam Cécile (Le_Vert)
-<gandalf at le-vert.net> and is licensed under the GPL,
-see `/usr/share/common-licenses/GPL'.
+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:
+ 1. 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
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author or contributors may not be used to endorse or
+    promote products derived from this software without specific prior
+    written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.

More information about the Python-apps-commits mailing list