[Pkg-gnupg-commit] [libassuan] 437/437: debian/copyright: Fix non-unique license.

[Eric Dorland]

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

eric pushed a commit to branch master
in repository libassuan.

commit 2900f41e3cccd3900045bd1038b9fb6136dcda44
Author: Eric Dorland <eric at debian.org>
Date:   Fri May 22 01:31:00 2015 -0400

    debian/copyright: Fix non-unique license.
---
 debian/changelog | 3 ++-
 debian/copyright | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c234a99..939edc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libassuan (2.2.1-1) unstable; urgency=medium
 
   * New upstream release.
   * debian/gbp.conf: Use upstream-vcs-tag.
+  * debian/copyright: Fix non-unique license.
 
- --
+ -- Eric Dorland <eric at debian.org>  Fri, 22 May 2015 01:32:11 -0400
 
 libassuan (2.2.0-2) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 12971ea..ab0c147 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -62,7 +62,7 @@ Files: AUTHORS
  src/libassuan.m4
  src/mkheader.c
 Copyright: 1992-1996, 1998-2013, Free Software Foundation, Inc
-License: permissive
+License: GAP~FSF
  This file is free software; the Free Software Foundation
  gives unlimited permission to copy and/or distribute it,
  with or without modifications, as long as this notice is preserved. 
@@ -165,7 +165,7 @@ Files: autogen.sh
  m4/gpg-error.m4
  src/versioninfo.rc.in
 Copyright: 2003-2013 g10 Code GmbH
-License: permissive
+License: GAP
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.

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