[opencity] 33/91: Fix copyright issues, closes: #442034, #442056

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository opencity.

commit 062b3285de8a08de540dadcc23ee677313ef03b0
Author: Cyril Brulebois <kibi at debian.org>
Date:   Thu Sep 13 05:12:15 2007 +0000

    Fix copyright issues, closes: #442034, #442056
---
 debian/changelog |  5 +++++
 debian/copyright | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f01e832..e4aeff2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ opencity (0.0.4stable-3) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
+  * Fixed copyright:
+     - Added missing “or any later version” to match upstream's copyright
+       statement in the COPYRIGHT file (Closes: #442034).
+     - Fixed public domain statement by replacing the copyright by an
+       authorship statement (Closes: #442056).
 
  -- Jon Dowland <jon at alcopop.org>  Thu, 12 Jul 2007 12:03:33 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 2140258..56c4a31 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,9 +23,10 @@ It was downloaded from http://www.opencity.info/
  Copyright (C) 2003-2006 Frédéric RODRIGO
  Copyright (C) 1999 Jeff Molofee 
 
-This program is free software; you can redistribute it and/or modify
+  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.
+  the Free Software Foundation; either version 2 of the License, or
+  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
@@ -33,15 +34,18 @@ This program is free software; you can redistribute it and/or modify
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+  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, version 2, can be found in /usr/share/common-licenses/GPL-2.
 
-The Files in src/binreloc/  are copyright 2002-2006 Hongli Lai 
+The files under src/binreloc/ have been put in the public domain by
+Hongli Lai <h.lai at chello.nl>:
   This source code is public domain. You can relicense this code
   under whatever license you want.
 
-The Debian packaging is (C) 2006, Gonéri Le Bouder <goneri at rulezlan.org> and
-is licensed under the GPL.
+The Debian packaging is:
+  (C) 2006-2007, Gonéri Le Bouder <goneri at rulezlan.org>
+  (C) 2007, Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+and is licensed under the GPL.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git