r44907 - in /trunk/libhtml-wikiconverter-markdown-perl/debian: ./ patches/
ghostbar at users.alioth.debian.org
ghostbar at users.alioth.debian.org
Sun Sep 27 08:13:53 UTC 2009
Author: ghostbar
Date: Sun Sep 27 08:12:52 2009
New Revision: 44907
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44907
Log:
* Updated patch 1001 and created 1001-and-1012-2.
* Updated patch 1003 and created 1003-2.
* Removed patch 1011.
* Updated patch 1012.
* Updated version of libhtml-wikiconverter-perl to >= 0.67.
Added:
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-and-1012-2-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-2-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1011-2-Handle-tt-the-same-as-code.patch
Removed:
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1011-Handle-tt-the-same-as-code.patch
Modified:
trunk/libhtml-wikiconverter-markdown-perl/debian/changelog
trunk/libhtml-wikiconverter-markdown-perl/debian/control
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-Add-support-for-ikiwiki-links-if-wiki-uri-is-specified.patch
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1015_Adjust_tests_for_changed_block_handling_in_patches_1006-1007.patch
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/changelog?rev=44907&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/changelog (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/changelog Sun Sep 27 08:12:52 2009
@@ -40,7 +40,12 @@
permitted by Debian Policy 3.8.3).
[ Jose Luis Rivas ]
- * New upstream release
+ * New upstream release 0.05
+ * Updated patch 1001 and added 1001-and-1012-2 to accomplish with new sources.
+ * Updated patch 1003 and added 1003-2 to accomplish with new sources.
+ * Removed patch 1011 and added 1011-2 to accomplish with new sources.
+ * Updated patch 1012 to accomplish with new sources.
+ * Updated version of libhtml-wikiconverter-perl to >= 0.67.
-- Jose Luis Rivas <ghostbar at debian.org> Sat, 26 Sep 2009 22:12:57 -0430
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/control?rev=44907&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/control (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/control Sun Sep 27 08:12:52 2009
@@ -1,7 +1,7 @@
Source: libhtml-wikiconverter-markdown-perl
Section: perl
Priority: optional
-Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5.0.44), perl, libhtml-wikiconverter-perl (>= 0.63), libhtml-tagset-perl, libparams-validate-perl, liburi-perl, libtest-simple-perl, libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5.0.44), perl, libhtml-wikiconverter-perl (>= 0.67), libhtml-tagset-perl, libparams-validate-perl, liburi-perl, libtest-simple-perl, libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <dr at jones.dk>
Standards-Version: 3.7.3
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-Add-support-for-ikiwiki-links-if-wiki-uri-is-specified.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-Add-support-for-ikiwiki-links-if-wiki-uri-is-specified.patch?rev=44907&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-Add-support-for-ikiwiki-links-if-wiki-uri-is-specified.patch (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-Add-support-for-ikiwiki-links-if-wiki-uri-is-specified.patch Sun Sep 27 08:12:52 2009
@@ -3,6 +3,7 @@
Date: Fri, 8 Dec 2006 22:49:22 -0800
Subject: [PATCH] Add support for ikiwiki links if --wiki-uri is specified.
+Modified by Jose Luis Rivas, please see 1001-2
---
WikiConverter/Markdown.pm | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
@@ -27,11 +28,3 @@
my $title = $node->attr('title') || '';
my $style = $self->link_style;
-@@ -281,6 +289,7 @@ sub _escape_text {
- $text =~ s/^\#/\\#/;
- $text =~ s/\!\[/\\![/g;
- $text =~ s/\]\[/]\\[/g;
-+ $text =~ s/\[\[/\\[[/g;
- $node->attr( text => $text );
- }
-
Added: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-and-1012-2-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-and-1012-2-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch?rev=44907&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-and-1012-2-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch (added)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1001-and-1012-2-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch Sun Sep 27 08:12:52 2009
@@ -1,0 +1,22 @@
+Update from 1001, since original 1001 it's not compatible with 0.05 sources.
+Update from 1012, since original 1012 was not fully compatible with 0.05 sources.
+
+Jose Luis Rivas <ghostbar at debian.org> Sun, 27 Sep 2009 02:52:13 -0430
+---
+--- svn/lib/HTML/WikiConverter/Markdown.pm.orig 2009-09-27 02:46:33.000000000 -0430
++++ svn/lib/HTML/WikiConverter/Markdown.pm 2009-09-27 02:48:09.000000000 -0430
+@@ -355,12 +355,13 @@ sub _escape_text {
+ $text =~ s/([\Q$escapes\E])/$backslash_escapes{$1}->[0]/g;
+ $text =~ s/^([\d]+)\./$1\\./;
+ $text =~ s/^\#/\\#/;
+ $text =~ s/\!\[/\\![/g;
+ $text =~ s/\]\[/]\\[/g;
++ $text =~ s/\[\[/\\[[/g;
+
+- $node->attr( text => $text );
++ return $text;
+ }
+ }
+
+ # bug #43998
+ sub _code_delim {
Added: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-2-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-2-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch?rev=44907&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-2-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch (added)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-2-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch Sun Sep 27 08:12:52 2009
@@ -1,0 +1,17 @@
+Updated from 1003, since original 1003 it's not compatible with 0.05 sources.
+
+Jose Luis Rivas <ghostbar at debian.org> Sun, 27 Sep 2009 01:19:16 -0430
+---
+--- svn/lib/HTML/WikiConverter/Markdown.pm.orig 2009-09-27 01:02:23.000000000 -0430
++++ svn/lib/HTML/WikiConverter/Markdown.pm 2009-09-27 01:04:18.000000000 -0430
+@@ -121,8 +121,9 @@ sub rules {
+ em => { alias => 'i' },
+ b => { start => '**', end => '**' },
+ strong => { alias => 'b' },
+- code => { start => \&_code_delim, end => \&_code_delim },
++ code => { replace => \&_code },
+ code_block => { line_prefix => $code_block_prefix, block => 1 },
++ pre => { replace => \&_pre },
+
+ a => { replace => \&_link },
+ img => { replace => \&_img },
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch?rev=44907&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1003-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch Sun Sep 27 08:12:52 2009
@@ -3,23 +3,13 @@
Date: Fri, 8 Dec 2006 22:56:56 -0800
Subject: [PATCH] Use indentation for <pre> blocks; handle <code> blocks with ` in them.
+Modified by Jose Luis Rivas, please see 1003-2
---
WikiConverter/Markdown.pm | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
--- a/lib/HTML/WikiConverter/Markdown.pm
+++ b/lib/HTML/WikiConverter/Markdown.pm
-@@ -114,8 +114,9 @@ sub rules {
- em => { alias => 'i' },
- b => { start => '**', end => '**' },
- strong => { alias => 'b' },
-- code => { start => '`', end => '`' },
-
-+ code => { replace => \&_code },
-+ pre => { replace => \&_pre },
- a => { replace => \&_link },
- img => { replace => \&_img },
- );
@@ -153,6 +154,24 @@ sub _header_end {
return "\n$bar\n";
}
Added: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1011-2-Handle-tt-the-same-as-code.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1011-2-Handle-tt-the-same-as-code.patch?rev=44907&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1011-2-Handle-tt-the-same-as-code.patch (added)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1011-2-Handle-tt-the-same-as-code.patch Sun Sep 27 08:12:52 2009
@@ -1,0 +1,21 @@
+Taken from original 1011, adapted to new sources since 0.05.
+Original is at:
+
+From 9dd933238f25cab8eb04b2150bdfc8a5748cd158 Mon Sep 17 00:00:00 2001
+From: Jamey Sharp <jamey at minilop.net>
+Date: Sun, 10 Dec 2006 23:30:52 -0800
+Subject: [PATCH] Handle <tt> the same as <code>.
+
+Jose Luis Rivas <ghostbar at debian.org> Sun, 27 Sep 2009 01:47:02 -0430
+---
+--- svn/lib/HTML/WikiConverter/Markdown.pm.orig 2009-09-27 01:39:34.000000000 -0430
++++ svn/lib/HTML/WikiConverter/Markdown.pm 2009-09-27 01:40:07.000000000 -0430
+@@ -116,7 +116,7 @@ sub rules {
+ ul => { block => 1, line_format => 'multi' },
+ ol => { alias => 'ul' },
+ li => { start => \&_li_start, trim => 'leading' },
+-
++ tt => { alias => 'code' },
+ i => { start => '_', end => '_' },
+ em => { alias => 'i' },
+ b => { start => '**', end => '**' },
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch?rev=44907&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch Sun Sep 27 08:12:52 2009
@@ -41,21 +41,3 @@
$text =~ s/^/ /mg;
return $text;
}
-@@ -321,8 +327,6 @@ sub preprocess_node {
-
- if( $node->parent->tag eq 'blockquote' and $self->_is_phrase_tag($node->tag) ) {
- $self->_envelop_elem( $node, HTML::Element->new('p') );
-- } elsif( $node->tag eq '~text' ) {
-- $self->_escape_text($node);
- }
- }
-
-@@ -344,7 +348,7 @@ sub _escape_text {
- $text =~ s/\!\[/\\![/g;
- $text =~ s/\]\[/]\\[/g;
- $text =~ s/\[\[/\\[[/g;
-- $node->attr( text => $text );
-+ return $text;
- }
-
- sub postprocess_output {
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1015_Adjust_tests_for_changed_block_handling_in_patches_1006-1007.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1015_Adjust_tests_for_changed_block_handling_in_patches_1006-1007.patch?rev=44907&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1015_Adjust_tests_for_changed_block_handling_in_patches_1006-1007.patch (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/1015_Adjust_tests_for_changed_block_handling_in_patches_1006-1007.patch Sun Sep 27 08:12:52 2009
@@ -1,5 +1,5 @@
---- a/t/markdown.t
-+++ b/t/markdown.t
+--- a/t/01-markdown.t
++++ b/t/01-markdown.t
@@ -290,19 +290,19 @@ __H__
</table>
__W__
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series?rev=44907&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series Sun Sep 27 08:12:52 2009
@@ -1,6 +1,8 @@
1001-Add-support-for-ikiwiki-links-if-wiki-uri-is-specified.patch
+1001-and-1012-2-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
1002-Use-syntax-for-mailto-URLs-with-the-email-as-link-text.patch
1003-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
+1003-2-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
1004-Preserve-all-unsupported-inline-elements.patch
1005-A-markdown-pre-block-will-escape-markdown-or-markup-so-output-pre-s-with-child-elements-as-HTML.patch
1006-Output-all-unknown-block-level-elements-and-their-descendants-unchanged.patch
@@ -8,7 +10,7 @@
1008-Use-HTML-for-a-with-name-attr-or-child-elements-preserve-markdown-inside-a.patch
1009-Avoid-using-an-uninitialized-value-if-code-has-no-backquotes-inside.patch
1010-Strip-formatting-inside-wiki-links.-Markdown-links-can-have-formatting-so-stop-using-a-for-that.patch
-1011-Handle-tt-the-same-as-code.patch
+1011-2-Handle-tt-the-same-as-code.patch
1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
1013-Allow-passing-through-raw-markdown-syntax-wrapped-in-markdown-tags.patch
1014-Some-entity-handling-and-refactoring.patch
More information about the Pkg-perl-cvs-commits
mailing list