[dans-gdal-scripts] 04/12: Update copyright file, use separate license specifications.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository dans-gdal-scripts.

commit 39e8ed73fc5d091dc2341772e254039d173541e5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 13 20:30:22 2015 +0100

    Update copyright file, use separate license specifications.
---
 debian/changelog |  1 +
 debian/copyright | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e829a5..1049f4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dans-gdal-scripts (0.23-3) UNRELEASED; urgency=medium
   * Add myself to Uploaders.
   * Restructure control file with cme.
   * Use canonical URLs for Vcs-* fields.
+  * Update copyright file, use separate license specifications.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 13 Feb 2015 20:23:03 +0100
 
diff --git a/debian/copyright b/debian/copyright
index ca3a27b..2f9ece5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,21 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name:  dans-gdal-scripts
+Upstream-Name: dans-gdal-scripts
 Upstream-Contact: Dan Stahlke <dan at stahlke.org>
 Source: https://github.com/gina-alaska/dans-gdal-scripts
 
 Files: *
 Copyright: 2013, Regents of the University of Alaska
 License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2009-2013, Francesco Paolo Lovergine <frankie at debian.org>
+License: GPL-3+
+
+License: BSD-3-clause
  Redistribution  and use  in source  and  binary forms,  with or  without
  modification, are  permitted provided that the  following conditions are
  met:
-
+ .
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above copyright
@@ -19,7 +25,7 @@ License: BSD-3-clause
       nor the names of its contributors may be used to endorse or promote
       products derived from this software without specific prior written
       permission.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -32,10 +38,18 @@ License: BSD-3-clause
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: debian/*
-Copyright: 2009-2013 Francesco Paolo Lovergine <frankie at debian.org>
 License: GPL-3+
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
+ 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 3 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.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 

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