[SCM] Debian packaging of Text-Markdown-Discount CPAN distribution branch, master, updated. upstream/0.02-11-g859d4f5

[Alessandro Ghedini]

The following commit has been merged in the master branch:
commit d030c71feba5b4e23c16b2f29e89b13b3b05a3a5
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Tue Jan 3 15:17:47 2012 +0100

    Add file xt/MarkdownXS.pl to copyright too
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index 7d5f82c..0662b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 libtext-markdown-discount-perl (0.02-1) UNRELEASED; urgency=low
 
   TODO:
-  - d/copyright: xt/MarkdownXS.pl also has different copyright holders
   - the patch: "-I $extdir" is still there, shouldn't this be patched out too?
     (or maybe not, without it the build fails. hm.)
 
diff --git a/debian/copyright b/debian/copyright
index 03a9707..5308b27 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,6 +26,11 @@ Files: xt/MarkdownTest_1.0.3/MarkdownTest.pl
 Copyright: 2004, John Gruber
 License: Artistic or GPL-1+
 
+Files: xt/MarkdownXS.pl
+Copyright: 2004, John Gruber
+ 2008, Tomas Doran
+License: BSD-3-Clause
+
 Files: debian/*
 Copyright: 2012, Alessandro Ghedini <al3xbio at gmail.com>
 License: Artistic or GPL-1+
@@ -91,3 +96,31 @@ License: BSD-4-clause
  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-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.
+ .
+ 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.

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