[Python-apps-commits] r8899 - in packages/doconce/trunk/debian (copyright)

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

    Date: Tuesday, June 26, 2012 @ 10:52:05
  Author: johannr-guest
Revision: 8899

Use Expat instead of MIT.

Modified:
  packages/doconce/trunk/debian/copyright

Modified: packages/doconce/trunk/debian/copyright
===================================================================
--- packages/doconce/trunk/debian/copyright	2012-06-26 09:50:03 UTC (rev 8898)
+++ packages/doconce/trunk/debian/copyright	2012-06-26 10:52:05 UTC (rev 8899)
@@ -87,25 +87,7 @@
 
 Files: lib/doconce/sphinx_themes/basic/static/jquery.js
 Copyright: 2010, John Resig, http://jquery.com/
-License: MIT or GPL-2
- 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.
+License: Expat or GPL-2
 
 Files: lib/doconce/sphinx_themes/fenics_minimal/static/neuton-fontfacekit/*
        lib/doconce/sphinx_themes/fenics/static/neuton-fontfacekit/*
@@ -192,7 +174,7 @@
 
 Files: lib/doconce/sphinx_themes/cloud/static/jquery.cookie.js
 Copyright: 2010, Klaus Hartl <stilbuero.de>
-License: MIT or GPL-3+
+License: Expat or GPL-3+
 
 Files: lib/doconce/sphinx_themes/cloud/static/*
 Copyright: 2011, Assurance Technologies
@@ -226,11 +208,11 @@
 
 Files: bin/bibstuff/*
 Copyright: 2008, 2009, Dylan Schwilk and Alan G. Isaac
-License: MIT
+License: Expat
 
 Files: bin/bibstuff/data/latex_codec.py
 Copyright: 2003, 2008, David Eppstein
-License: MIT
+License: Expat
 
 License: GPL-3+
  This program is free software; you can redistribute it
@@ -338,7 +320,7 @@
  FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
  OTHER DEALINGS IN THE FONT SOFTWARE.
 
-License: MIT
+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