[Python-modules-commits] r24737 - in packages/python-xlrd/trunk/debian (changelog copyright)

Tue Jun 11 13:49:59 UTC 2013

Date: Tuesday, June 11, 2013 @ 13:49:56
  Author: bernat
Revision: 24737

Switch to machine-readable debian/copyright

Modified:
  packages/python-xlrd/trunk/debian/changelog
  packages/python-xlrd/trunk/debian/copyright

Modified: packages/python-xlrd/trunk/debian/changelog
===================================================================

--- packages/python-xlrd/trunk/debian/changelog	2013-06-11 13:43:19 UTC (rev 24736)
+++ packages/python-xlrd/trunk/debian/changelog	2013-06-11 13:49:56 UTC (rev 24737)
@@ -15,6 +15,7 @@
   * Enhance long description in debian/control.
   * Add doc-base registration.
   * Update manual page.
+  * Switch to machine-readable debian/copyright.
 
  -- Vincent Bernat <bernat at debian.org>  Tue, 11 Jun 2013 15:22:17 +0200
 

Modified: packages/python-xlrd/trunk/debian/copyright
===================================================================
--- packages/python-xlrd/trunk/debian/copyright	2013-06-11 13:43:19 UTC (rev 24736)
+++ packages/python-xlrd/trunk/debian/copyright	2013-06-11 13:49:56 UTC (rev 24737)
@@ -1,86 +1,71 @@
-This package was debianized by Joost van Baal <joostvb+debian at uvt.nl> on
-Mon, 21 May 2007 13:01:26 +0200.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: python-xlrd
+Maintainer: John Machin <sjmachin at lexicon.net>
+Source: http://www.python-excel.org/
 
-It was downloaded from http://www.lexicon.net/sjmachin/.
-The upstream website is at http://www.lexicon.net/sjmachin/xlrd.htm.
-
-Upstream Author: John Machin <sjmachin at lexicon.net>
-
-Copyright (C) 2005-2006, Stephen John Machin, Lingfo Pty Ltd
-
-This software is licensed under the BSD License. However it is based on an
-earlier version by David Giffin which is covered by the following license:
-
-Portions copyright (C) 2005-2006, Stephen John Machin, Lingfo Pty Ltd
-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 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. None of the names of Stephen John Machin, Lingfo Pty Ltd and any
-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.
-
-and:
-
-Copyright (c) 2001 David Giffin.
-All rights reserved.
-  
-Based on the the Java version: Andrew Khan Copyright (c) 2000. 
-  
-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. All advertising materials mentioning features or use of this
-   software must display the following acknowledgment:
-   "This product includes software developed by
-    David Giffin <david at giffin.org>."
-  
-4. Redistributions of any form whatsoever must retain the following
-   acknowledgment:
-   "This product includes software developed by
-    David Giffin <david at giffin.org>."
-  
-THIS SOFTWARE IS PROVIDED BY DAVID GIFFIN ``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 DAVID GIFFIN OR
-ITS 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.
-
-On Debian systems, the complete text of the BSD License can be found in
-`/usr/share/common-licenses/BSD'.
+Files: *
+Copyright: Copyright (C) 2005-2012, Stephen John Machin, Lingfo Pty Ltd
+           Copyright (c) 2001 David Giffin.
+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. None of the names of Stephen John Machin, Lingfo Pty Ltd and any
+ 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.
+ .
+ Based on the the Java version: Andrew Khan Copyright (c) 2000.
+ .
+ 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. All advertising materials mentioning features or use of this
+    software must display the following acknowledgment:
+    "This product includes software developed by
+     David Giffin <david at giffin.org>."
+ .
+ 4. Redistributions of any form whatsoever must retain the following
+    acknowledgment:
+    "This product includes software developed by
+     David Giffin <david at giffin.org>."
+ .
+ THIS SOFTWARE IS PROVIDED BY DAVID GIFFIN ``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 DAVID GIFFIN OR
+ ITS 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.


