[SCM] Debian packaging of Text-Markdown-Discount CPAN distribution branch, master, updated. debian/0.02-1-10-gbc47ae2

[Alessandro Ghedini]

The following commit has been merged in the master branch:
commit b7dec55d0ef5a0682c3618f2cbcdf0939e89b439
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Sun Sep 23 18:39:06 2012 +0200

    Update copyright to Copyright-Format 1.0

diff --git a/debian/copyright b/debian/copyright
index cb5b8ec..530393f 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: Masayoshi Sekimura <sekimura at cpan.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Text-Markdown-Discount
+Upstream-Contact: Masayoshi Sekimura <sekimura at cpan.org>
 Source: http://search.cpan.org/dist/Text-Markdown-Discount/
-Name: Text-Markdown-Discount
 
 Files: *
 Copyright: 2009, Masayoshi Sekimura <sekimura at cpan.org>
@@ -29,7 +29,7 @@ License: Artistic or GPL-1+
 Files: xt/MarkdownXS.pl
 Copyright: 2004, John Gruber
  2008, Tomas Doran
-License: BSD-3-Clause
+License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2012, Alessandro Ghedini <ghedo at debian.org>
@@ -42,14 +42,33 @@ License: Artistic
  On Debian 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
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
  .
- On Debian systems, the complete text of version 1 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-1'.
+ * Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+ .
+ * 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.
+ .
+ * Neither the name "Markdown" nor the names of its contributors may
+   be used to endorse or promote products derived from this software
+   without specific prior written permission.
+ .
+ This software is provided by the copyright holders 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 disclaimed. In no event shall the copyright owner
+ or contributors be liable for any direct, indirect, incidental, special,
+ exemplary, or consequential damages (including, but not limited to,
+ procurement of substitute goods or services; loss of use, data, or
+ profits; or business interruption) however caused and on any theory of
+ liability, whether in contract, strict liability, or tort (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: BSD-4-clause
  Permission is hereby granted, free of charge, to any person
@@ -97,30 +116,12 @@ License: BSD-4-clause
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- * Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
- .
- * 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.
- .
- * Neither the name "Markdown" nor the names of its contributors may
-   be used to endorse or promote products derived from this software
-   without specific prior written permission.
+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
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
  .
- This software is provided by the copyright holders 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 disclaimed. In no event shall the copyright owner
- or contributors be liable for any direct, indirect, incidental, special,
- exemplary, or consequential damages (including, but not limited to,
- procurement of substitute goods or services; loss of use, data, or
- profits; or business interruption) however caused and on any theory of
- liability, whether in contract, strict liability, or tort (including
- negligence or otherwise) arising in any way out of the use of this
- software, even if advised of the possibility of such damage.
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
+

-- 
Debian packaging of Text-Markdown-Discount CPAN distribution