[libspreadsheet-readsxc-perl] 02/04: Fixing the issues with debian/copyright.

[Andrius Merkys]

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

merkys-guest pushed a commit to branch master
in repository libspreadsheet-readsxc-perl.

commit 8ae057250152b85b1e48f5dd8a3cfcd633408c09
Author: Andrius Merkys <andrius.merkys at gmail.com>
Date:   Thu Dec 21 09:37:34 2017 +0200

    Fixing the issues with debian/copyright.
---
 debian/changelog |  8 --------
 debian/copyright | 40 ++++++++++++++++++++--------------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4951e1e..0333185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,14 +3,6 @@ libspreadsheet-readsxc-perl (0.20-1) UNRELEASED; urgency=low
   TODO:
   - debian/watch missing (dh-make-perl creates a correct one)
     (oh, and it was in git before the upstream merge)
-  - debian/copyright:
-    + upstream is licensed as "same as perl" which translates to
-      "Artistic or GPL-1+"
-    + typically we use "stand-alone" license paragraphs
-    + licensing debian/* under a different license than upstream is possible
-      but unusal and not recommended (as it makes forwarding patches
-      difficult)
-    + dh-make-perl provies a not-so-bad template for debian/copyright
   - debian/control:
     + Standards-Version: 4.1.2 (dh-make-perl ...)
     + short description should be a noun phrase, i.e. work in a sentence like
diff --git a/debian/copyright b/debian/copyright
index 86e43e9..86dc2f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,28 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Spreadsheet-ReadSXC
 Source: https://metacpan.org/release/Spreadsheet-ReadSXC
+Upstream-Contact: Christoph Terhechte <terhechte at cpan.org>
+Upstream-Name: Spreadsheet-ReadSXC
 
 Files: *
-Copyright: 2005 Christoph Terhechte <terhechte at cpan.org>
-License: Artistic
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
+Copyright: 2005, Christoph Terhechte <terhechte at cpan.org>
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: 2017 Andrius Merkys <andrius.merkys at gmail.com>
-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.
+Copyright: 2017, Andrius Merkys <andrius.merkys at gmail.com>
+License: Artistic or GPL-1+
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
  .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
+
+License: GPL-1+
+ 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 1, 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".
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libspreadsheet-readsxc-perl.git