[SCM] pd-flite/master: tidied up a bit to conform with specified DEP-5

[rdz-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ab0a53b603bd49b917b666ba075dc7510d62f458
Author: Roman Haefeli <reduzent at gmail.com>
Date:   Thu Nov 3 21:46:11 2011 +0100

    tidied up a bit to conform with specified DEP-5

diff --git a/debian/copyright b/debian/copyright
index 21c1a7b..abf98fc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,15 +17,11 @@ License: GAP
 
 Files: config/depcomp
 Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc.
-License: GPL-2+ with Autoconf exception
+License: GPL-2+-with-Autoconf-exception
 
 Files: config/install-sh
 Copyright: 1994, X Consortium
-License: Expat with X exception
- Except as contained in this notice, the name of the X Consortium shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from the X Consortium.
+License: Expat-with-X-exception
 
 Files: config/missing
 Copyright: 1996-1997, 1999-2000, 2002-2005, Free Software Foundation, Inc.
@@ -48,6 +44,9 @@ License: GPL-2
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Comment:
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
@@ -64,16 +63,13 @@ License: GPL-2+
  along with this package; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-License: GPL-2+ with Autoconf exception
+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.
-Comment:
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-License: Expat with X exception
+License: Expat-with-X-exception
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -92,3 +88,9 @@ License: Expat with X exception
  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.
+

-- 
pd-flite packaging