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

Florian Schlichting fschlich at zedat.fu-berlin.de
Thu Mar 8 11:47:51 UTC 2012


The following commit has been merged in the master branch:
commit 8682b8178176e168ee8858e58a36de4512f620ac
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Thu Mar 8 12:35:41 2012 +0100

    Refreshed and forwarded patch 0001

diff --git a/debian/changelog b/debian/changelog
index 8b571a8..3e4c078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,12 @@
 libpod-markdown-perl (1.200000-1) UNRELEASED; urgency=low
 
-  TODO:
-  0001-Escape-characters-that-can-have-a-special-meaning-in.patch doesn't
-  apply anymore. this should probably be forwarded/discussed/fixed (with)
-  upstream instead of carrying it in the debian package.
-
+  [ gregor herrmann ]
   * New upstream release.
 
- -- gregor herrmann <gregoa at debian.org>  Fri, 02 Dec 2011 22:18:00 +0100
+  [ Florian Schlichting ]
+  * Refreshed and forwarded patch 0001.
+
+ -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Thu, 08 Mar 2012 12:32:11 +0100
 
 libpod-markdown-perl (1.120001-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
index 6019078..4a8bf45 100644
--- 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
@@ -1,9 +1,9 @@
+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>
-Date: Thu, 8 Sep 2011 03:08:00 +0200
-Subject: Escape characters that can have a special meaning in markdown
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=75620
 
-Escaping * and _ in verbatim and textblocks as they have special
-meanings in markdown as emphasis
 ---
  lib/Pod/Markdown.pm |    9 +++++++++
  t/misc.t            |   11 ++++++++++-
@@ -11,31 +11,33 @@ meanings in markdown as emphasis
 
 --- a/lib/Pod/Markdown.pm
 +++ b/lib/Pod/Markdown.pm
-@@ -94,8 +94,15 @@
+@@ -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) = @_;
-@@ -157,6 +164,7 @@
+     my $data = $parser->_private;
+@@ -154,6 +162,7 @@
  
  sub verbatim {
      my ($parser, $paragraph) = @_;
 +    $paragraph = $parser->_escape($paragraph);
  
-     # POD verbatim can start with any number of spaces (or tabs)
-     # markdown should be 4 spaces (or a tab)
-@@ -181,6 +189,7 @@
+     # 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;
@@ -45,32 +47,32 @@ meanings in markdown as emphasis
      $paragraph = $parser->interpolate($paragraph, $line_num);
 --- a/t/misc.t
 +++ b/t/misc.t
-@@ -15,7 +15,7 @@
+@@ -17,7 +17,7 @@
  
  # SYNOPSIS
  
--    $ pod2markdown < POD_File > Markdown_File
-+    $ pod2markdown < POD\_File > Markdown\_File
+-    \$ pod2markdown < POD_File > Markdown_File
++    \$ pod2markdown < POD\\_File > Markdown\\_File
  
  # DESCRIPTION
  
-@@ -50,6 +50,11 @@
+@@ -64,6 +64,11 @@
+ # Links
  
- - list
- - test
+ [Formatting `C`odes](${pod_prefix}Links#L<...>)
 +
 +# Special characters
 +
-+	foo\_bar is the result of 4 \* 4
++    foo\\_bar is the result of 4 \\* 4
 +
  EOMARKDOWN
  
  1 while chomp $markdown;
-@@ -112,3 +117,7 @@
- =item * test
+@@ -138,3 +143,7 @@
+ =head1 Links
  
- =back
+ L<<< FormattZ<>ing C<C>odes|Links/"LE<lt>...E<gt>" >>>
 +
 +=head1 Special characters
 +
-+	foo_bar is the result of 4 * 4
++    foo_bar is the result of 4 * 4

-- 
Debian packaging of libpod-markdown-perl



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