[Forensics-changes] [SCM] debian-forensics/reglookup branch, debian, updated. debian/0.11.0-2-4-g672c432

[Christophe Monniez]

The following commit has been merged in the debian branch:
commit 672c432b1b7964ac779912fb3b61803bb07af485
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Mon Mar 22 09:18:27 2010 +0100

    Fixing license problem, bumping to GPL-3 (Closes: #574638).

diff --git a/debian/copyright b/debian/copyright
index f69c864..9a5219e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,11 +2,11 @@ Author: Timothy D. Morgan
 Download: http://projects.sentinelchicken.org/reglookup/
 
 Files: *
-Copyright: (C) 2005-2007 Timothy D. Morgan
-License: GPL-2+
+Copyright: (C) 2005-2010 Timothy D. Morgan
+License: GPL-3
  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
+ as published by the Free Software Foundation; version 3
  of the License.
  .
  This program is distributed in the hope that it will be useful,
@@ -19,16 +19,17 @@ License: GPL-2+
  Foundation, Inc., 51 Franklin Street, 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-2 file.
+ can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: src/reglookup.c
 Copyright:
- (C) 2005-2007 Timothy D. Morgan
+ (C) 2005-2010 Timothy D. Morgan
+ (C) 2010 Tobias Mueller (portions of '-i' code)
  (C) 2002 Richard Sharpe <rsharpe at richardsharpe.com>
-License: GPL-2+
+License: GPL-3
  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
+ as published by the Free Software Foundation; version 3
  of the License.
  .
  This program is distributed in the hope that it will be useful,
@@ -41,16 +42,16 @@ License: GPL-2+
  Foundation, Inc., 51 Franklin Street, 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-2 file.
+ can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: lib/regfi.*
 Copyright:
  (C) 2005-2007 Timothy D. Morgan
  (C) 2005 Gerald (Jerry) Carter
-License: GPL-2+
+License: GPL-3
  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
+ as published by the Free Software Foundation; version 3
  of the License.
  .
  This program is distributed in the hope that it will be useful,
@@ -63,36 +64,14 @@ License: GPL-2+
  Foundation, Inc., 51 Franklin Street, 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-2 file.
-
-Files: lib/smb_deps.*
-Copyright:
- (C) 2005-2006 Timothy D. Morgan
- (C) 1992-2005 Samba development team
-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; version 2
- of the 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.
- .
- 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.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: lib/void_stack.*
-Copyright: (C) 2005-2007 Timothy D. Morgan
-License: GPL-2+
+Copyright: (C) 2005-2007, 2009-2010 Timothy D. Morgan
+License: GPL-3
  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
+ as published by the Free Software Foundation; version 3
  of the License.
  .
  This program is distributed in the hope that it will be useful,
@@ -105,16 +84,16 @@ License: GPL-2+
  Foundation, Inc., 51 Franklin Street, 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-2 file.
+ can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: include/byteorder.h
 Copyright:
  (C) 2005 Timothy D. Morgan
  (C) 1992-1998 Andrew Tridgell
-License: GPL-2+
+License: GPL-3
  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
+ as published by the Free Software Foundation; version 3
  of the License.
  .
  This program is distributed in the hope that it will be useful,
@@ -127,7 +106,7 @@ License: GPL-2+
  Foundation, Inc., 51 Franklin Street, 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-2 file.
+ can be found in /usr/share/common-licenses/GPL-3 file.
 
 Files: debian/*
 Copyright:

-- 
debian-forensics/reglookup