[Python-modules-commits] r27703 - in packages/chardet/trunk/debian (changelog copyright)

[eriol-guest at users.alioth.debian.org]

    Date: Sunday, February 16, 2014 @ 13:38:51
  Author: eriol-guest
Revision: 27703

Made DEP5 compliant

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

Modified: packages/chardet/trunk/debian/changelog
===================================================================
--- packages/chardet/trunk/debian/changelog	2014-02-16 09:16:40 UTC (rev 27702)
+++ packages/chardet/trunk/debian/changelog	2014-02-16 13:38:51 UTC (rev 27703)
@@ -18,6 +18,8 @@
     - Updated Homepage
     - Added X-Python-Version: >= 2.6
     - Bumped Standards-Version to 3.9.5 (no changes needed)
+  * debian/copyright
+    - Made DEP5 compliant
   * debian/rules
     - Added export PYTHONWARNINGS=d
   * debian/watch
@@ -26,7 +28,7 @@
   [ Piotr Ożarowski ]
   * drop preinst file, python-central is no longer available in Debian
 
- -- Daniele Tricoli <eriol at mornie.org>  Sat, 15 Feb 2014 17:54:00 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 16 Feb 2014 14:35:14 +0100
 
 chardet (2.0.1-2) unstable; urgency=low
 

Modified: packages/chardet/trunk/debian/copyright
===================================================================
--- packages/chardet/trunk/debian/copyright	2014-02-16 09:16:40 UTC (rev 27702)
+++ packages/chardet/trunk/debian/copyright	2014-02-16 13:38:51 UTC (rev 27703)
@@ -1,59 +1,24 @@
-This package was debianized by Piotr Ożarowski <piotr at debian.org> on
-Tue, 28 Jun 2006 11:34:00 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: chardet
+Upstream-Contact: Ian Cordasco <graffatcolmingov at gmail.com>
+Source: https://pypi.python.org/pypi/chardet
 
-It was downloaded from http://chardet.feedparser.org/
+Files: *
+Copyright: 1998, 2001, 2005 Netscape Communications Corporation
+           2003, Mozilla Foundation
+           2006, 2007, 2008 Mark Pilgrim
+           2012-2013, Ian Cordasco
+License: LGPL-2.1+
 
-Upstream Author: Mark Pilgrim <mark at diveintomark.org>
+Files: chardet/chardetect.py
+Copyright: 2012, Erik Rose <grinch at grinchcentral.com>
+License: LGPL-2.1+
 
-Copyright (C) 2006, 2007, 2008 Mark Pilgrim
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- 
- This library 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
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301  USA
-
-    -----------------------------------------------------------
-
- The Original Code is mozilla.org code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998, 2005
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-   Mark Pilgrim - port to Python
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- 
- This library 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
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301  USA
-
-    -----------------------------------------------------------
-
- The Universal Encoding Detector documentation is copyright (C) 2006-2008 Mark Pilgrim.
+Files: docs
+Copyright: 2006-2008, Mark Pilgrim
+License:
  All rights reserved.
-
+ .
  Redistribution and use in source (XML DocBook) and "compiled" forms (SGML,
  HTML, PDF, PostScript, RTF and so forth) with or without modification, are
  permitted provided that the following conditions are met: Redistributions of
@@ -63,7 +28,7 @@
  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 AUTHOR "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
@@ -75,16 +40,19 @@
  IN ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-    -----------------------------------------------------------
+Files: debian/chardet
+Copyright: 2008–2009 Ben Finney <ben+python at benfinney.id.au>
+License: LGPL-2.1+
 
-debian/chardet script:
+Files: debian/*
+Copyright: 2006-2011, Piotr Ożarowski <piotr at debian.org>
+           2014, Daniele Tricoli <eriol at mornie.org>
+License: LGPL-2.1+
 
- Copyright © 2008–2009 Ben Finney <ben+python at benfinney.id.au>
-
-    -----------------------------------------------------------
-
-On Debian systems, the complete text of the GNU Library General Public
-License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
-
-The Debian packaging is © 2006-2009, Piotr Ożarowski <piotr at debian.org> and
-is licensed under the LGPL.
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ See /usr/share/common-licenses/LGPL-2.1 for the full license text.