[Python-modules-commits] r30741 - in packages/feedparser/trunk/debian (changelog copyright)

Wed Sep 24 17:00:16 UTC 2014

Date: Wednesday, September 24, 2014 @ 17:00:14
  Author: emillon-guest
Revision: 30741

feedparser: convert debian/copyright to DEP5

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

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

--- packages/feedparser/trunk/debian/changelog	2014-09-24 11:02:23 UTC (rev 30740)
+++ packages/feedparser/trunk/debian/changelog	2014-09-24 17:00:14 UTC (rev 30741)
@@ -1,6 +1,7 @@
 feedparser (5.1.3-3) UNRELEASED; urgency=medium
 
   * Fix HTTP auth in python 3 (Closes: #760078)
+  * Convert debian/copyright to machine-readable format
 
  -- Etienne Millon <me at emillon.org>  Tue, 02 Sep 2014 10:59:53 +0200
 

Modified: packages/feedparser/trunk/debian/copyright
===================================================================
--- packages/feedparser/trunk/debian/copyright	2014-09-24 11:02:23 UTC (rev 30740)
+++ packages/feedparser/trunk/debian/copyright	2014-09-24 17:00:14 UTC (rev 30741)
@@ -1,31 +1,62 @@
-This package was debianized by Joe Wreschnig <piman at debian.org> on
-Tue, 20 Dec 2005 23:49:02 -0600.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: feedparser
+Upstream-Contact: Kurt McKee <contactme at kurtmckee.org>
+Source: https://code.google.com/p/feedparser/
 
-It was downloaded from http://feedparser.org.
+Files: *
+Copyright:
+  2002-2008, Mark Pilgrim
+  2010-2012, Kurt McKee
+License: BSD-2-clause
 
-Copyright Holder: Mark Pilgrim <mark at diveintomark.org>
+Files: docs/*
+Copyright: 2004-2008 Mark Pilgrim
+License: Feedparser-documentation-license
+ Redistribution and use in source (Sphinx ReST) and "compiled" forms (HTML, PDF,
+ PostScript, RTF and so forth) with or without modification, are permitted
+ provided that the following conditions are met:
+ .
+ * Redistributions of source code (Sphinx ReST) must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in compiled form (converted to HTML, PDF, PostScript, RTF and
+   other formats) 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.
+ .
+ THIS DOCUMENTATION 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 DOCUMENTATION, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
 
-License:
+Files: debian/*
+Copyright: 2013-2014 Etienne Millon <me at emillon.org>
+License: BSD-2-clause
 
-Copyright (c) 2002-2005, Mark Pilgrim, 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.
-
-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: BSD-2-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.
+ .
+ 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.


