[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-99-g6e10c83

Mon Mar 28 08:10:23 UTC 2011

The following commit has been merged in the master branch:
commit 905cd169ff9541d55114b9cad4e50a3e0c843b1c
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Mar 28 00:15:33 2011 +0300

    Replace /usr/share/common-licenses/BSD with verbatim license text.
---
 debian/changelog |    1 +
 debian/copyright |   83 ++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6dbe2b4..9a961a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -115,6 +115,7 @@ kdebase-workspace (4:4.6.1-0r2) UNRELEASED; urgency=low
   * Remove README.Debian introduced in 4.4.5-6, no longer applicable.
   * Drop 34_backport_krunner_crash_fix_threading.diff patch, it was stolen from
     upstream.
+  * Replace /usr/share/common-licenses/BSD with verbatim license text.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jul 2010 16:41:50 +0300
 
diff --git a/debian/copyright b/debian/copyright
index a4eee38..cff0bae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -379,9 +379,30 @@ Other used licenses:
 
     + backend/genauth.c
 
-  On Debian systems, the complete text of the
-  BSD-like License version  can be found in
-  /usr/share/common-licenses/BSD
+  | Copyright 1988, 1998  The Open Group
+  | Copyright 2003-2004 Oswald Buddenhagen <ossi at kde.org>
+  |
+  | Permission to use, copy, modify, distribute, and sell this software and its
+  | documentation for any purpose is hereby granted without fee, provided that
+  | the above copyright notice appear in all copies and that both that
+  | copyright notice and this permission notice appear in supporting
+  | documentation.
+  |
+  | 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 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.
+  |
+  | Except as contained in this notice, the name of a copyright holder shall
+  | not be used in advertising or otherwise to promote the sale, use or
+  | other dealings in this Software without prior written authorization
+  | from the copyright holder.
 --
 
 
@@ -861,9 +882,29 @@ Other used licenses:
     + ksplashx/scale.cpp
     + ksplashx/scale.h
 
-  On Debian systems, the complete text of the
-  BSD-like License version  can be found in
-  /usr/share/common-licenses/BSD
+  | This file is part of the KDE libraries
+  | Copyright (C) 2003 Fredrik Höglund <fredrik at kde.org>
+  |
+  | 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 above copyright
+  |    notice, this list of conditions and the following disclaimer.
+  | 2. 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.
+  |
+  | 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.
 --
 
 --
@@ -1337,11 +1378,31 @@ Other used licenses:
   BSD-like License (BSD)
     3 file(s) are licensed under this license:
 
-    shells/plasmoidviewer/*
-
-  On Debian systems, the complete text of the
-  BSD-like License version  can be found in
-  /usr/share/common-licenses/BSD
+    generic/tools/plasmoidviewer/*
+  | Copyright 2007 Frerich Raabe <raabe at kde.org>
+  | Copyright 2007 Aaron Seigo <aseigo at kde.org>
+  | Copyright 2008 Aleix Pol <aleixpol at gmail.com>
+  |
+  | 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 above copyright
+  |    notice, this list of conditions and the following disclaimer.
+  | 2. 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.
+  |
+  | 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.
 --
 
 --

-- 
KDE Base Workspace module packaging

