[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.4.5-2-54-geee0785

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 8886091ccc24f34b30b9fc98d1570d92c9551415
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Mar 27 21:41:06 2011 +0300

    Remove a deprecated link to the BSD license from debian/copyright.
---
 debian/changelog |    1 +
 debian/copyright |   27 ++++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f74c1c..3e820cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ kdepimlibs (4:4.6.1-0r2) UNRELEASED; urgency=low
   * Drop kdepimlibs5 transitional package.
   * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
   * Disable testsuite.
+  * Remove a deprecated link to the BSD license from debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Aug 2010 10:41:56 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 79279f8..1743248 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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 PIM Libraries module packaging