r5435 - /vdr/vdradmin-am/trunk/debian/copyright

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Fri Sep 21 20:51:01 2007
New Revision: 5435

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5435
Log:
more license stuff

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

Modified: vdr/vdradmin-am/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/copyright?rev=5435&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/copyright (original)
+++ vdr/vdradmin-am/trunk/debian/copyright Fri Sep 21 20:51:01 2007
@@ -2,8 +2,8 @@
     http://andreas.vdr-developer.org/
 
 Upstream Authors:
-    Thomas Koch <tom at linvdr.org>,
-    Andreas Mair <mail at andreas.vdr-developer.org>
+    Andreas Mair <mail at andreas.vdr-developer.org> (current vdradmin-am)
+    Thomas Koch <tom at linvdr.org> (original version)
 
 Debian Maintainers:
     Tobias Grimm <tg at e-tobi.net>
@@ -15,6 +15,18 @@
     (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)
+    (C) 2004        Tatsuhiko Miyagawa (Template-Plugin-JavaScript)
+    (C) 2006        Mike Constabel (autotimer2searchtimer.pl)
+
+Copyright (translations):
+    (C) 2005 - 2007 Karel Borkovec (Czech)
+    (C) 2005 - 2007 Roel Koelewijn (Dutch)
+    (C) 2005 - 2007 Andreas Mair (English)
+    (C) 2005 - 2007 Rolf Ahrenberg, Ville Skyttä (Finnish)
+    (C) 2005 - 2007 Mickaël Nival (French)
+    (C) 2005 - 2007 Andreas Mair (German)
+    (C) 2005 - 2007 Rüdiger Jung (Spanish)
+    (C) 2005 - 2007 Oleg Roitburd and Allrussian-forum translation team (Russian)
 
 Copyright (Debian packaging):
     (C) 2003 - 2007 Thomas Schmidt, Tobias Grimm
@@ -22,17 +34,17 @@
 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.
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
     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.
 
-    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.
+    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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
     The complete text of the GNU General Public License can be found
     in /usr/share/common-licenses/GPL on most Debian systems.
@@ -56,6 +68,15 @@
     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 (Template-Plugin-JavaScript - JavaScript.pm)
+    This library is free software; you can redistribute it and/or modify
+    it under the same terms as Perl itself. Perl is distributed under 
+    your choice of the GNU General Public License or the Artistic License.
+    
+    On Debian GNU/Linux systems, the complete text of the 
+    GNU General Public License can be found in `/usr/share/common-licenses/GPL'
+    and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+
 License (Debian packaging):
     The Debian packaging is licensed under the GPL, version 2 or any
     later version, see /usr/share/common-licenses/GPL.