[SCM] Debian packaging of Text-Markdown-Discount CPAN distribution branch, master, updated. debian/0.04-1-9-gfc9224b

[Alessandro Ghedini]

The following commit has been merged in the master branch:
commit 295a716b73327ac70dc2aa3ebaaa741bc8a0a5b4
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Fri Jul 26 19:16:49 2013 +0200

    Update copyright and license for discount

diff --git a/debian/copyright b/debian/copyright
index 4ffbd0a..ac44a1c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,14 +13,14 @@ Copyright: 2004-2010, Marcus Holland-Moritz <mhx-cpan at gmx.net>
  1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
 License: Artistic or GPL-1+
 
-Files: discount-2.1.2/*
+Files: discount/*
 Copyright: 1999-2011, David L Parsons
-License: BSD-4-clause
+License: BSD-2-clause
 
-Files: discount-2.1.2/toc.c
-Copyright: 2008 Jjgod Jiang
- 2008, David L Parsons
-License: BSD-4-clause
+Files: discount/toc.c
+Copyright: 2008, Jjgod Jiang, David L Parsons
+ 2011, Stefano D'Angelo
+License: BSD-2-clause
 
 Files: xt/MarkdownTest_1.0.3/MarkdownTest.pl
 Copyright: 2004, John Gruber
@@ -70,51 +70,32 @@ License: BSD-3-clause
  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
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicence, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
- .
- 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, and in the same place and form as other
-    copyright, license and disclaimer information.
- .
- 3. The end-user documentation included with the redistribution, if
-    any, must include the following acknowledgment:
- .
-      This product includes software developed by
-      David Loren Parsons <http://www.pell.portland.or.us/~orc>
- .
-    in the same place and form as other third-party acknowledgments.
-    Alternately, this acknowledgment may appear in the software
-    itself, in the same form and location as other such third-party
-    acknowledgments.
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
  .
- 4. Except as contained in this notice, the name of David Loren
-    Parsons shall not be used in advertising or otherwise to promote
-    the sale, use or other dealings in this Software without prior
-    written authorization from David Loren Parsons.
+ 1.  Redistributions of works must retain the original copyright notice,
+     this list of conditions and the following disclaimer.
+ 2.  Redistributions in binary form must reproduce the original copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+     Neither my name (David L Parsons) nor the names of contributors to
+     this code may be used to endorse or promote products derived
+     from this work without specific prior written permission.
  .
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 DAVID LOREN PARSONS 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.
+ 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: GPL-1+
  This program is free software; you can redistribute it and/or modify
@@ -124,4 +105,3 @@ License: GPL-1+
  .
  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