[fenix] 04/05: Convert the copyright file to the 1.0 format.

[Peter Pentchev]

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

roam-guest pushed a commit to branch master
in repository fenix.

commit 9a6b19a4f171a04be30620f12cb064c2798d47af
Author: Peter Pentchev <roam at ringlet.net>
Date:   Thu Dec 17 17:38:08 2015 +0200

    Convert the copyright file to the 1.0 format.
---
 debian/changelog |  2 ++
 debian/copyright | 93 +++++++++++++++++++++++++++-----------------------------
 2 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e869fb..044a05d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ fenix (0.92a.dfsg1-12) UNRELEASED; urgency=medium
       the environment
   * Declare compliance with Debian Policy 3.9.6 with no changes.
   * Add a DEP-3 header to the fix_ftbfs_libpng1.5 patch.
+  * Convert the copyright file to the 1.0 machine-readable format and
+    add my debian/* copyright notice.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 17 Dec 2015 16:11:53 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5dba88f..7e46265 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,52 +1,49 @@
-This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
-Mon, 04 Jun 2007 17:46:25 +0000.
-
-It was downloaded from http://sourceforge.net/projects/fenix
-
-Upstream Authors:
-    Fenix Team <fenix at divsite.net>
-
-    Jose Luis Cebrian, Jose Luis Cabello, Pedro A. Gracia Fajardo
-    Chui, Carlos Falo Hervas, SplinterGU
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: fenix
+Upstream-Contact: Fenix Team <fenix at divsite.net>
+Source: http://sourceforge.net/projects/fenix
+License: GPL-2+
 
+Files: *
 Copyright:
+  © 1999 José Luis Cebrián Pagüe
+  © 2002 Fenix Team
+License: GPL-2+
 
-    Copyright © 1999 José Luis Cebrián Pagüe
-    Copyright © 2002 Fenix Team
-
-
-License:
-
-    This package 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 package 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 version 2 of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-
-Documentation:
-
-Copyright (c) FenixWiki ( http://fenixworld.se32.com/fenixwiki/ )
-
-   Permission is granted to copy, distribute and/or modify this documents
-   under the terms of the GNU Free Documentation License, Version 1.2
-   as published by the Free Software Foundation with no Invariant Sections,
-   no Front-Cover Texts, and no Back-Cover Texts.
-
-On Debian systems, the complete text of the GNU Free Documentation License
-Public License v1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'.
-
+Files: debian/*
+Copyright:
+  © 2007 Miriam Ruiz <little_miry at yahoo.es>
+  © 2011, 2015 Peter Pentchev <roam at ringlet.net>
+License: GPL-2+
 
-Debian packaging and patches are (C) 2007, Miriam Ruiz <little_miry at yahoo.es>
-and are licensed under the GPL, see above.
+Files: debian/doc/*
+Copyright:
+  © FenixWiki ( http://fenixworld.se32.com/fenixwiki/ )
+License: GFDL-1.2
+
+License: GPL-2+
+  This package 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 package 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 version 2 of the GNU General
+  Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: GFDL-1.2
+  Permission is granted to copy, distribute and/or modify this documents
+  under the terms of the GNU Free Documentation License, Version 1.2
+  as published by the Free Software Foundation with no Invariant Sections,
+  no Front-Cover Texts, and no Back-Cover Texts.
+  .
+  On Debian systems, the complete text of the GNU Free Documentation License
+  Public License v1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'.

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