[Python-modules-commits] r21537 - in packages/simplegeneric/trunk/debian (changelog copyright)

Fri May 4 03:50:29 UTC 2012

Date: Friday, May 4, 2012 @ 03:50:26
  Author: eriol-guest
Revision: 21537

Made DEP5 compliant

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

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

--- packages/simplegeneric/trunk/debian/changelog	2012-05-04 03:20:04 UTC (rev 21536)
+++ packages/simplegeneric/trunk/debian/changelog	2012-05-04 03:50:26 UTC (rev 21537)
@@ -15,8 +15,11 @@
   * debian/{control,rules}
     - Switched to dh_python2. Thanks to Julian Taylor for the report
       and the patch (Closes: #631408)
+  * debian/copyright
+    - Made DEP5 compliant
+    - Upstream switched to ZPL-2.1
 
- -- Daniele Tricoli <eriol at mornie.org>  Fri, 04 May 2012 05:16:29 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Fri, 04 May 2012 05:45:30 +0200
 
 simplegeneric (0.7-1) unstable; urgency=low
 

Modified: packages/simplegeneric/trunk/debian/copyright
===================================================================
--- packages/simplegeneric/trunk/debian/copyright	2012-05-04 03:20:04 UTC (rev 21536)
+++ packages/simplegeneric/trunk/debian/copyright	2012-05-04 03:50:26 UTC (rev 21537)
@@ -1,39 +1,76 @@
-This work was packaged for Debian by:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: simplegeneric
+Upstream-Contact: Phillip J. Eby <peak at eby-sarna.com>
+Source: http://pypi.python.org/pypi/simplegeneric
 
-    CÃ©dric Delfosse <cedric at debian.org> on Wed, 04 Aug 2010 20:53:42 +0200
+Files: *
+Copyright: 2006-2012, Phillip J. Eby
+License: ZPL-2.1
 
-It was downloaded from:
+Files: debian/*
+Copyright: 2010, CÃ©dric Delfosse <cedric at debian.org>
+           2012, Daniele Tricoli <eriol at mornie.org>
+License: GPL-3
 
-    http://pypi.python.org/pypi/simplegeneric
+License: ZPL-2.1
+ Zope Public License (ZPL) Version 2.1
+ .
+ A copyright notice accompanies this license document that identifies the
+ copyright holders.
+ .
+ This license has been certified as open source. It has also been designated as
+ GPL compatible by the Free Software Foundation (FSF).
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions in source code must retain the accompanying copyright
+ notice, this list of conditions, and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the accompanying copyright
+ notice, this list of conditions, and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Names of the copyright holders must not be used to endorse or promote
+ products derived from this software without prior written permission from the
+ copyright holders.
+ .
+ 4. The right to distribute this software or to use it for any purpose does not
+ give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+ copyright
+ holders. Use of them is covered by separate agreement with the copyright
+ holders.
+ .
+ 5. If any files are modified, you must cause the modified files to carry
+ prominent notices stating that you changed the files and the date of any
+ change.
+ .
+ Disclaimer
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+ 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 HOLDERS 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.
 
-Upstream Author(s):
-
-    Phillip J. Eby <peak at eby-sarna com>
-
-Copyright:
-
-    Copyright (C) 2010 Phillip J. Eby
-
-License:
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-On Debian systems, the complete text of the Apache version 2.0 license
-can be found in "/usr/share/common-licenses/Apache-2.0".
-
-The Debian packaging is:
-
-    Copyright (C) 2010 CÃ©dric Delfosse <cedric at debian.org>
-
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
+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.


