[SCM] KDE API documentation packaging branch, master, updated. 3396a27092cc1000f2966d417dd29af506b49dc7

[Pino Toscano]

The following commit has been merged in the master branch:
commit 3396a27092cc1000f2966d417dd29af506b49dc7
Author: Pino Toscano <pino at debian.org>
Date:   Thu Oct 27 22:06:43 2011 +0200

    module copyrights: sync with their current versions
---
 debian/copyright.d/kde4libs   |    2 --
 debian/copyright.d/kdepimlibs |   27 ++++++++++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian/copyright.d/kde4libs b/debian/copyright.d/kde4libs
index 6f8817c..00b0789 100644
--- a/debian/copyright.d/kde4libs
+++ b/debian/copyright.d/kde4libs
@@ -3038,12 +3038,10 @@ Legend:
 
 On Debian systems, you can find the complete texts of these licenses at:
   - Artistic: /usr/share/common-licenses/Artistic
-  - BSD:      /usr/share/common-licenses/BSD
   - GPL:      /usr/share/common-licenses/GPL
   - GPLv2:    /usr/share/common-licenses/GPL-2
   - LGPLv2:   /usr/share/common-licenses/LGPL-2
   - GFDL:     /usr/share/common-licenses/GFDL
-  - BSD:      /usr/share/common-licenses/BSD
 
 -------------------------------------------------------------------------------
 
diff --git a/debian/copyright.d/kdepimlibs b/debian/copyright.d/kdepimlibs
index 79279f8..1743248 100644
--- a/debian/copyright.d/kdepimlibs
+++ b/debian/copyright.d/kdepimlibs
@@ -78,11 +78,28 @@ Files under cmake/
     Copyright: © 2008 Allen Winter <winter at kde.org>
     Copyright: © 2009 Christophe Giboudeaux <cgiboudeaux at gmail.com>
 
-    These files are under the BSD license.
-
-    On Debian systems, the complete text of the BSD License
-    can be found in /usr/share/common-licenses/BSD
-
+    | Redistribution and use in source and binary forms, with or without
+    | modification, are permitted provided that the following conditions
+    | are met:
+    |
+    | 1. Redistributions of source code must retain the copyright
+    |    notice, this list of conditions and the following disclaimer.
+    | 2. Redistributions in binary form must reproduce the copyright
+    |    notice, this list of conditions and the following disclaimer in the
+    |    documentation and/or other materials provided with the distribution.
+    | 3. The name of the author may not be used to endorse or promote products
+    |    derived from this software without specific prior written permission.
+    |
+    | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
 
 Files under doc/
 

-- 
KDE API documentation packaging