[Python-modules-commits] r3417 - in /packages/html5lib/trunk/debian: changelog copyright

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

Author: bzed-guest
Date: Mon Oct  8 19:03:12 2007
New Revision: 3417

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3417
Log:
* debian/copyright:
  - Including copyright information for
    src/html5lib/filters/{iso639codes,rfc2046,rfc3987}.py
  - Changing the license of my packaging work from GPL to the MIT License

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

Modified: packages/html5lib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/html5lib/trunk/debian/changelog?rev=3417&op=diff
==============================================================================
--- packages/html5lib/trunk/debian/changelog (original)
+++ packages/html5lib/trunk/debian/changelog Mon Oct  8 19:03:12 2007
@@ -10,8 +10,12 @@
   * debian/rules:
     - Switching from cdbs to a "normal" rules file, also running unit tests
       while building
+  * debian/copyright:
+    - Including copyright information for
+      src/html5lib/filters/{iso639codes,rfc2046,rfc3987}.py
+    - Changing the license of my packaging work from GPL to the MIT License
 
- -- Bernd Zeimetz <bernd at bzed.de>  Sat,  6 Oct 2007 23:46:32 +0200
+ -- Bernd Zeimetz <bernd at bzed.de>  Mon, 08 Oct 2007 21:01:33 +0200
 
 html5lib (0.9-2) unstable; urgency=low
 

Modified: packages/html5lib/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/html5lib/trunk/debian/copyright?rev=3417&op=diff
==============================================================================
--- packages/html5lib/trunk/debian/copyright (original)
+++ packages/html5lib/trunk/debian/copyright Mon Oct  8 19:03:12 2007
@@ -34,5 +34,33 @@
 SOFTWARE.
 
 The Debian packaging is (C) 2007, Bernd Zeimetz <bernd at bzed.de> and is licensed
-under the GPL, see `/usr/share/common-licenses/GPL'.
+under the same license as html5lib, see above.
 
+
+Files with different copyrights/licenses:
+
+  *  src/html5lib/filters/{iso639codes,rfc2046,rfc3987}.py
+
+     adapted from feedvalidator, original copyright license is
+   
+     Copyright (c) 2002-2006, Sam Ruby, Mark Pilgrim, Joseph Walton, and Phil Ringnalda
+   
+     Permission is hereby granted, free of charge, to any person obtaining a copy
+     of this software and associated documentation files (the "Software"), to deal
+     in the Software without restriction, including without limitation the rights
+     to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the Software is
+     furnished to do so, subject to the following conditions:
+   
+     The above copyright notice and this permission notice shall be included in all
+     copies or substantial portions of the Software.
+   
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+     SOFTWARE.
+
+