[SCM] Debian packaging of X11-Protocol CPAN distribution branch, master, updated. 86c4eb8d40da6901cd3557370a9d679fa0db22ad

[gregor herrmann]

The following commit has been merged in the master branch:
commit 41f72c90d0beae65ce2b5e1f493c0f0380f3e96a
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Jun 5 19:17:54 2012 +0200

    debian/copyright: update to Copyright-Format 1.0.

diff --git a/debian/copyright b/debian/copyright
index 4c7fb2d..0cecaa2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
-Maintainer: Stephen McCamant <SMCCAM at cpan.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: X11-Protocol
+Upstream-Contact: Stephen McCamant <SMCCAM at cpan.org>
 Source: http://search.cpan.org/dist/X11-Protocol/
-Name: X11-Protocol
 
 Files: *
 Copyright: 1997-2006, Stephen McCamant <SMCCAM at cpan.org>
@@ -9,7 +9,22 @@ License: Artistic or GPL-1+
 
 Files: Keysyms.pm
 Copyright: 1987, 1994, X Consortium
-License: MIT
+ 1987, Digital Equipment Corporation, Maynard, Massachusetts
+License: Expat
+
+Files: debian/*
+Copyright: 2005-2010, tony mancill <tmancill at debian.org>
+ 2007-2010, gregor herrmann <gregoa at debian.org>
+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: Expat
  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
@@ -34,39 +49,6 @@ License: MIT
  other dealings in this Software without prior written authorization
  from the X Consortium.
 
-Files: Keysyms.pm
-Copyright: 1987, Digital Equipment Corporation, Maynard, Massachusetts
-License: MIT
- All Rights Reserved
- .
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted,
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of Digital not be
- used in advertising or publicity pertaining to distribution of the
- software without specific, written prior permission.
- .
- DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- SOFTWARE.
-
-Files: debian/*
-Copyright: 2005-2010, tony mancill <tmancill at debian.org>
- 2007-2010, gregor herrmann <gregoa at debian.org>
-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: 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
@@ -75,3 +57,4 @@ License: GPL-1+
  .
  On Debian GNU/Linux systems, the complete text of version 1 of the
  General Public License can be found in `/usr/share/common-licenses/GPL-1'.
+

-- 
Debian packaging of X11-Protocol CPAN distribution