[SCM] Debian packaging of libpod-markdown-perl branch, master, updated. debian/1.120001-1-11-g2b5295c

Florian Schlichting fschlich at zedat.fu-berlin.de
Sun Apr 8 10:34:26 UTC 2012


The following commit has been merged in the master branch:
commit 2b5295c09b3954aadbec620d4d066f2367eaffb7
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Sun Apr 8 12:30:41 2012 +0200

    drop 0001-Escape-characters-that-can-have-a-special-meaning-in.patch, applied and extended upstream

diff --git a/debian/changelog b/debian/changelog
index 3dbc493..b64c70e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-libpod-markdown-perl (1.300000-1) UNRELEASED; urgency=low
+libpod-markdown-perl (1.300000-1) unstable; urgency=low
 
   * Imported Upstream version 1.300000.
+  * Dropped 0001-Escape-characters-that-can-have-a-special-meaning-in.patch,
+    extended and documented upstream.
 
- -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Sun, 08 Apr 2012 12:23:47 +0200
+ -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Sun, 08 Apr 2012 12:32:38 +0200
 
 libpod-markdown-perl (1.200000-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Escape-characters-that-can-have-a-special-meaning-in.patch b/debian/patches/0001-Escape-characters-that-can-have-a-special-meaning-in.patch
deleted file mode 100644
index 4a8bf45..0000000
--- a/debian/patches/0001-Escape-characters-that-can-have-a-special-meaning-in.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Description: Escape characters that can have a special meaning in markdown
- Escaping * and _ in verbatim and textblocks as they have special
- meanings in markdown as emphasis 
-From: =?UTF-8?q?Carl=20F=C3=BCrstenberg?= <azatoth at gmail.com>
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=75620
-
----
- lib/Pod/Markdown.pm |    9 +++++++++
- t/misc.t            |   11 ++++++++++-
- 2 files changed, 19 insertions(+), 1 deletions(-)
-
---- a/lib/Pod/Markdown.pm
-+++ b/lib/Pod/Markdown.pm
-@@ -91,9 +91,17 @@
- sub _clean_text {
-     my $text    = $_[1];
-     my @trimmed = grep { $_; } split(/\n/, $text);
-+
-     return wantarray ? @trimmed : join("\n", @trimmed);
- }
- 
-+sub _escape {
-+	my $text = $_[1];
-+	# escape stars and stripes as they are interpret in markdown as emphasis
-+	$text =~ s/(\_|\*)/\\$1/g;
-+	return $text;
-+}
-+
- sub command {
-     my ($parser, $command, $paragraph, $line_num) = @_;
-     my $data = $parser->_private;
-@@ -154,6 +162,7 @@
- 
- sub verbatim {
-     my ($parser, $paragraph) = @_;
-+    $paragraph = $parser->_escape($paragraph);
- 
-     # NOTE: perlpodspec says parsers should expand tabs by default
-     # NOTE: Apparently Pod::Parser does not.  should we?
-@@ -182,6 +191,7 @@
- sub textblock {
-     my ($parser, $paragraph, $line_num) = @_;
-     my $data = $parser->_private;
-+    $paragraph = $parser->_escape($paragraph);
- 
-     # interpolate the paragraph for embebed sequences
-     $paragraph = $parser->interpolate($paragraph, $line_num);
---- a/t/misc.t
-+++ b/t/misc.t
-@@ -17,7 +17,7 @@
- 
- # SYNOPSIS
- 
--    \$ pod2markdown < POD_File > Markdown_File
-+    \$ pod2markdown < POD\\_File > Markdown\\_File
- 
- # DESCRIPTION
- 
-@@ -64,6 +64,11 @@
- # Links
- 
- [Formatting `C`odes](${pod_prefix}Links#L<...>)
-+
-+# Special characters
-+
-+    foo\\_bar is the result of 4 \\* 4
-+
- EOMARKDOWN
- 
- 1 while chomp $markdown;
-@@ -138,3 +143,7 @@
- =head1 Links
- 
- L<<< FormattZ<>ing C<C>odes|Links/"LE<lt>...E<gt>" >>>
-+
-+=head1 Special characters
-+
-+    foo_bar is the result of 4 * 4
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b4e6947..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Escape-characters-that-can-have-a-special-meaning-in.patch

-- 
Debian packaging of libpod-markdown-perl



More information about the Pkg-perl-cvs-commits mailing list