[pkg-kolab] r608 - kolab-webadmin/trunk/debian

[petere at alioth.debian.org]

Author: petere
Date: 2007-06-18 15:31:42 +0000 (Mon, 18 Jun 2007)
New Revision: 608

Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/copyright
Log:
* Updated copyright file

Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2007-06-18 15:01:58 UTC (rev 607)
+++ kolab-webadmin/trunk/debian/changelog	2007-06-18 15:31:42 UTC (rev 608)
@@ -1,6 +1,7 @@
 kolab-webadmin (2.1.0-20070510-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Updated copyright file
 
  -- Peter Eisentraut <petere at debian.org>  Mon, 18 Jun 2007 00:19:40 +0200
 

Modified: kolab-webadmin/trunk/debian/copyright
===================================================================
--- kolab-webadmin/trunk/debian/copyright	2007-06-18 15:01:58 UTC (rev 607)
+++ kolab-webadmin/trunk/debian/copyright	2007-06-18 15:31:42 UTC (rev 608)
@@ -1,50 +1,14 @@
 This package was debianized by Steffen Joeris <steffen.joeris at skolelinux.de> on
 Mon, 19 Dec 2005 14:45:55 +0100.
 
-It was downloaded from http://max.kde.org:8080/mirrors/ftp.kolab.org/server/release/
+It was downloaded from <http://max.kde.org:8080/mirrors/ftp.kolab.org/server/release/>.
 
-Copyright Holder: 	Copyright (c) 2004 2005 Klarälvdalens Datakonsult AB
-			List of files:
-php/admin/include/config.php.in
-php/admin/include/menu.php
-php/admin/include/debug.php
-php/admin/include/form.class.php
-php/admin/include/auth.class.php
-php/admin/include/ldap.class.php
-php/admin/include/sieveutils.class.php
-php/admin/include/mysmarty.php
-php/admin/include/authenticate.php
-php/admin/include/locale.php
-www/admin/administrator/admin.php
-www/admin/administrator/index.php
-www/admin/distributionlist/index.php
-www/admin/distributionlist/list.php
-www/admin/kolab/erfrakon.php
-www/admin/kolab/codefusion.php
-www/admin/maintainer/maintainer.php
-www/admin/maintainer/index.php
-www/admin/user/forward.php
-www/admin/user/index.php
-www/admin/user/index.php
-www/admin/user/deliver.php
-www/admin/index.php
-www/admin/logout.php
+Copyright holders:
 
+  Copyright (c) 2004-2006 Klarälvdalens Datakonsult AB
+  Copyright (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
+  Copyright (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 
-
-			Copyright (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-			List of files:
-www/admin/distributionlist/index.php
-www/admin/kolab/erfrakon.php
-www/admin/kolab/codefusion.php
-		
-			Copyright (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-			List of files:
-www/admin/distributionlist/index.php
-www/admin/kolab/erfrakon.php
-www/admin/kolab/codefusion.php
-
-
 License:
 
    This package is free software; you can redistribute it and/or modify
@@ -52,21 +16,12 @@
    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
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+On Debian systems, the complete text of the GNU General Public License
+can be found in the file /usr/share/common-licenses/GPL.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
 
+The following applies to the file php/admin/include/Sieve.php:
 
-This file has the following special copyright license:
-Copyright (c) 2002-2003, Richard Heyes
-                        List of files:
-php/admin/include/Sieve.php
-
-
 // +-----------------------------------------------------------------------+
 // | Copyright (c) 2002-2003, Richard Heyes                                     |
 // | All rights reserved.                                                  |