[Pkg-mpd-commits] [pkg-mpd] 09/10: Ensure DEP-5 license short names are unique

[Florian Schlichting]

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

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 4832ca9f00bf61789cb65fbe1a6ea093e195b5cb
Author: Florian Schlichting <fsfs at debian.org>
Date:   Mon Jun 22 23:56:45 2015 +0200

    Ensure DEP-5 license short names are unique
---
 debian/copyright | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 5cc5d19..91f465d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,14 +50,10 @@ License: GAP~autotools
 Files: build/compile build/depcomp build/missing build/test-driver
 Copyright: 1992-2013, Free Software Foundation, Inc.
 License: GPL-2+_with_Autoconf_exception
- 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.
 
 Files: build/config.*
 Copyright: 1992-2014, Free Software Foundation, Inc.
-License: GPL-3+_with_Autoconf_exception
+License: GPL-3+_with_Autoconf_config_exception
  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
@@ -105,7 +101,7 @@ Copyright: 2008, Guido U. Draheim <guidod at gmx.de>
  2008, Steven G. Johnson <stevenj at alum.mit.edu>
  2011, Maarten Bosmans <mkbosmans at gmail.com>
  2011, Daniel Richard G. <skunk at iSKUNK.ORG>
-License: GPL-3+_with_Autoconf_exception
+License: GPL-3+_with_Autoconf_macro_exception
  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, or (at your option)
@@ -142,10 +138,6 @@ License: permissive
 Files: m4/pkg.m4
 Copyright: 2004, Scott James Remnant <scott at netsplit.com>
 License: GPL-2+_with_Autoconf_exception
- 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.
 
 Files: debian/*
 Copyright: 2003-2004, Warren Dukes (aka shank) <shank at mercury.chem.pitt.edu>
@@ -191,3 +183,17 @@ License: GPL-2+
  .
  On Debian systems, the complete text of version 2 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+_with_Autoconf_exception
+ 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 2, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ 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.

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