r46402 - in /trunk/libtext-markdown-perl: ./ debian/ inc/Module/Install/ lib/Text/ t/ t/Text-Markdown.mdtest/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Mon Oct 26 03:58:28 UTC 2009


Author: jawnsy-guest
Date: Mon Oct 26 03:58:21 2009
New Revision: 46402

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46402
Log:
Only changes version numbering scheme. It's strange that there
are now two tarballs bundled in the new upstream release.
IGNORE-VERSION: 1.000027-1
* New upstream release

Added:
    trunk/libtext-markdown-perl/Text-Markdown-1.0.25.tar.gz
      - copied unchanged from r46401, branches/upstream/libtext-markdown-perl/current/Text-Markdown-1.0.25.tar.gz
    trunk/libtext-markdown-perl/Text-Markdown-1.0.26.tar.gz
      - copied unchanged from r46401, branches/upstream/libtext-markdown-perl/current/Text-Markdown-1.0.26.tar.gz
    trunk/libtext-markdown-perl/inc/Module/Install/CheckConflicts.pm
      - copied unchanged from r46401, branches/upstream/libtext-markdown-perl/current/inc/Module/Install/CheckConflicts.pm
    trunk/libtext-markdown-perl/t/04ensure_1_newline_before_EOF.t
      - copied unchanged from r46401, branches/upstream/libtext-markdown-perl/current/t/04ensure_1_newline_before_EOF.t
    trunk/libtext-markdown-perl/t/05markdown_in_divs.t
      - copied unchanged from r46401, branches/upstream/libtext-markdown-perl/current/t/05markdown_in_divs.t
    trunk/libtext-markdown-perl/t/Text-Markdown.mdtest/HTML5-attributes.html
      - copied unchanged from r46401, branches/upstream/libtext-markdown-perl/current/t/Text-Markdown.mdtest/HTML5-attributes.html
    trunk/libtext-markdown-perl/t/Text-Markdown.mdtest/HTML5-attributes.text
      - copied unchanged from r46401, branches/upstream/libtext-markdown-perl/current/t/Text-Markdown.mdtest/HTML5-attributes.text
    trunk/libtext-markdown-perl/t/rt48943.t
      - copied unchanged from r46401, branches/upstream/libtext-markdown-perl/current/t/rt48943.t
Modified:
    trunk/libtext-markdown-perl/Changes
    trunk/libtext-markdown-perl/MANIFEST
    trunk/libtext-markdown-perl/META.yml
    trunk/libtext-markdown-perl/Makefile.PL
    trunk/libtext-markdown-perl/README
    trunk/libtext-markdown-perl/debian/changelog
    trunk/libtext-markdown-perl/lib/Text/Markdown.pm

Modified: trunk/libtext-markdown-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/Changes?rev=46402&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/Changes (original)
+++ trunk/libtext-markdown-perl/Changes Mon Oct 26 03:58:21 2009
@@ -1,4 +1,8 @@
 This file documents the revision history for Perl extension Text::Markdown.
+
+1.0.27 2009-10-25T19:13:47
+        - Change to perl style version numbers (from 3 part versions) to
+          avoid depndency confusion with Text::MultiMarkdown
 
 1.0.26 2009-10-04T00:37:00
         - Minor POD changes (typos, wrapping)

Modified: trunk/libtext-markdown-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/MANIFEST?rev=46402&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/MANIFEST (original)
+++ trunk/libtext-markdown-perl/MANIFEST Mon Oct 26 03:58:21 2009
@@ -2,6 +2,7 @@
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
+inc/Module/Install/CheckConflicts.pm
 inc/Module/Install/Fetch.pm
 inc/Module/Install/Makefile.pm
 inc/Module/Install/Metadata.pm
@@ -17,6 +18,8 @@
 script/Markdown.pl
 t/02pod.t
 t/03podcoverage.t
+t/04ensure_1_newline_before_EOF.t
+t/05markdown_in_divs.t
 t/19exporter-markdown.t
 t/21fulldocs-text-markdown.t
 t/23fulldocs-markdown.t
@@ -368,12 +371,15 @@
 t/PHP_Markdown-from-MDTest1.1.mdtest/Tight_blocks.text
 t/PHP_Markdown-from-MDTest1.1.mdtest/Tight_blocks.xhtml
 t/rt37909.t
+t/rt48943.t
 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
 t/Text-Markdown.mdtest/HTML-Comment-encoding.xhtml
+t/Text-Markdown.mdtest/HTML5-attributes.html
+t/Text-Markdown.mdtest/HTML5-attributes.text
 t/Text-Markdown.mdtest/Links_brackets.text
 t/Text-Markdown.mdtest/Links_brackets.xhtml
 t/Text-Markdown.mdtest/Links_multiline_bugs_1.html
@@ -388,4 +394,6 @@
 t/Text-Markdown.mdtest/PHP-ASP_tags.xhtml
 t/Text-Markdown.mdtest/Unicode.text
 t/Text-Markdown.mdtest/Unicode.xhtml
+Text-Markdown-1.0.25.tar.gz
+Text-Markdown-1.0.26.tar.gz
 Todo

Modified: trunk/libtext-markdown-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/META.yml?rev=46402&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/META.yml (original)
+++ trunk/libtext-markdown-perl/META.yml Mon Oct 26 03:58:21 2009
@@ -9,7 +9,6 @@
   List::MoreUtils: 0
   Test::Exception: 0
   Test::More: 0.42
-  script/Markdown.pl: 0
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
@@ -32,4 +31,4 @@
   bugtracker: http://github.com/bobtfish/text-markdown/issues
   license: http://opensource.org/licenses/bsd-license.php
   repository: http://github.com/bobtfish/text-markdown/
-version: 1.0.26
+version: 1.000027

Modified: trunk/libtext-markdown-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/Makefile.PL?rev=46402&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/Makefile.PL (original)
+++ trunk/libtext-markdown-perl/Makefile.PL Mon Oct 26 03:58:21 2009
@@ -21,6 +21,16 @@
 build_requires  'File::Slurp'     => '9999.08';
 build_requires  'FindBin'         => undef;
 
+if ($Module::Install::AUTHOR) {
+    system("pod2text lib/Text/Markdown.pm > README")
+        and die $!;
+    require Module::Install::CheckConflicts;
+}
+
+check_conflicts(
+    'Text::MultiMarkdown' => '1.0.27',
+);
+
 # Scripts I install
 prompt_script('script/Markdown.pl');
 

Modified: trunk/libtext-markdown-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/README?rev=46402&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/README (original)
+++ trunk/libtext-markdown-perl/README Mon Oct 26 03:58:21 2009
@@ -38,44 +38,62 @@
 
         http://daringfireball.net/projects/markdown/
 
-    Note that Text::Markdown ensures that the output always ends with
-    *one* newline. The fact that multiple newlines are collapsed into one
-    makes sense, because this is the behavior of HTML towards whispace. The
-    fact that there's always a newline at the end makes sense again, given
-    that the output will always be nested in a block-level element (as
-    opposed to an inline element). That block element can be a <p> (most
-    often), or a <table>.
-    
-    Markdown is *not* interpreted in HTML block-level elements, in order for
+    Note that Text::Markdown ensures that the output always ends with one
+    newline. The fact that multiple newlines are collapsed into one makes
+    sense, because this is the behavior of HTML towards whispace. The fact
+    that there's always a newline at the end makes sense again, given that
+    the output will always be nested in a block-level element (as opposed to
+    an inline element). That block element can be a "<p>" (most often), or a
+    "<table>".
+
+    Markdown is not interpreted in HTML block-level elements, in order for
     chunks of pasted HTML (e.g. JavaScript widgets, web counters) to not be
-    magically (mis)interpreted. For selective processing of Markdown in some,
-    but not other, HTML block elements, add a "markdown" attribute to the block
-    element and set its value to "1", "on" or "yes":
-    
+    magically (mis)interpreted. For selective processing of Markdown in
+    some, but not other, HTML block elements, add a "markdown" attribute to
+    the block element and set its value to 1, "on" or "yes":
+
         <div markdown="1" class="navbar">
         * Home
         * About
         * Contact
         <div>
-    
-    The extra "markdown" attribute will be stripped when generating the output.
-    
+
+    The extra "markdown" attribute will be stripped when generating the
+    output.
+
 OPTIONS
     Text::Markdown supports a number of options to its processor which
     control the behaviour of the output document.
 
-    These options can be supplied to the constructor, on in a hash with the
-    individual calls to the markdown method. See the synopsis for examples
-    of both of the above styles.
+    These options can be supplied to the constructor, or in a hash within
+    individual calls to the "markdown" method. See the SYNOPSIS for examples
+    of both styles.
 
     The options for the processor are:
 
-    empty element suffix
-        This option can be used to generate normal HTML output. By default,
-        it is ' />', which is xHTML, change to '>' for normal HTML.
+    empty_element_suffix
+        This option controls the end of empty element tags:
+
+            '/>' for XHTML (default)
+            '>' for HTML
 
     tab_width
-        Controls indent width in the generated markup, defaults to 4
+        Controls indent width in the generated markup. Defaults to 4.
+
+    trust_list_start_value
+        If true, ordered lists will use the first number as the starting
+        point for numbering. This will let you pick up where you left off by
+        writing:
+
+          1. foo
+          2. bar
+
+          some paragraph
+
+          3. baz
+          6. quux
+
+        (Note that in the above, quux will be numbered 4.)
 
 METHODS
   new
@@ -102,7 +120,7 @@
 
     C - <http://www.pell.portland.or.us/~orc/Code/discount>
         Discount - Original Markdown, but in C. Fastest implementation
-        available, and passes MDTest. Adds it's own set of custom features.
+        available, and passes MDTest. Adds its own set of custom features.
 
     python - <http://www.freewisdom.org/projects/python-markdown/>
         Python Markdown which is mostly compatible with the original, with
@@ -131,7 +149,7 @@
     To file bug reports or feature requests please send email to:
 
         bug-Text-Markdown at rt.cpan.org
-    
+
     Please include with your report: (1) the example input; (2) the output
     you expected; (3) the output Markdown actually produced.
 
@@ -141,18 +159,18 @@
 AUTHOR
         John Gruber
         http://daringfireball.net/
-    
+
         PHP port and other contributions by Michel Fortin
         http://michelf.com/
-    
+
         MultiMarkdown changes by Fletcher Penney
         http://fletcher.freeshell.org/
-    
+
         CPAN Module Text::MultiMarkdown (based on Text::Markdown by Sebastian
         Riedel) originally by Darren Kulp (http://kulp.ch/)
-        
+    
         Support for markdown="1" by Dan Dascalescu (http://dandascalescu.com)
-    
+
         This module is maintained by: Tomas Doran http://www.bobtfish.net/
 
 THIS DISTRIBUTION
@@ -170,6 +188,11 @@
     that which is documented at daringfireball. If you want additional
     features, you should look at Text::MultiMarkdown.
 
+SOURCE CODE
+    You can find the source code repository for Text::Markdown and
+    Text::MultiMarkdown on GitHub at
+    <http://github.com/bobtfish/text-markdown>.
+
 COPYRIGHT AND LICENSE
     Original Code Copyright (c) 2003-2004 John Gruber
     <http://daringfireball.net/> All rights reserved.
@@ -177,7 +200,7 @@
     MultiMarkdown changes Copyright (c) 2005-2006 Fletcher T. Penney
     <http://fletcher.freeshell.org/> All rights reserved.
 
-    Text::MultiMarkdown changes Copyright (c) 2006-2008 Darren Kulp
+    Text::MultiMarkdown changes Copyright (c) 2006-2009 Darren Kulp
     <http://kulp.ch> and Tomas Doran <http://www.bobtfish.net>
 
     Redistribution and use in source and binary forms, with or without

Modified: trunk/libtext-markdown-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/changelog?rev=46402&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/changelog (original)
+++ trunk/libtext-markdown-perl/debian/changelog Mon Oct 26 03:58:21 2009
@@ -1,3 +1,13 @@
+libtext-markdown-perl (1.000027-1) UNRELEASED; urgency=low
+
+  Only changes version numbering scheme. It's strange that there
+  are now two tarballs bundled in the new upstream release.
+  IGNORE-VERSION: 1.000027-1
+
+  * New upstream release
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Sun, 25 Oct 2009 20:25:26 -0400
+
 libtext-markdown-perl (1.0.26-1) unstable; urgency=low
 
   [ Jonathan Yu ]

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=46402&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/lib/Text/Markdown.pm (original)
+++ trunk/libtext-markdown-perl/lib/Text/Markdown.pm Mon Oct 26 03:58:21 2009
@@ -9,7 +9,8 @@
 use Carp        qw(croak);
 use base        'Exporter';
 
-our $VERSION   = '1.0.26';
+our $VERSION   = '1.000027'; # 1.0.27
+$VERSION = eval $VERSION;
 our @EXPORT_OK = qw(markdown);
 
 =head1 NAME




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