[gmt] 08/29: Repack upstream source using Files-Excluded in the 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 gmt.

commit caaf0842b4982ef9ee1f9123f46000b0edee80ba
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 5 17:35:47 2015 +0200

    Repack upstream source using Files-Excluded in the copyright file.
---
 debian/changelog |  1 +
 debian/copyright | 41 +++++++++++++++++++++++------------------
 debian/watch     |  3 ++-
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e54c82..51a57b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ gmt (5.1.2-1) UNRELEASED; urgency=medium
     - Changed OSSIM license to LGPL-3+ only
     - Update copyright years, add additional copyright holders
     - Add license & copyright for differently licensed files (mostly BSD/MIT)
+  * Repack upstream source using Files-Excluded in the copyright file.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 05 Jun 2015 14:32:40 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 2d92b9a..512533b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,29 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GMT
 Upstream-Contact: Paul Wessel <wessel at soest.hawaii.edu> and Walter Smith <wsmith at nodc.noaa.gov>
 Source: http://gmt.soest.hawaii.edu/
+Comment: The upstream source is repacked to exclude the non-free triangle source.
+ The license & copyright of the excluded files was:
+ .
+  Files: src/triangle.c
+   src/triangle.h
+  Copyright: 1993, 1995, 1997-1998, 2002, 2005, Jonathan Richard Shewchuk
+  License: Triangle
+   This program may be freely redistributed under the condition that the
+   copyright notices (including this entire header and the copyright
+   notice printed when the `-h' switch is selected) are not removed, and
+   no compensation is received.  Private, research, and institutional
+   use is free.  You may distribute modified versions of this code UNDER
+   THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE
+   SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE
+   AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR
+   NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as
+   part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT
+   WITH THE AUTHOR.  (If you are not directly supplying this code to a
+   customer, and you are instead telling them how they can obtain it for
+   free, then you are not required to make any arrangement with me.)
+ .
+Files-Excluded: src/triangle.c
+ src/triangle.h
 
 File: *
 Copyright: 1991-2015, P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
@@ -36,24 +59,6 @@ License: SunPro
  software is freely granted, provided that this notice
  is preserved.
 
-Files: src/triangle.c
- src/triangle.h
-Copyright: 1993, 1995, 1997-1998, 2002, 2005, Jonathan Richard Shewchuk
-License: Triangle
- This program may be freely redistributed under the condition that the
- copyright notices (including this entire header and the copyright
- notice printed when the `-h' switch is selected) are not removed, and
- no compensation is received.  Private, research, and institutional
- use is free.  You may distribute modified versions of this code UNDER
- THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE
- SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE
- AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR
- NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as
- part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT
- WITH THE AUTHOR.  (If you are not directly supplying this code to a
- customer, and you are instead telling them how they can obtain it for
- free, then you are not required to make any arrangement with me.)
-
 Files: src/compat/inttypes.h
  src/compat/stdint.h
 Copyright: 2006-2008, Alexander Chemeris
diff --git a/debian/watch b/debian/watch
index 5d41bc0..ac6f1ef 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,7 @@
 version=3
 opts=passive,\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
-uversionmangle=s/-src$//;s/^(\S+-doc)/0.0.$1/ \
+uversionmangle=s/-src$//;s/^(\S+-doc)/0.0.$1/,\
+repacksuffix=+dfsg \
 ftp://ftp.soest.hawaii.edu/gmt/ \
 (?:|.*/)gmt(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

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