[Pkg-mediawiki-commits] r497 - mediawiki/trunk/debian

[Thorsten Glaser]

Author: tg
Date: 2013-12-31 11:19:54 +0000 (Tue, 31 Dec 2013)
New Revision: 497

Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/copyright
Log:
address paultag?\226?\128?\153s comments from <E1VfDj9-0006GY-1T at franck.debian.org>


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-12-31 11:09:48 UTC (rev 496)
+++ mediawiki/trunk/debian/changelog	2013-12-31 11:19:54 UTC (rev 497)
@@ -13,8 +13,9 @@
   * Handle /var/lib/mediawiki/extensions/* always as symlinks, for
     both core and extra extensions, with upgrade path (Closes: #719208)
   * Address updated lintian tags
+  * Update copyright file with things noted by Paul Tagliamonet, thanks!
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 11:56:21 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 12:18:56 +0100
 
 mediawiki (1:1.19.8+dfsg-2.2) unstable; urgency=high
 

Modified: mediawiki/trunk/debian/copyright
===================================================================
--- mediawiki/trunk/debian/copyright	2013-12-31 11:09:48 UTC (rev 496)
+++ mediawiki/trunk/debian/copyright	2013-12-31 11:19:54 UTC (rev 497)
@@ -81,6 +81,38 @@
    File includes/libs/jsminplus.php is available under the MPL 1.1 or
    the GNU GPLv2 or later or LGPLv2.1 or later.
 
+   File resources/jquery/jquery.qunit.js contains jsDump which is
+   Copyright (c) 2008 Ariel Flesler and covered by the BSD licence.
+
+   File resources/jquery.effects/jquery.effects.core.js contains
+   jQuery Easing which is Copyright 2008 George McGinley Smith
+   and covered by the 3-clause BSD licence:
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the author nor the names of contributors may be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT 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.
+
    File button_S_italic.png is in the public domain.
 
    MediaWiki makes use of the Sajax Toolkit by modernmethod,
@@ -106,6 +138,9 @@
    Images found on the common skins icons images are licensed under
    GNU LGPL License.
 
+   The vector skin uses csshover by Peter Nederlof, licenced under the
+   GNU LGPL version 2.1 or later.
+
    Everything else is under the following copyright/license.
 
    Copyright (C) 2003-2013 Mediawiki Development Team