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

Tue Oct 29 16:12:19 UTC 2013

Date: Tuesday, October 29, 2013 @ 16:12:16
  Author: mitya57-guest
Revision: 26312

Update debian/copyright (closes: #728134, thanks Luke Faraone).

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

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

--- packages/python-markdown/trunk/debian/changelog	2013-10-29 08:18:39 UTC (rev 26311)
+++ packages/python-markdown/trunk/debian/changelog	2013-10-29 16:12:16 UTC (rev 26312)
@@ -7,6 +7,7 @@
   * Really remove suggestion of python-utidylib, HTML Tidy extension
     has been removed in 2.3.
   * debian/watch: use HTTPS, and correctly escape dots.
+  * Update debian/copyright (closes: #728134, thanks Luke Faraone).
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 08 Apr 2013 14:11:12 +0400
 

Modified: packages/python-markdown/trunk/debian/copyright
===================================================================
--- packages/python-markdown/trunk/debian/copyright	2013-10-29 08:18:39 UTC (rev 26311)
+++ packages/python-markdown/trunk/debian/copyright	2013-10-29 16:12:16 UTC (rev 26312)
@@ -1,44 +1,29 @@
 This package was debianized by Fredrik Steen <stone at debian.org> on
 Fri, 21 Apr 2006 13:18:31 +0200.
 
-It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=153041
+It was downloaded from https://pypi.python.org/pypi/Markdown.
 
 Authors:
     Manfred Stienstra <manfred.stienstra at dwerg.net>
     Yuri Takhteyev <qaramazov at gmail.com>
+    Waylan Limberg <waylan at gmail.com>
+    Dmitry Shachnev <mitya57 at gmail.com>
 
 Copyright:
     2004-2007  Manfred Stienstra <manfred.stienstra at dwerg.net>
                Yuri Takhteyev <qaramazov at gmail.com>
+    2006-2011  Waylan Limberg <waylan at gmail.com>
+    2007-2008  The Python Markdown Project
+    1999-2007  Fredrik Lundh (markdown/serializers.py)
+    2008       Django Software Foundation (markdown/odict.py)
+    2011       Brian Neal (markdown/extensions/nl2br.py)
+    2008       Jack Miller (markdown/extensions/toc.py)
 
 
 Licenses:
 
-    markdown is dual-licensed under GPL 2 and the BSD license:
+    Python-Markdown is licensed under the BSD license:
 
-    GPL v2:
-
-        This package 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.
-
-        This package 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 package; if not, write to the Free Software
-        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-        On Debian systems, the complete text of the GNU General Public License,
-	version 2, can be found in `/usr/share/common-licenses/GPL-2'.
-
-
-
-    BSD:
-
         Redistribution and use in source and binary forms, with or without
         modification, are permitted provided that the following conditions
         are met:
@@ -51,7 +36,7 @@
            may be used to endorse or promote products derived from this software
            without specific prior written permission.
 
-        THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+        THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ``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
@@ -62,3 +47,27 @@
         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.
+
+    markdown/searializers.py is licensed under the following conditions:
+
+        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.


