[SCM] Debian packaging of libcdk-perl branch, master, updated. debian/4.9.10-5-22-g098ed6b

[gregor herrmann]

The following commit has been merged in the master branch:
commit e9f6b3df9b138b7b845f90b011f194f0843c1dbb
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Aug 26 18:23:54 2012 +0200

    debian/copyright: update to Copyright-Format 1.0.

diff --git a/debian/copyright b/debian/copyright
index 2468213..6bb0fe7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Thomas Dickey
-Upstream-Source: http://invisible-island.net/cdk/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Cdk
+Upstream-Contact: Thomas Dickey
+Source: http://invisible-island.net/cdk/
 
 Files: *
 Copyright: 1995-1999, Mike Glover
@@ -16,28 +15,34 @@ Copyright: 2000, Raphael Bossek <bossekr at debian.org>
  2007, Jeremiah Foster <jeremiah at jeremiahfoster.com>
  2008, 2009, gregor herrmann <gregoa at debian.org>
  2008, Damyan Ivanov <dmn at debian.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
+
+License: Artistic
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Artistic License, which comes with Perl.
+    On Debian GNU/Linux systems, the complete text of the Artistic License
+    can be found in `/usr/share/common-licenses/Artistic'
 
 License: BSD-4
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
-    .
+ .
     1.  Redistributions of source code must retain the above copyright notice, this
         list of conditions and the following disclaimer.
-    .
+ .
     2.  Redistributions in binary form must reproduce the above copyright notice,
         this list of conditions and the following disclaimer in the documentation
         and/or other materials provided with the distribution.
-    .
+ .
     3.  All advertising materials mentioning features or use of this software must
         display the following acknowledgment:
         This product includes software developed by Mike Glover and
         contributors.
-    .
+ .
     4. Neither the name of Mike Glover nor the names of contributors
        may be used to endorse or promote products derived from this software
        without specific prior written permission.
-    .
+ .
     THIS SOFTWARE IS PROVIDED BY MIKE GLOVER AND CONTRIBUTORS ``AS IS'' AND ANY
     EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -49,12 +54,6 @@ License: BSD-4
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
-
 License: GPL-1+
     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
@@ -62,3 +61,4 @@ License: GPL-1+
     any later version.
     On Debian GNU/Linux systems, the complete text of the GNU General
     Public License can be found in `/usr/share/common-licenses/GPL'
+

-- 
Debian packaging of libcdk-perl