rev 13527 - branches/kde4.2/packages/kdeadmin/debian

Sun Jan 25 12:27:04 UTC 2009

Author: pusling-guest
Date: 2009-01-25 12:27:04 +0000 (Sun, 25 Jan 2009)
New Revision: 13527

Modified:
   branches/kde4.2/packages/kdeadmin/debian/changelog
   branches/kde4.2/packages/kdeadmin/debian/copyright
Log:
+++ Changes by Sune Vuorela:
* Copyright file update.

Modified: branches/kde4.2/packages/kdeadmin/debian/changelog
===================================================================

--- branches/kde4.2/packages/kdeadmin/debian/changelog	2009-01-25 11:42:14 UTC (rev 13526)
+++ branches/kde4.2/packages/kdeadmin/debian/changelog	2009-01-25 12:27:04 UTC (rev 13527)
@@ -21,6 +21,10 @@
     - replace debian/cdbs/kde.mk with
       /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk in debian/rules.
 
+  +++ Changes by Sune Vuorela:
+
+  * Copyright file update.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:35:21 +0200
 
 kdeadmin (4:4.1.3-1) experimental; urgency=low

Modified: branches/kde4.2/packages/kdeadmin/debian/copyright
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/copyright	2009-01-25 11:42:14 UTC (rev 13526)
+++ branches/kde4.2/packages/kdeadmin/debian/copyright	2009-01-25 12:27:04 UTC (rev 13527)
@@ -15,15 +15,52 @@
   kcron:
     Copyright (C) 1999, Gary Meyer <gary at meyer.net>
     Copyright (C) 1999, Robert Berry <rjmber at ntlworld.com> 
+    Copyright (C) 2007, Nicolas Ternisien
 
   kdat:
     Copyright (C) 2001-2002  Lawrence Widman, kdat at cardiothink.com
     Copyright (C) 1998-2000  Sean Vyain, svyain at mail.tds.net
+    Copyright (C) 1997 Johannes Sixt
+    Copyright (C) 1996 Keith Brown and KtSoft
 
   knetworkconf:
     Copyright (C) 2003-2005 by Juan Luis Baptiste
+    Copyright (C) 2000-2001 Ximian, inc
+    Copyright (C) Michael Vogt  <mvo at debian.org>
+    Copyright (C) Grzegorz Golawski <grzegol at pld-linux.org>
+    Copyright (C) David Lee Ludwig <davidl at wpi.edu>
+    Copyright (C) Kenneth Christiansen <kenneth at gnu.org>
+  
+  kpackage:
+    Copyright (C) 1999-2007 Toivo Pedaste <toivo at ucs.uwa.edu.au>
+    Copyright (C) Damyan Pepper
 
+  ksystemlog:
+    Copyright (C) 2007 Nicolas Ternisien <nicolas.ternisien at gmail.com>
 
+  ksysv:
+    Copyright (C) 1997-2000 Peter Putzer <putzer at kde.org>
+    Copyright (C) 1999 Preston Brown <pbrown at kde.org>
+    Copyright (C) 2002 Waldo Bastian <bastian at kde.org>
+
+  kuser:
+    Copyright (C) 1998 Denis Perchine <dyp at perchine.org>
+    Copyright (C) 2004-2006 Szombathelyi Gyurgy <guerco at freemail.hu>
+    Copyright (C) 2002 Waldo Bastian <bastian at kde.org>
+
+  lilo-config:
+    Copyright (C) 2000-2001 Bernhard Rosenkraenzer
+
+  strigi-analyzer:
+    Copyright (C) 2002 Laurence Anderson <l.d.anderson at warwick.ac.uk>
+
+  system-config-printer-kde:
+    Copyright (C) 2008 Jonathan Riddell <jriddell at ubuntu.com>
+    Copyright (C) 2007 Tim Waugh <twaugh at redhat.com>
+    Copyright (C) 2007 Red Hat, Inc.
+
+
+
 License:
 
 Unless something else is mentioned, the code files in this package are under
@@ -31,7 +68,8 @@
 
     | This program is free software; you can redistribute it and/or modify
     | it under the terms of the GNU General Public License as published by
-    | the Free Software Foundation; version 2 dated June, 1991.
+    | the Free Software Foundation; either version 2 of the License or, 
+    | (at your option) any later version.
     |
     | This package is distributed in the hope that it will be useful,
     | but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -86,12 +124,12 @@
 
 Files under ksysv/
 
-    These files are under the GPL v2.
+    These files are under the GPL v2 or later. Some under GPLv2only. Effectively GPLv2only.
 
 
 Files under kuser/
 
-    These files are under the GPL v2.
+    These files are under the GPL v2 or later. Some under GPLv2only. Effectively GPLv2only.
 
 
 Files under lilo-config/
@@ -99,35 +137,41 @@
     These files are under the GPL v2 or later.
 
 
-Files under secpolicy/
+Files under strigi-analyzer/
 
-    These files are under this license:
+    These files are under the GPL v2.
 
-    | 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.
-    |
-    | THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 REGENTS 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.
+Files under system-config-printer-kde/
+    
+    cmake/ is under bsd license (CMAKE-COPYING-SCRIPTS):
 
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions
+	are met:
 
-Files under strigi-analyzer/
+	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.
 
-    These files are under the GPL v2.
+	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.
 
+   Rest GPLv2 or later.
 
+
+
 The Debian packaging is (C) 2007-2008, Debian Qt/KDE Maintainers and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
 


