[Python-modules-commits] r17611 - in packages/sphinx/trunk/debian (changelog copyright)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Sat Jun 25 20:32:28 UTC 2011


    Date: Saturday, June 25, 2011 @ 20:32:27
  Author: jwilk
Revision: 17611

Add Underscore.js license to debian/copyright.

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

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2011-06-25 17:01:32 UTC (rev 17610)
+++ packages/sphinx/trunk/debian/changelog	2011-06-25 20:32:27 UTC (rev 17611)
@@ -6,9 +6,10 @@
     - Add dependency on libjs-underscore,
     - Replace underscore.js with symlink to
       /usr/share/javascript/underscore/underscore.js.
+  * Add Underscore.js license to debian/copyright.
   * Unify multiple calls to dh_link.
 
- -- Jakub Wilk <jwilk at debian.org>  Fri, 24 Jun 2011 20:46:37 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 25 Jun 2011 22:28:51 +0200
 
 sphinx (1.0.7-5) unstable; urgency=low
 

Modified: packages/sphinx/trunk/debian/copyright
===================================================================
--- packages/sphinx/trunk/debian/copyright	2011-06-25 17:01:32 UTC (rev 17610)
+++ packages/sphinx/trunk/debian/copyright	2011-06-25 20:32:27 UTC (rev 17611)
@@ -218,6 +218,32 @@
 | OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 | WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+The included Underscore.js library is available under the MIT
+license:
+
+| Copyright (c) 2009 Jeremy Ashkenas, DocumentCloud
+| 
+| 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.
+
 AUTHORS file
 ============
 




More information about the Python-modules-commits mailing list