[Pkg-sugar-commit] [sugar] 01/03: Update copyright info: Merge same-licensed Files sections.

[Jonas Smedegaard]

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

js pushed a commit to branch master-0.104
in repository sugar.

commit d8cf02b58ea77a3021a69104322e997ba60b8739
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jul 4 11:45:16 2015 -0500

    Update copyright info: Merge same-licensed Files sections.
---
 debian/copyright | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index ea460c2..9b8f9a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,10 +51,12 @@ Copyright:
   © 1994-2013, Free Software Foundation, Inc.
 License: GAP~Makefile.in
 
-Files: missing
+Files: m4/intltool.m4
+ missing
  py-compile
 Copyright:
   © 1996-2013, Free Software Foundation, Inc.
+  © 2001, Eazel, Inc
 License-Grant:
  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
@@ -105,20 +107,6 @@ Copyright:
   © 1994, X Consortium
 License: X11
 
-Files: m4/intltool.m4
-Copyright:
-  © 2001, Eazel, Inc
-License-Grant:
- 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 of the License, or (at your
- option) any later version.
-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: configure
 Copyright:
   © 1992-1996, 1998-2012, Free Software Foundation, Inc.

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