r5434 - in /vdr/vdradmin-am/trunk/debian: changelog copyright

Thu Sep 20 19:17:00 UTC 2007

Author: tiber-guest
Date: Thu Sep 20 19:17:00 2007
New Revision: 5434

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5434
Log:
* Updated debian/copyright

Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/copyright

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=5434&op=diff
==============================================================================

--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Thu Sep 20 19:17:00 2007
@@ -2,6 +2,7 @@
 
   * NOT RELEASED YET
   * Fixed clean target (closes: #442756)
+  * Updated debian/copyright
 
  -- Tobias Grimm <tg at e-tobi.net>  Tue, 18 Sep 2007 22:28:54 +0200
 

Modified: vdr/vdradmin-am/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/copyright?rev=5434&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/copyright (original)
+++ vdr/vdradmin-am/trunk/debian/copyright Thu Sep 20 19:17:00 2007
@@ -1,43 +1,61 @@
-This package was debianized by Thomas Schmidt <tschmidt at debian.org> on
-Wed,  1 Oct 2003 20:36:52 +0200.
-
-It was downloaded from http://andreas.vdr-developer.org/
+Upstream Homepage:
+    http://andreas.vdr-developer.org/
 
 Upstream Authors:
-
-  Thomas Koch <tom at linvdr.org>,
-  Andreas Mair <mail at andreas.vdr-developer.org>
+    Thomas Koch <tom at linvdr.org>,
+    Andreas Mair <mail at andreas.vdr-developer.org>
 
 Debian Maintainers:
-
-  Tobias Grimm <tg at e-tobi.net>
-  Thomas Schmidt <tschmidt at debian.org>
+    Tobias Grimm <tg at e-tobi.net>
+    Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
+    (C) 2001 - 2004 Thomas Koch
+    (C) 2005 - 2006 Andreas Mair
+    (c) 2003        Frank Herrmann (original install.sh / uninstall.sh scripts)
+    (C) 2002        KDE Artists (KDE Crystal theme icons)
+    (C) 2002        Klaus Knopper (Bubble help info boxes)
 
-  2001-2004, Thomas Koch <tom at linvdr.org>
-  2005-2006, Andreas Mair <mail at andreas.vdr-developer.org>
+Copyright (Debian packaging):
+    (C) 2003 - 2007 Thomas Schmidt, Tobias Grimm
+                    
+License:
+    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.
 
-License:
+    This program 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.
 
-  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; either version 2 of the License, or
-  (at your option) any later version.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 
+    02110-1301, USA.
 
-  This program 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.
+    The complete text of the GNU General Public License can be found
+    in /usr/share/common-licenses/GPL on most Debian systems.
 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software, Inc., 
-  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+License (Crystal theme icons):
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
 
-  see /usr/share/common-licenses/GPL-2
+    This library 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
+    Lesser General Public License for more details.
 
-The Debian packaging is licensed under the GPL (see 
-`/usr/share/common-licenses/GPL') and is (C) 2003-2006 by:
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
 
-  Thomas Schmidt <tschmidt at debian.org>
-  Tobias Grimm <tg at e-tobi.net>
+    The complete text of the GNU General Public License can be found
+    in /usr/share/common-licenses/LGPL-2.1 on most Debian systems.
+
+License (Debian packaging):
+    The Debian packaging is licensed under the GPL, version 2 or any
+    later version, see /usr/share/common-licenses/GPL.


