[osmctools] 07/09: Update copyright file.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmctools.

commit 64840876180007d718b2762a2db6cc38c44eb5a8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 27 22:12:14 2015 +0100

    Update copyright file.
    
    Changes:
    - Split license specificitions from files section
    - Add Upstream-Contact
    - Group copyright years into single range
---
 debian/changelog |  4 ++++
 debian/copyright | 44 +++++++++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35422bf..5abec7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ osmctools (0.4-1) UNRELEASED; urgency=medium
     (closes: #772536)
   * Update my email to @debian.org address.
   * Update Vcs-Browser URL to use cgit.
+  * Update copyright file, changes:
+    - Split license specificitions from files section
+    - Add Upstream-Contact
+    - Group copyright years into single range
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Feb 2015 22:02:10 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 7081627..132f9b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,33 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: osmtools
+Upstream-Contact: Markus Weber <marqqs at gmx.eu>
 Source: http://gitorious.org/osm-c-tools/ 
 
 Files: *
-Copyright: 2011, 2012, 2013 Markus Weber
+Copyright: 2011-2013, Markus Weber <marqqs at gmx.eu>
+License: AGPL-3
+
+Files: debian/*
+Copyright: 2013, Pierre Blanc <pierreblanc75 at gmail.com>
+License: GPL-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 program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
 License: AGPL-3
  GNU AFFERO GENERAL PUBLIC LICENSE
  Version 3, 19 November 2007
@@ -622,21 +646,3 @@ License: AGPL-3
  Program, unless a warranty or assumption of liability accompanies a
  copy of the Program in return for a fee.
 
-Files: debian/*
-Copyright: 2013 Pierre Blanc <pierreblanc75 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.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

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