[SCM] marco Debian package branch, master, updated. e44727adbf84d8f41d4fc02f1a787d9ac89fa07d

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=e44727a

The following commit has been merged in the master branch:
commit e44727adbf84d8f41d4fc02f1a787d9ac89fa07d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 10 15:26:54 2014 +0100

    debian/copyright: Fix license for config.guess and config.sub.
---
 debian/changelog |  7 +++++++
 debian/copyright | 11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 990f7b3..895a6e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+marco (1.6.2-2) UNRELEASED; urgency=low
+
+  * debian/copyright:
+    + Fix license for config.guess and config.sub.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Mon, 10 Feb 2014 15:26:30 +0100
+
 marco (1.6.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #728493).
diff --git a/debian/copyright b/debian/copyright
index bb81034..6dc88ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -419,7 +419,7 @@ License:
 Files: config.guess
        config.sub
 Copyright: 1992-2013, Free Software Foundation, Inc.
-License: GPL-3+
+License: GPL-3+~amorph
 
 Files: configure
 Copyright: 1992-2010, Free Software Foundaction, Inc.
@@ -479,7 +479,7 @@ License: GPL-2+~amorph
  configuration script generated by Autoconf, you may include it under
  the same distribution terms that you use for the rest of that program.
 
-License: GPL-3+
+License: GPL-3+~amorph
  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
@@ -495,6 +495,13 @@ License: GPL-3+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that
+ program.  This Exception is an additional permission under section 7
+ of the GNU General Public License, version 3 ("GPLv3").
 
 License: LGPL-2+
  This library is free software; you can redistribute it and/or

-- 
marco Debian package