[Pkg-nagios-changes] [pkg-nagios] r1534 - nagios-snmp-plugins/trunk/debian

[Jan Wagner]

Author: waja-guest
Date: 2008-07-20 11:17:29 +0000 (Sun, 20 Jul 2008)
New Revision: 1534

Modified:
   nagios-snmp-plugins/trunk/debian/changelog
   nagios-snmp-plugins/trunk/debian/copyright
Log:
machine-interpretable copyright

Modified: nagios-snmp-plugins/trunk/debian/changelog
===================================================================
--- nagios-snmp-plugins/trunk/debian/changelog	2008-07-18 20:07:43 UTC (rev 1533)
+++ nagios-snmp-plugins/trunk/debian/changelog	2008-07-20 11:17:29 UTC (rev 1534)
@@ -1,6 +1,6 @@
 nagios-snmp-plugins (1.1.1-5) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * implement machine-interpretable copyright file
 
  -- Jan Wagner <waja at cyconet.org>  Mon, 07 Jul 2008 22:41:32 +0200
 

Modified: nagios-snmp-plugins/trunk/debian/copyright
===================================================================
--- nagios-snmp-plugins/trunk/debian/copyright	2008-07-18 20:07:43 UTC (rev 1533)
+++ nagios-snmp-plugins/trunk/debian/copyright	2008-07-20 11:17:29 UTC (rev 1534)
@@ -1,14 +1,19 @@
-This package was debianized by Jan Wagner <waja at cyconet.org> on
-Tue,  5 Dec 2006 11:52:19 +0100.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Packaged-By: Jan Wagner <waja at cyconet.org>
+Packaged-Date: Tue,  5 Dec 2006 11:52:19 +0100
+Upstream-Name: Nagios SNMP Plugins
+Upstream-Maintainer: Patrick Proy (nagios at proy.org)
+Upstream-Source: http://www.manubulon.com/nagios
 
-It was downloaded from <http://www.manubulon.com/nagios>
-
-Upstream Author: Patrick Proy (nagios at proy.org)
-
+Files: *
 Copyright: (C) 2004-2007 Patrick Proy (nagios at proy.org)
+License: GPL-2
 
-License:
+Files: debian/*
+Copyright: (C) 2006, 2008 Jan Wagner <waja at cyconet.org>
+License: GPL-2+
 
+License: GPL-2
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License version 2 as
 	published by the Free Software Foundation.
@@ -22,8 +27,20 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
+License: GPL-2+
+        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.
+
+        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
+
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL file.
-
-The Debian packaging is (C) 2006-2008 Jan Wagner <waja at cyconet.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.