r23536 - in /trunk/libtext-markdown-perl: ./ debian/ debian/patches/ lib/Text/ script/ t/ t/MultiMarkdown.mdtest/ t/Text-Markdown.mdtest/ t/Text-MultiMarkdown.mdtest/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Thu Jul 24 19:34:27 UTC 2008
Author: ansgar-guest
Date: Thu Jul 24 19:34:24 2008
New Revision: 23536
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23536
Log:
* New upstream release.
+ Update pod_name patch accordingly
* Install Todo as documentation
* Refresh debian/rules for debhelper 7
* Add myself to Uploaders.
* debian/control: Use dist-based URL for Homepage field
* Update debian/copyright:
+ Adopt to current proposed format
+ Replace "Copyright" and "(C)" by "©"
+ Include full license text as the version in
/usr/share/common-licenses/BSD refers to the University as copyright
holder
+ Move pointer to GPL and Artistic license to the right section
Added:
trunk/libtext-markdown-perl/debian/clean
trunk/libtext-markdown-perl/debian/libtext-markdown-perl.docs
trunk/libtext-markdown-perl/debian/libtext-markdown-perl.manpages
trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Footnotes.text
- copied unchanged from r23534, branches/upstream/libtext-markdown-perl/current/t/MultiMarkdown.mdtest/Footnotes.text
trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Footnotes.xhtml
- copied unchanged from r23534, branches/upstream/libtext-markdown-perl/current/t/MultiMarkdown.mdtest/Footnotes.xhtml
trunk/libtext-markdown-perl/t/Text-Markdown.mdtest/CoreDumps5.8.text
- copied unchanged from r23534, branches/upstream/libtext-markdown-perl/current/t/Text-Markdown.mdtest/CoreDumps5.8.text
trunk/libtext-markdown-perl/t/Text-Markdown.mdtest/CoreDumps5.8.xhtml
- copied unchanged from r23534, branches/upstream/libtext-markdown-perl/current/t/Text-Markdown.mdtest/CoreDumps5.8.xhtml
trunk/libtext-markdown-perl/t/Text-MultiMarkdown.mdtest/Warnings-rt34856.text
- copied unchanged from r23534, branches/upstream/libtext-markdown-perl/current/t/Text-MultiMarkdown.mdtest/Warnings-rt34856.text
trunk/libtext-markdown-perl/t/Text-MultiMarkdown.mdtest/Warnings-rt34856.xhtml
- copied unchanged from r23534, branches/upstream/libtext-markdown-perl/current/t/Text-MultiMarkdown.mdtest/Warnings-rt34856.xhtml
trunk/libtext-markdown-perl/t/code-hr.t
- copied unchanged from r23534, branches/upstream/libtext-markdown-perl/current/t/code-hr.t
Modified:
trunk/libtext-markdown-perl/Changes
trunk/libtext-markdown-perl/MANIFEST
trunk/libtext-markdown-perl/Todo
trunk/libtext-markdown-perl/debian/changelog
trunk/libtext-markdown-perl/debian/compat
trunk/libtext-markdown-perl/debian/control
trunk/libtext-markdown-perl/debian/copyright
trunk/libtext-markdown-perl/debian/patches/pod_name
trunk/libtext-markdown-perl/debian/rules
trunk/libtext-markdown-perl/lib/Text/Markdown.pm
trunk/libtext-markdown-perl/lib/Text/MultiMarkdown.pm
trunk/libtext-markdown-perl/script/MultiMarkdown.pl
trunk/libtext-markdown-perl/t/03podspelling.t
trunk/libtext-markdown-perl/t/23afulldocs-multimarkdown.t
trunk/libtext-markdown-perl/t/32tabwidth.t
trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Backslash_escapes.xhtml
trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Inline_HTML_(Advanced).xhtml
trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Ordered_and_unordered_lists.xhtml
Modified: trunk/libtext-markdown-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/Changes?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/Changes (original)
+++ trunk/libtext-markdown-perl/Changes Thu Jul 24 19:34:24 2008
@@ -163,20 +163,30 @@
- Update README.txt
- Allow scripts to be used on multiple input files at once (processing
in command line order)
- - Update footnote behavior of Text::MutliMarkdown to be consistent
- with the latest version of MultiMarkdown
- - Added tests for the new footnote functionality.
- - Added tests for all the MDTest corner cases brought up on the list.
- Noted why / how I differ from original Markdown.
- - Moved all the document tests to MDTest format. I have made MDTest
- test suites for Text::Markdown and Text::MultiMarkdown, containing
- **only** the bug fixes and behavior changes I've made, I've imported
- the Markdown test suite from MDTest1.1, and the MultiMarkdown test
+ - Update footnote behavior of Text::MutliMarkdown to be consistent
+ with the latest version of MultiMarkdown
+ - Added tests for the new footnote functionality.
+ - Added tests for all the MDTest corner cases brought up on the list.
+ Noted why / how I differ from original Markdown.
+ - Moved all the document tests to MDTest format. I have made MDTest
+ test suites for Text::Markdown and Text::MultiMarkdown, containing
+ **only** the bug fixes and behavior changes I've made, I've imported
+ the Markdown test suite from MDTest1.1, and the MultiMarkdown test
suite.
- - RT#36537 doc patch to add POD to the scripts from Debian's Gunnar
- Wolf.
- - Mutilate the list processing somewhat to reduce the compilation
- of recursive regexes, and so stop perl (<5.10) crapping itself
- on lots of input. This isn't the full fix - really shouldn't be
- usng recursive regexes at all. RT#37297
+ - RT#36537 doc patch to add POD to the scripts from Debian's Gunnar
+ Wolf.
+ - Mutilate the list processing somewhat to reduce the compilation
+ of recursive regexes, and so stop perl (<5.10) crapping itself
+ on lots of input. This isn't the full fix - really shouldn't be
+ usng recursive regexes at all. RT#37297
+1.0.21 2008-07-24T08:33:00
+ - Fix hard tabs in Changelog
+ - Add unit test for core dumps issue from RT#36203
+ - Fix POD spelling.
+ - Fix warning from RT#34856.
+ - Add test for another tab width issue (related to <hr> generation)
+ from RT#37769. Fix this issue.
+ - More test additions and more splitting the test suites into MDTest
+ modules.
+
Modified: trunk/libtext-markdown-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/MANIFEST?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/MANIFEST (original)
+++ trunk/libtext-markdown-perl/MANIFEST Thu Jul 24 19:34:24 2008
@@ -1,3 +1,4 @@
+inc/Module/Install/Makefile.pm
Makefile.PL
Changes
inc/Module/Install.pm
@@ -8,7 +9,6 @@
inc/Module/Install/Scripts.pm
inc/Module/Install/Win32.pm
inc/Module/Install/WriteAll.pm
-inc/Module/Install/Makefile.pm
lib/Text/Markdown.pm
lib/Text/MultiMarkdown.pm
License.text
@@ -60,6 +60,7 @@
t/37anchormultilinebugs.t
t/38listshorizontalrule.t
t/39listsindentededgecase.t
+t/code-hr.t
t/docs-maruku-unittest/abbreviations.html
t/docs-maruku-unittest/abbreviations.text
t/docs-maruku-unittest/alt.html
@@ -373,6 +374,8 @@
t/Markdown-from-MDTest1.1.mdtest/Tidyness.xhtml
t/MultiMarkdown.mdtest/Backslash_escapes.text
t/MultiMarkdown.mdtest/Backslash_escapes.xhtml
+t/MultiMarkdown.mdtest/Footnotes.text
+t/MultiMarkdown.mdtest/Footnotes.xhtml
t/MultiMarkdown.mdtest/Inline_HTML_(Advanced).text
t/MultiMarkdown.mdtest/Inline_HTML_(Advanced).xhtml
t/MultiMarkdown.mdtest/Inline_HTML_(Simple).text
@@ -423,6 +426,8 @@
t/PHP_Markdown-from-MDTest1.1.mdtest/PHP-Specific_Bugs.xhtml
t/PHP_Markdown-from-MDTest1.1.mdtest/Tight_blocks.text
t/PHP_Markdown-from-MDTest1.1.mdtest/Tight_blocks.xhtml
+t/Text-Markdown.mdtest/CoreDumps5.8.text
+t/Text-Markdown.mdtest/CoreDumps5.8.xhtml
t/Text-Markdown.mdtest/Emphasis.text
t/Text-Markdown.mdtest/Emphasis.xhtml
t/Text-Markdown.mdtest/HTML-Comment-encoding.text
@@ -515,6 +520,8 @@
t/Text-MultiMarkdown.mdtest/Tables.xhtml
t/Text-MultiMarkdown.mdtest/Tabs.text
t/Text-MultiMarkdown.mdtest/Tabs.xhtml
+t/Text-MultiMarkdown.mdtest/Warnings-rt34856.text
+t/Text-MultiMarkdown.mdtest/Warnings-rt34856.xhtml
t/Text-MultiMarkdown.mdtest/Wiki_Features.text
t/Text-MultiMarkdown.mdtest/Wiki_Features.xhtml
Todo
Modified: trunk/libtext-markdown-perl/Todo
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/Todo?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/Todo (original)
+++ trunk/libtext-markdown-perl/Todo Thu Jul 24 19:34:24 2008
@@ -1,4 +1,4 @@
-Todo pre 1.0.21:
+Todo pre 1.0.22:
. Tests for $footnote =~ s/^glossary:\s*//i
. Tests for $footnote_closing_tag
. Add an option to Text::Markdown to have original brand markdown style
@@ -9,7 +9,7 @@
host?
. Re-write this Todo list.
-Todo pre 1.0.22:
+Todo pre 1.0.23:
. Make Markdown.pl and MultiMarkdown.pl warn if unexpected options are
used, and also have docs on what options are available. Expose the other
module options in the scripts.
@@ -19,7 +19,7 @@
. Document the markdown (and multimarkdown) syntaxes in the module
properly.
-Todo pre 1.0.23:
+Todo pre 1.0.24:
. Fix the list bug (see t/17ulolreportedonlist.t and Markdown mailing
list) This probably involves the first draught of the new parser...
. Text::Balanced is the slowest thing ever.
@@ -27,7 +27,7 @@
49.4 0.569 0.568 113 0.0050 0.0050 Text::Balanced::_match_tagged
18.1 0.209 0.791 3 0.0696 0.2637 Text::MultiMarkdown::_HashHTMLBlocks
-Todo pre 1.0.24:
+Todo pre 1.0.25:
. Have a look at extra features in
http://code.google.com/p/python-markdown2/wiki/Extras and put anything
we consider useful on the roadmap.
Modified: trunk/libtext-markdown-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/changelog?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/changelog (original)
+++ trunk/libtext-markdown-perl/debian/changelog Thu Jul 24 19:34:24 2008
@@ -1,3 +1,21 @@
+libtext-markdown-perl (1.0.21-1) unstable; urgency=low
+
+ * New upstream release.
+ + Update pod_name patch accordingly
+ * Install Todo as documentation
+ * Refresh debian/rules for debhelper 7
+ * Add myself to Uploaders.
+ * debian/control: Use dist-based URL for Homepage field
+ * Update debian/copyright:
+ + Adopt to current proposed format
+ + Replace "Copyright" and "(C)" by "©"
+ + Include full license text as the version in
+ /usr/share/common-licenses/BSD refers to the University as copyright
+ holder
+ + Move pointer to GPL and Artistic license to the right section
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Thu, 24 Jul 2008 21:06:58 +0200
+
libtext-markdown-perl (1.0.20-1) unstable; urgency=low
* New upstream release.
Added: trunk/libtext-markdown-perl/debian/clean
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/clean?rev=23536&op=file
==============================================================================
--- trunk/libtext-markdown-perl/debian/clean (added)
+++ trunk/libtext-markdown-perl/debian/clean Thu Jul 24 19:34:24 2008
@@ -1,0 +1,3 @@
+debian/markdown.1
+debian/multimarkdown.1
+
Modified: trunk/libtext-markdown-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/compat?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/compat (original)
+++ trunk/libtext-markdown-perl/debian/compat Thu Jul 24 19:34:24 2008
@@ -1,1 +1,1 @@
-5
+7
Modified: trunk/libtext-markdown-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/control?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/control (original)
+++ trunk/libtext-markdown-perl/debian/control Thu Jul 24 19:34:24 2008
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Adeodato Simó <dato at net.com.org.es>, Gunnar Wolf <gwolf at debian.org>,
- gregor herrmann <gregoa at debian.org>
-Build-Depends: debhelper (>= 5), quilt
+ gregor herrmann <gregoa at debian.org>, Ansgar Burchardt <ansgar at 43-1.org>
+Build-Depends: debhelper (>= 7), quilt
Build-Depends-Indep: perl (>= 5.8),
libtest-exception-perl, liblist-moreutils-perl, libfile-slurp-perl,
libtext-diff-perl, libtest-pod-perl, libtest-pod-coverage-perl
Standards-Version: 3.8.0
-Homepage: http://search.cpan.org/~bobtfish/Text-Markdown
+Homepage: http://search.cpan.org/dist/Text-Markdown/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtext-markdown-perl
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl
Modified: trunk/libtext-markdown-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/copyright?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/copyright (original)
+++ trunk/libtext-markdown-perl/debian/copyright Thu Jul 24 19:34:24 2008
@@ -1,35 +1,57 @@
-X-Copyright-Format: 0 (http://wiki.debian.org/Proposals/CopyrightFormat)
-X-Debianized-By: Adeodato Simó <dato at net.com.org.es>
-X-Source-Download: http://search.cpan.org/~bobtfish/Text-Markdown/lib/Text/Markdown.pm
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=216
+Upstream-Name: Text-Markdown
+Upstream-Source: http://search.cpan.org/dist/Text-Markdown/
Files: *
-Copyright:
- (c) 2003-2004 John Gruber <http://daringfireball.net/>
- (c) 2005-2006 Fletcher T. Penney <http://fletcher.freeshell.org/>
- (c) 2006-2008 Darren Kulp <http://kulp.ch>
- (c) 2006-2008 Tomas Doran <http://www.bobtfish.net>
+Copyright:
+ © 2003-2004 John Gruber <http://daringfireball.net/>
+ © 2005-2006 Fletcher T. Penney <http://fletcher.freeshell.org/>
+ © 2006-2008 Darren Kulp <http://kulp.ch>
+ © 2006-2008 Tomas Doran <http://www.bobtfish.net>
License: BSD
Files: inc/*
-Copyright: Copyright 2002 - 2008 by Brian Ingerson, Audrey Tang and Adam Kennedy.
+Copyright: © 2002 - 2008 by Brian Ingerson, Audrey Tang and Adam Kennedy
License: GPL-1+ | Artistic
This program is free software; you can redistribute it and/or modify it under
the same terms as Perl itself.
.
Perl is distributed under your choice of the GNU General Public License or
the Artistic License.
+ .
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in /usr/share/common-licenses/GPL and the Artistic license in
+ /usr/share/common-licenses/Artistic.
Files: debian/*
-Copyright: (c) 2008 Adeodato Simó <dato at net.com.org.es>
+Copyright: © 2008 Adeodato Simó <dato at net.com.org.es>
License: BSD
-X-References: On Debian systems, the full text of the BSD license can be
- found in the following file:
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
.
- * /usr/share/common-licenses/BSD
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
.
- On Debian GNU/Linux systems, the complete text of the GNU General Public
- License and the Artistic Licence can be found in:
+ * 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.
.
- * /usr/share/common-licenses/GPL
- * /usr/share/common-licenses/Artistic
+ * 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.
+
Added: trunk/libtext-markdown-perl/debian/libtext-markdown-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/libtext-markdown-perl.docs?rev=23536&op=file
==============================================================================
--- trunk/libtext-markdown-perl/debian/libtext-markdown-perl.docs (added)
+++ trunk/libtext-markdown-perl/debian/libtext-markdown-perl.docs Thu Jul 24 19:34:24 2008
@@ -1,0 +1,1 @@
+Todo
Added: trunk/libtext-markdown-perl/debian/libtext-markdown-perl.manpages
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/libtext-markdown-perl.manpages?rev=23536&op=file
==============================================================================
--- trunk/libtext-markdown-perl/debian/libtext-markdown-perl.manpages (added)
+++ trunk/libtext-markdown-perl/debian/libtext-markdown-perl.manpages Thu Jul 24 19:34:24 2008
@@ -1,0 +1,3 @@
+debian/markdown.1
+debian/multimarkdown.1
+
Modified: trunk/libtext-markdown-perl/debian/patches/pod_name
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/patches/pod_name?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/patches/pod_name (original)
+++ trunk/libtext-markdown-perl/debian/patches/pod_name Thu Jul 24 19:34:24 2008
@@ -1,5 +1,7 @@
---- a/script/Markdown.pl
-+++ b/script/Markdown.pl
+Index: libtext-markdown-perl/script/Markdown.pl
+===================================================================
+--- libtext-markdown-perl.orig/script/Markdown.pl
++++ libtext-markdown-perl/script/Markdown.pl
@@ -5,7 +5,7 @@
=head1 NAME
@@ -18,13 +20,15 @@
<p>This is a <em>test</em>.</p>
<p>Absolutely <em>nothing</em> to see here. <em>Just a <strong>test</strong></em>!</p>
---- a/script/MultiMarkdown.pl
-+++ b/script/MultiMarkdown.pl
+Index: libtext-markdown-perl/script/MultiMarkdown.pl
+===================================================================
+--- libtext-markdown-perl.orig/script/MultiMarkdown.pl
++++ libtext-markdown-perl/script/MultiMarkdown.pl
@@ -5,14 +5,14 @@
=head1 NAME
--MultimMarkdown.pl - Convert MultiMarkdown syntax to (X)HTML
+-MultiMarkdown.pl - Convert MultiMarkdown syntax to (X)HTML
+multimarkdown - Convert MultiMarkdown syntax to (X)HTML
=head1 DESCRIPTION
Modified: trunk/libtext-markdown-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/rules?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/rules (original)
+++ trunk/libtext-markdown-perl/debian/rules Thu Jul 24 19:34:24 2008
@@ -1,72 +1,35 @@
#!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
include /usr/share/quilt/quilt.make
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
-
-PERL ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP = $(CURDIR)/debian/$(PACKAGE)
+TMP=$(CURDIR)/debian/libtext-markdown-perl
build: build-stamp
build-stamp: $(QUILT_STAMPFN)
- dh_testdir
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE)
- TEST_POD=1 $(MAKE) test
+ TEST_POD=1 dh build
+
+ pod2man script/Markdown.pl debian/markdown.1
+ pod2man script/MultiMarkdown.pl debian/multimarkdown.1
+
touch $@
clean: unpatch
- dh_testdir
- dh_testroot
- dh_clean build-stamp install-stamp
- [ ! -f Makefile ] || $(MAKE) realclean
+ dh $@
install: install-stamp
install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ dh install
- # The included scripts are moved to use a naming consistent to the
- # Debian policy; the POD is manually converted to corresponding man
- # pages
install -D -m 755 script/Markdown.pl $(TMP)/usr/bin/markdown
- install -D -m 755 script/MultiMarkdown.pl $(TMP)/usr/bin/multimarkdown
- install -d $(TMP)/usr/share/man/man1/
- pod2man $(TMP)/usr/bin/markdown $(TMP)/usr/share/man/man1/markdown.1
- pod2man $(TMP)/usr/bin/multimarkdown $(TMP)/usr/share/man/man1/multimarkdown.1
+ install -m 755 script/MultiMarkdown.pl $(TMP)/usr/bin/multimarkdown
- [ ! -d $(TMP)/usr/lib/perl5 ] || \
- rmdir --ignore-fail-on-non-empty --parents --verbose \
- $(TMP)/usr/lib/perl5
touch $@
binary-arch:
-# We have nothing to do here for an architecture-independent package
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs Changes
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary-indep: install
+ dh $@
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build
Modified: trunk/libtext-markdown-perl/lib/Text/Markdown.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/lib/Text/Markdown.pm?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/lib/Text/Markdown.pm (original)
+++ trunk/libtext-markdown-perl/lib/Text/Markdown.pm Thu Jul 24 19:34:24 2008
@@ -8,7 +8,7 @@
use Carp qw(croak);
use base 'Exporter';
-our $VERSION = '1.0.20';
+our $VERSION = '1.0.21';
our @EXPORT_OK = qw(markdown);
=head1 NAME
@@ -475,9 +475,10 @@
$text = $self->_HashHTMLBlocks($text) unless $self->{markdown_in_html_blocks};
# Do Horizontal Rules:
- $text =~ s{^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$}{\n<hr$self->{empty_element_suffix}\n}gmx;
- $text =~ s{^[ ]{0,2}([ ]? -[ ]?){3,}[ \t]*$}{\n<hr$self->{empty_element_suffix}\n}gmx;
- $text =~ s{^[ ]{0,2}([ ]? _[ ]?){3,}[ \t]*$}{\n<hr$self->{empty_element_suffix}\n}gmx;
+ my $less_than_tab = $self->{tab_width} - 1;
+ $text =~ s{^[ ]{0,$less_than_tab}(\*[ ]?){3,}[ \t]*$}{\n<hr$self->{empty_element_suffix}\n}gmx;
+ $text =~ s{^[ ]{0,$less_than_tab}(-[ ]?){3,}[ \t]*$}{\n<hr$self->{empty_element_suffix}\n}gmx;
+ $text =~ s{^[ ]{0,$less_than_tab}(_[ ]?){3,}[ \t]*$}{\n<hr$self->{empty_element_suffix}\n}gmx;
$text = $self->_DoLists($text);
Modified: trunk/libtext-markdown-perl/lib/Text/MultiMarkdown.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/lib/Text/MultiMarkdown.pm?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/lib/Text/MultiMarkdown.pm (original)
+++ trunk/libtext-markdown-perl/lib/Text/MultiMarkdown.pm Thu Jul 24 19:34:24 2008
@@ -8,7 +8,7 @@
use Carp qw(croak);
use base qw(Text::Markdown);
-our $VERSION = '1.0.20';
+our $VERSION = '1.0.21';
our @EXPORT_OK = qw(markdown);
=head1 NAME
@@ -631,7 +631,7 @@
sub _StripFootnoteDefinitions {
my ($self, $text) = @_;
my $less_than_tab = $self->{tab_width} - 1;
-
+
while ($text =~ s{
\n\[\^([^\n]+?)\]\:[ \t]*# id = $1
\n?
@@ -1054,6 +1054,7 @@
my $count=0;
while ($line =~ /\|?\s*([^\|]+?)\s*(\|+|\Z)/gs) {
# process contents of each cell
+ no warnings 'uninitialized';
my $cell = $self->_RunSpanGamut($1);
my $ending = $2;
my $colspan = "";
Modified: trunk/libtext-markdown-perl/script/MultiMarkdown.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/script/MultiMarkdown.pl?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/script/MultiMarkdown.pl (original)
+++ trunk/libtext-markdown-perl/script/MultiMarkdown.pl Thu Jul 24 19:34:24 2008
@@ -5,7 +5,7 @@
=head1 NAME
-MultimMarkdown.pl - Convert MultiMarkdown syntax to (X)HTML
+MultiMarkdown.pl - Convert MultiMarkdown syntax to (X)HTML
=head1 DESCRIPTION
Modified: trunk/libtext-markdown-perl/t/03podspelling.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/t/03podspelling.t?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/t/03podspelling.t (original)
+++ trunk/libtext-markdown-perl/t/03podspelling.t Thu Jul 24 19:34:24 2008
@@ -42,3 +42,8 @@
MDTest
preprocess
urls
+STDIN
+STDOUT
+XHTML
+html
+shortversion
Modified: trunk/libtext-markdown-perl/t/23afulldocs-multimarkdown.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/t/23afulldocs-multimarkdown.t?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/t/23afulldocs-multimarkdown.t (original)
+++ trunk/libtext-markdown-perl/t/23afulldocs-multimarkdown.t Thu Jul 24 19:34:24 2008
@@ -11,8 +11,8 @@
plan tests => scalar(@files) + 1;
-use_ok('Text::Markdown');
+use_ok('Text::MultiMarkdown');
-my $m = Text::Markdown->new();
+my $m = Text::MultiMarkdown->new();
run_tests($m, $docsdir, @files);
Modified: trunk/libtext-markdown-perl/t/32tabwidth.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/t/32tabwidth.t?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/t/32tabwidth.t (original)
+++ trunk/libtext-markdown-perl/t/32tabwidth.t Thu Jul 24 19:34:24 2008
@@ -1,6 +1,6 @@
use strict;
use warnings;
-use Test::More tests => 3;
+use Test::More tests => 4;
use_ok( 'Text::Markdown' );
@@ -22,4 +22,16 @@
is($m->markdown($instr) => $expstr, 'Correct (constructor)');
is(Text::Markdown->new->markdown($instr, { tab_width => 2}) => $expstr, 'Correct (markdown method option)');
+
+my $txt = $m->markdown(<<'END_MARKDOWN');
+This is a para.
+
+ This is code.
+ ---
+ This is code.
+
+This is a para.
+END_MARKDOWN
+
+unlike($txt, qr{<hr}, "no HR elements when the hr is in a code block");
Modified: trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Backslash_escapes.xhtml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Backslash_escapes.xhtml?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Backslash_escapes.xhtml (original)
+++ trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Backslash_escapes.xhtml Thu Jul 24 19:34:24 2008
@@ -1,4 +1,4 @@
-<p>These should all get escaped:</p>
+These should all get escaped:<br />
<p>Backslash: \</p>
Modified: trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Inline_HTML_(Advanced).xhtml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Inline_HTML_%28Advanced%29.xhtml?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Inline_HTML_(Advanced).xhtml (original)
+++ trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Inline_HTML_(Advanced).xhtml Thu Jul 24 19:34:24 2008
@@ -1,4 +1,4 @@
-<p>Simple block on one line:</p>
+Simple block on one line:<br />
<div>foo</div>
Modified: trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Ordered_and_unordered_lists.xhtml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Ordered_and_unordered_lists.xhtml?rev=23536&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Ordered_and_unordered_lists.xhtml (original)
+++ trunk/libtext-markdown-perl/t/MultiMarkdown.mdtest/Ordered_and_unordered_lists.xhtml Thu Jul 24 19:34:24 2008
@@ -1,4 +1,4 @@
-<h2>Unordered</h2>
+<h2 id="unordered">Unordered</h2>
<p>Asterisks tight:</p>
@@ -52,7 +52,7 @@
<li><p>Minus 3</p></li>
</ul>
-<h2>Ordered</h2>
+<h2 id="ordered">Ordered</h2>
<p>Tight:</p>
@@ -97,16 +97,12 @@
<li><p>Item 3.</p></li>
</ol>
-<h2>Nested</h2>
+<h2 id="nested">Nested</h2>
<ul>
<li>Tab
-<ul>
-<li>Tab
-<ul>
-<li>Tab</li>
-</ul></li>
-</ul></li>
+<ul><li>Tab
+<ul><li>Tab</li></ul></li></ul></li>
</ul>
<p>Here's another:</p>
@@ -114,11 +110,9 @@
<ol>
<li>First</li>
<li>Second:
-<ul>
-<li>Fee</li>
+<ul><li>Fee</li>
<li>Fie</li>
-<li>Foe</li>
-</ul></li>
+<li>Foe</li></ul></li>
<li>Third</li>
</ol>
@@ -128,10 +122,8 @@
<li><p>First</p></li>
<li><p>Second:</p>
-<ul>
-<li>Fee</li>
+<ul><li>Fee</li>
<li>Fie</li>
-<li>Foe</li>
-</ul></li>
+<li>Foe</li></ul></li>
<li><p>Third</p></li>
</ol>
More information about the Pkg-perl-cvs-commits
mailing list