[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 1d7dda9a384ce46c8f3ad42fbffed4a850325d9f
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Tue Jan 3 15:37:14 2012 +0100

    Add do-not-use-cstring.patch patch
    
    Git-Dch: Ignore

diff --git a/debian/patches/do-not-use-cstring.patch b/debian/patches/do-not-use-cstring.patch
new file mode 100644
index 0000000..ea4a5fa
--- /dev/null
+++ b/debian/patches/do-not-use-cstring.patch
@@ -0,0 +1,56 @@
+Description: Discount.xs include the header cstring.h which is intended 
+ only for internal discount use.
+Origin: vendor
+Forwarded: no
+Author: Alessandro Ghedini <al3xbio at gmail.com>
+Reviewed-by: Alessandro Ghedini <al3xbio at gmail.com>
+Last-Update: 2012-01-03
+
+--- a/Discount.xs
++++ b/Discount.xs
+@@ -6,36 +6,6 @@
+ 
+ #include <string.h>
+ #include <mkdio.h>
+-#include <cstring.h>
+-
+-typedef struct line {
+-    Cstring text;
+-    struct line *next;
+-    int dle;
+-} Line;
+-
+-typedef struct paragraph {
+-    struct paragraph *next;	/* next paragraph */
+-    struct paragraph *down;	/* recompiled contents of this paragraph */
+-    struct line *text;		/* all the text in this paragraph */
+-    char *ident;		/* %id% tag for QUOTE */
+-    enum { WHITESPACE=0, CODE, QUOTE, MARKUP,
+-	   HTML, STYLE, DL, UL, OL, AL, LISTITEM,
+-	   HDR, HR } typ;
+-    enum { IMPLICIT=0, PARA, CENTER} align;
+-    int hnumber;		/* <Hn> for typ == HDR */
+-} Paragraph;
+-
+-typedef struct document {
+-    Line *headers;		/* title -> author(s) -> date */
+-    ANCHOR(Line) content;	/* uncompiled text, not valid after compile() */
+-    Paragraph *code;		/* intermediate code generated by compile() */
+-    int compiled;		/* set after mkd_compile() */
+-    int html;			/* set after (internal) htmlify() */
+-    int tabstop;		/* for properly expanding tabs (ick) */
+-    MMIOT *ctx;			/* backend buffers, flags, and structures */
+-    char *base;			/* url basename for url fragments */
+-} Document;
+ 
+ MODULE = Text::Markdown::Discount		PACKAGE = Text::Markdown::Discount	PREFIX = TextMarkdown_
+ 
+@@ -49,7 +19,7 @@
+         int flags = MKD_NOHEADER|MKD_NOPANTS;
+         char *html = NULL;
+         int szhtml;
+-        Document *doc;
++        MMIOT *doc;
+     CODE:
+         if ( (doc = mkd_string(text, strlen(text), flags)) == 0 ) {
+             croak("failed at mkd_string");
diff --git a/debian/patches/series b/debian/patches/series
index 2c934eb..b4b7e01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+do-not-use-cstring.patch
 use-system-markdown.patch

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