[Forensics-changes] [SCM] debian-forensics/pipemeter branch, debian-sid, updated. upstream/1.1.3-6-g048992b

[Daniel Baumann]

The following commit has been merged in the debian-sid branch:
commit 048992b01d2ea0f846695498d62cccf18e62fb91
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Feb 14 11:34:35 2008 +0100

    Correcting copyright file.

diff --git a/debian/copyright b/debian/copyright
index 63bb96b..b826d67 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Download: http://spamaps.org/pipemeter.php
 
 Files: *
 Copyright: (C) 2002-2006 Clint Byrum <cbyrum at spamaps.org>
-License: GPL-2+
+License: GPL2+
  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
@@ -11,18 +11,18 @@ License: GPL-2+
  .
  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
+ 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
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Files: debian/*
 Copyright:
  (C) 2008 Christophe Monniez <christophe.monniez at fccu.be>
  (C) 2008 Daniel Baumann <daniel at debian.org>
-License: GPL-2+
+License: GPL2+
  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
@@ -30,12 +30,12 @@ License: GPL-2+
  .
  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
+ 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
+ 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'.
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL-2.

-- 
debian-forensics/pipemeter