r5415 - in /vdr/vdr/trunk/debian: changelog plugin-template/copyright

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

Author: tiber-guest
Date: Fri Sep  7 07:54:33 2007
New Revision: 5415

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5415
Log:
* Changed copyright file in the new plug-in template to match
  the new debian/copyright schema for VDR packages

Modified:
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/plugin-template/copyright

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=5415&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Fri Sep  7 07:54:33 2007
@@ -10,7 +10,11 @@
   * Upgraded make-special-vdr.sh to version 0.6 (xineliboutput,
     burnbackgrounds, debianize-vdrplugin, vompserver)
 
- -- Thomas Günther <tom at toms-cafe.de>  Wed, 27 Jun 2007 02:53:01 +0200
+  [ Tobias Grimm ]
+  * Changed copyright file in the new plug-in template to match
+    the new debian/copyright schema for VDR packages
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri, 07 Sep 2007 09:53:59 +0200
 
  vdr (1.4.7-1) unstable; urgency=low
 

Modified: vdr/vdr/trunk/debian/plugin-template/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/plugin-template/copyright?rev=5415&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/plugin-template/copyright (original)
+++ vdr/vdr/trunk/debian/plugin-template/copyright Fri Sep  7 07:54:33 2007
@@ -1,21 +1,47 @@
-This package was debianized by #USERNAME# <#EMAIL#> on
-#DATE#.
+Upstream Homepage:
+    <fill in http/ftp site>
 
-It was downloaded from <fill in http/ftp site>
+Upstream Author(s):
+    <put author(s) name and email here>
 
-Upstream Author: <put author(s) name and email here>
+Debian Maintainers:
+    <put Debian maintainer(s) name and email here>
 
-Copyright: <put the year(s) of the copyright, and the names of the
-            copyright holder(s) here>
+Copyright:
+    <put the year(s) of the copyright, and the names of the copyright
+     holder(s) here>
 
-
-The Debian packaging is (C) #YEAR#, #USERNAME# <#EMAIL#> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Copyright (Debian packaging):
+    (C) #YEAR# #USERNAME# <#EMAIL#>
 
 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; either version 2 of the License, or
+    (at your option) any later version.
 
-It may be redistributed under the terms of the GNU GPL, Version 2
-found on Debian systems in the file /usr/share/common-licenses/GPL .
+    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.
+
+    The complete text of the GNU General Public License can be found
+    in /usr/share/common-licenses/GPL 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.
 
 # Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+# different copyright/license attached and list them in this file.
+#
+# Check if the upstream sources explicitly state which licenses apply to
+# which action. If this is not the case, ask the upstream author to add such a
+# license disclaimer to all source files or at least to the README. For the
+# GPL2 or GPL3 the small license disclaimer mentioned at the end of the full license
+# text in "How to Apply These Terms to Your New Programs" should be sufficient.