[Python-modules-commits] r25200 - in packages/moksha.common/trunk/debian (copyright)

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

    Date: Tuesday, July 16, 2013 @ 20:19:02
  Author: laarmen-guest
Revision: 25200

Document Expat license for moksha.common.converters

Modified:
  packages/moksha.common/trunk/debian/copyright

Modified: packages/moksha.common/trunk/debian/copyright
===================================================================
--- packages/moksha.common/trunk/debian/copyright	2013-07-16 20:10:15 UTC (rev 25199)
+++ packages/moksha.common/trunk/debian/copyright	2013-07-16 20:19:02 UTC (rev 25200)
@@ -6,6 +6,10 @@
 Copyright: 2008-2013 Red Hat, Inc
 License: Apache
 
+Files: moksha/common/converters.py
+Copyright: 2005 Ian Bicking
+License: Expat
+
 Files: moksha/common/lib/reflect.py
 Copyright:  2001-2012 Allen Short
             2001-2012 Andy Gayton
@@ -45,26 +49,7 @@
             2001-2012 Thomas Herve
             2001-2012 Timothy Allen
 License: Expat
- 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.
 
-
 Files: debian/*
 Copyright: 2013 Simon Chopin <chopin.simon at gmail.com>
 License: Apache
@@ -84,3 +69,23 @@
  .
  On Debian systems, a copy of the license can be found at
  '/usr/share/common-licenses/Apache-2.0
+
+License: Expat
+ 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.