[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f

[Peter Pentchev]

The following commit has been merged in the master branch:
commit 7755f71920692190308f862e6d36c9aa227a4fa5
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sun Dec 5 22:44:45 2010 +0200

    Convert the copyright file to the DEP 5 format and add my copyright notice.

diff --git a/debian/changelog b/debian/changelog
index cc0315b..2aee282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low
 
   TODO: dpkg-buildflags
   TODO: debhelper 8
-  TODO: DEP 5 copyright
   TODO: Vcs-* tags
 
   * New maintainer.  Closes: #442045
@@ -12,6 +11,7 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low
   * Convert to the 3.0 (quilt) source format with bzip2 compression.
   * Refer to the GPL-2 file instead of the GPL symlink.
   * Bump Standards-Version to 3.9.1 with no changes.
+  * Convert the copyright file to the DEP 5 format and add my notice.
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 24 Oct 2010 18:56:37 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 7ce926c..2175f85 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,44 @@
-This package was debianized by Polkan Alexis Garcia Rodriguez <pagarcia at slcolombia.org> on
-Mon, 28 Jun 2004 15:19:37 -0500.
-
-It was downloaded from http://bachue.com/matanza/
-
-Author:
-
-    Alejandro Forero Cuervo <alejo at bachue.com>
-
-Copyright:
-
-    Copyright (C) 1999, 2000 Alejandro Forero Cuervo
-    Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-
-Licence:
-
-    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 package; 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'.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: matanza
+Maintainer: Alejandro Forero Cuervo <alejo at bachue.com>
+
+Files: *
+Copyright: 1999, 2000  Alejandro Forero Cuervo
+License: GPL-2+
+
+Files: ascii.h asciitab.h iasciitab.h latin1tab.h utf8tab.h
+       xmldef.h xmlparse.c xmlparse.h xmlrole.c xmlrole.h
+       xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h
+Copyright: 1998, 1999, 2000  Thai Open Source Software Center Ltd
+License: GPL-2+
+
+Files: getopt1.c
+Copyright: 1987,88,89,90,91,92,93,94,96,97,98  Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: getopt.c
+Copyright: 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98  Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: getopt.h
+Copyright: 1989,90,91,92,93,94,96,97  Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2004, 2005  Polkan Alexis Garcia Rodriguez <pagarcia at slcolombia.org>
+           2005  Anand Kumria <wildfire at progsoc.org>
+	   2006  Paul Wise <pabs3 at bonedaddy.net>
+	   2006  Clint Adams <schizo at debian.org>
+	   2007  Michael Tautschnig <tautschn at model.in.tum.de>
+	   2008  Frank Lichtenheld <djpig at debian.org>
+	   2010  Peter Pentchev <roam at ringlet.net>
+License: GPL-2+
+
+Licence: 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.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.

-- 
matanza - a space ascii war game