r26227 - in /branches/upstream/libtext-markdown-perl/current: Changes MANIFEST META.yml Makefile Makefile.PL README Todo lib/Text/Markdown.pm lib/Text/MultiMarkdown.pm t/20fulldocs-text-multimarkdown.t t/rt37909.t

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Sat Oct 25 16:02:53 UTC 2008


Author: ansgar-guest
Date: Sat Oct 25 16:02:50 2008
New Revision: 26227

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26227
Log:
[svn-upgrade] Integrating new upstream version, libtext-markdown-perl (1.0.22)

Added:
    branches/upstream/libtext-markdown-perl/current/Makefile
    branches/upstream/libtext-markdown-perl/current/t/rt37909.t
Modified:
    branches/upstream/libtext-markdown-perl/current/Changes
    branches/upstream/libtext-markdown-perl/current/MANIFEST
    branches/upstream/libtext-markdown-perl/current/META.yml
    branches/upstream/libtext-markdown-perl/current/Makefile.PL
    branches/upstream/libtext-markdown-perl/current/README
    branches/upstream/libtext-markdown-perl/current/Todo
    branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm
    branches/upstream/libtext-markdown-perl/current/lib/Text/MultiMarkdown.pm
    branches/upstream/libtext-markdown-perl/current/t/20fulldocs-text-multimarkdown.t

Modified: branches/upstream/libtext-markdown-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/Changes?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/Changes (original)
+++ branches/upstream/libtext-markdown-perl/current/Changes Sat Oct 25 16:02:50 2008
@@ -190,3 +190,9 @@
         - More test additions and more splitting the test suites into MDTest 
           modules.
 
+1.0.22 2008-10-23T18:24:44
+        - RT#37909 - Fix + in email addresses.
+        - RT#40303 - Fix use in Mason by adding "use re 'eval'" to both files.
+        - Add SVN repository to Makefile.PL
+        - Remove META.yml from source control so it is regenerated 
+          automatically.

Modified: branches/upstream/libtext-markdown-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/MANIFEST?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/MANIFEST (original)
+++ branches/upstream/libtext-markdown-perl/current/MANIFEST Sat Oct 25 16:02:50 2008
@@ -1,5 +1,3 @@
-inc/Module/Install/Makefile.pm
-Makefile.PL
 Changes
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
@@ -426,6 +424,7 @@
 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/rt37909.t
 t/Text-Markdown.mdtest/CoreDumps5.8.text
 t/Text-Markdown.mdtest/CoreDumps5.8.xhtml
 t/Text-Markdown.mdtest/Emphasis.text

Modified: branches/upstream/libtext-markdown-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/META.yml?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/META.yml (original)
+++ branches/upstream/libtext-markdown-perl/current/META.yml Sat Oct 25 16:02:50 2008
@@ -1,22 +1,29 @@
-abstract: Convert Markdown syntax to (X)HTML
-author: Tomas Doran <bobtfish at bobtfish.net>
-build_requires: 
+---
+abstract: 'Convert Markdown syntax to (X)HTML'
+author:
+  - 'Tomas Doran <bobtfish at bobtfish.net>'
+build_requires:
   File::Slurp: 0
   FindBin: 0
   List::MoreUtils: 0
   Test::Exception: 0
   Test::More: 0.42
 distribution_type: module
-generated_by: Module::Install version 0.64
+generated_by: 'Module::Install version 0.75'
 license: bsd
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.3.html
+  version: 1.3
 name: Text-Markdown
-no_index: 
-  directory: 
+no_index:
+  directory:
     - inc
     - t
-requires: 
+requires:
   Digest::MD5: 0
   Encode: 0
   Text::Balanced: 0
   perl: 5.8.0
-version: 1.0.20
+resources:
+  repository: http://svn.kulp.ch/cpan/text_multimarkdown
+version: 1.0.22

Added: branches/upstream/libtext-markdown-perl/current/Makefile
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/Makefile?rev=26227&op=file
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/Makefile (added)
+++ branches/upstream/libtext-markdown-perl/current/Makefile Sat Oct 25 16:02:50 2008
@@ -1,0 +1,826 @@
+# This Makefile is for the Text::Markdown extension to perl.
+#
+# It was generated automatically by MakeMaker version
+# 6.42 (Revision: 41145) from the contents of
+# Makefile.PL. Don't edit this file, edit Makefile.PL instead.
+#
+#       ANY CHANGES MADE HERE WILL BE LOST!
+#
+#   MakeMaker ARGV: ()
+#
+#   MakeMaker Parameters:
+
+#     ABSTRACT => q[Convert Markdown syntax to (X)HTML]
+#     AUTHOR => q[Tomas Doran <bobtfish at bobtfish.net>]
+#     DIR => []
+#     DISTNAME => q[Text-Markdown]
+#     NAME => q[Text::Markdown]
+#     NO_META => q[1]
+#     PL_FILES => {  }
+#     PREREQ_PM => { Test::Exception=>q[0], FindBin=>q[0], ExtUtils::MakeMaker=>q[6.42], Encode=>q[0], Test::More=>q[0.42], Text::Balanced=>q[0], Digest::MD5=>q[0], List::MoreUtils=>q[0], File::Slurp=>q[0] }
+#     VERSION => q[1.0.22]
+#     dist => { PREOP=>q[$(PERL) -I. "-MModule::Install::Admin" -e "dist_preop(q($(DISTVNAME)))"] }
+
+# --- MakeMaker post_initialize section:
+
+
+# --- MakeMaker const_config section:
+
+# These definitions are from config.sh (via /System/Library/Perl/5.8.6/darwin-thread-multi-2level/Config.pm)
+
+# They may have been overridden via Makefile.PL or on the command line
+AR = ar
+CC = cc
+CCCDLFLAGS =  
+CCDLFLAGS =  
+DLEXT = bundle
+DLSRC = dl_dlopen.xs
+EXE_EXT = 
+FULL_AR = /usr/bin/ar
+LD = env MACOSX_DEPLOYMENT_TARGET=10.3 cc
+LDDLFLAGS = -bundle -undefined dynamic_lookup -L/usr/local/lib
+LDFLAGS = -L/usr/local/lib
+LIBC = /usr/lib/libc.dylib
+LIB_EXT = .a
+OBJ_EXT = .o
+OSNAME = darwin
+OSVERS = 8.0
+RANLIB = /usr/bin/ar ts
+SITELIBEXP = /Library/Perl/5.8.6
+SITEARCHEXP = /Library/Perl/5.8.6/darwin-thread-multi-2level
+SO = dylib
+VENDORARCHEXP = /Network/Library/Perl/5.8.6/darwin-thread-multi-2level
+VENDORLIBEXP = /Network/Library/Perl/5.8.6
+
+
+# --- MakeMaker constants section:
+AR_STATIC_ARGS = cr
+DIRFILESEP = /
+DFSEP = $(DIRFILESEP)
+NAME = Text::Markdown
+NAME_SYM = Text_Markdown
+VERSION = 1.0.22
+VERSION_MACRO = VERSION
+VERSION_SYM = 1_0_22
+DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
+XS_VERSION = 1.0.22
+XS_VERSION_MACRO = XS_VERSION
+XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
+INST_ARCHLIB = blib/arch
+INST_SCRIPT = blib/script
+INST_BIN = blib/bin
+INST_LIB = blib/lib
+INST_MAN1DIR = blib/man1
+INST_MAN3DIR = blib/man3
+MAN1EXT = 1
+MAN3EXT = 3pm
+INSTALLDIRS = site
+DESTDIR = 
+PREFIX = $(SITEPREFIX)
+PERLPREFIX = /
+SITEPREFIX = /usr/local
+VENDORPREFIX = /usr/local
+INSTALLPRIVLIB = /System/Library/Perl/5.8.6
+DESTINSTALLPRIVLIB = $(DESTDIR)$(INSTALLPRIVLIB)
+INSTALLSITELIB = /Library/Perl/5.8.6
+DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB)
+INSTALLVENDORLIB = /Network/Library/Perl/5.8.6
+DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB)
+INSTALLARCHLIB = /System/Library/Perl/5.8.6/darwin-thread-multi-2level
+DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB)
+INSTALLSITEARCH = /Library/Perl/5.8.6/darwin-thread-multi-2level
+DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH)
+INSTALLVENDORARCH = /Network/Library/Perl/5.8.6/darwin-thread-multi-2level
+DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH)
+INSTALLBIN = /usr/bin
+DESTINSTALLBIN = $(DESTDIR)$(INSTALLBIN)
+INSTALLSITEBIN = /usr/local/bin
+DESTINSTALLSITEBIN = $(DESTDIR)$(INSTALLSITEBIN)
+INSTALLVENDORBIN = /usr/local/bin
+DESTINSTALLVENDORBIN = $(DESTDIR)$(INSTALLVENDORBIN)
+INSTALLSCRIPT = /usr/bin
+DESTINSTALLSCRIPT = $(DESTDIR)$(INSTALLSCRIPT)
+INSTALLSITESCRIPT = /usr/local/bin
+DESTINSTALLSITESCRIPT = $(DESTDIR)$(INSTALLSITESCRIPT)
+INSTALLVENDORSCRIPT = /usr/local/bin
+DESTINSTALLVENDORSCRIPT = $(DESTDIR)$(INSTALLVENDORSCRIPT)
+INSTALLMAN1DIR = /usr/share/man/man1
+DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR)
+INSTALLSITEMAN1DIR = /usr/local/man/man1
+DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR)
+INSTALLVENDORMAN1DIR = /usr/local/man/man1
+DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR)
+INSTALLMAN3DIR = /usr/share/man/man3
+DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR)
+INSTALLSITEMAN3DIR = /usr/local/man/man3
+DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR)
+INSTALLVENDORMAN3DIR = /usr/local/man/man3
+DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR)
+PERL_LIB =
+PERL_ARCHLIB = /System/Library/Perl/5.8.6/darwin-thread-multi-2level
+LIBPERL_A = libperl.a
+FIRST_MAKEFILE = Makefile
+MAKEFILE_OLD = Makefile.old
+MAKE_APERL_FILE = Makefile.aperl
+PERLMAINCC = $(CC)
+PERL_INC = /System/Library/Perl/5.8.6/darwin-thread-multi-2level/CORE
+PERL = /usr/bin/perl "-Iinc"
+FULLPERL = /usr/bin/perl "-Iinc"
+ABSPERL = $(PERL)
+PERLRUN = $(PERL)
+FULLPERLRUN = $(FULLPERL)
+ABSPERLRUN = $(ABSPERL)
+PERLRUNINST = $(PERLRUN) "-I$(INST_ARCHLIB)" "-Iinc" "-I$(INST_LIB)"
+FULLPERLRUNINST = $(FULLPERLRUN) "-I$(INST_ARCHLIB)" "-Iinc" "-I$(INST_LIB)"
+ABSPERLRUNINST = $(ABSPERLRUN) "-I$(INST_ARCHLIB)" "-Iinc" "-I$(INST_LIB)"
+PERL_CORE = 0
+PERM_RW = 644
+PERM_RWX = 755
+
+MAKEMAKER   = /System/Library/Perl/5.8.6/ExtUtils/MakeMaker.pm
+MM_VERSION  = 6.42
+MM_REVISION = 41145
+
+# FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle).
+# BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle)
+# PARENT_NAME = NAME without BASEEXT and no trailing :: (eg Foo::Bar)
+# DLBASE  = Basename part of dynamic library. May be just equal BASEEXT.
+MAKE = make
+FULLEXT = Text/Markdown
+BASEEXT = Markdown
+PARENT_NAME = Text
+DLBASE = $(BASEEXT)
+VERSION_FROM = 
+OBJECT = 
+LDFROM = $(OBJECT)
+LINKTYPE = dynamic
+BOOTDEP = 
+
+# Handy lists of source code files:
+XS_FILES = 
+C_FILES  = 
+O_FILES  = 
+H_FILES  = 
+MAN1PODS = 
+MAN3PODS = lib/Text/Markdown.pm \
+	lib/Text/MultiMarkdown.pm
+
+# Where is the Config information that we are using/depend on
+CONFIGDEP = $(PERL_ARCHLIB)$(DFSEP)Config.pm $(PERL_INC)$(DFSEP)config.h
+
+# Where to build things
+INST_LIBDIR      = $(INST_LIB)/Text
+INST_ARCHLIBDIR  = $(INST_ARCHLIB)/Text
+
+INST_AUTODIR     = $(INST_LIB)/auto/$(FULLEXT)
+INST_ARCHAUTODIR = $(INST_ARCHLIB)/auto/$(FULLEXT)
+
+INST_STATIC      = 
+INST_DYNAMIC     = 
+INST_BOOT        = 
+
+# Extra linker info
+EXPORT_LIST        = 
+PERL_ARCHIVE       = 
+PERL_ARCHIVE_AFTER = 
+
+
+TO_INST_PM = lib/Text/Markdown.pm \
+	lib/Text/MultiMarkdown.pm
+
+PM_TO_BLIB = lib/Text/Markdown.pm \
+	blib/lib/Text/Markdown.pm \
+	lib/Text/MultiMarkdown.pm \
+	blib/lib/Text/MultiMarkdown.pm
+
+
+# --- MakeMaker platform_constants section:
+MM_Unix_VERSION = 6.42
+PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree -Drealloc=Perl_realloc -Dcalloc=Perl_calloc
+
+
+# --- MakeMaker tool_autosplit section:
+# Usage: $(AUTOSPLITFILE) FileToSplit AutoDirToSplitInto
+AUTOSPLITFILE = $(ABSPERLRUN)  -e 'use AutoSplit;  autosplit($$ARGV[0], $$ARGV[1], 0, 1, 1)' --
+
+
+
+# --- MakeMaker tool_xsubpp section:
+
+
+# --- MakeMaker tools_other section:
+SHELL = /bin/sh
+CHMOD = chmod
+CP = cp
+MV = mv
+NOOP = $(SHELL) -c true
+NOECHO = @
+RM_F = rm -f
+RM_RF = rm -rf
+TEST_F = test -f
+TOUCH = touch
+UMASK_NULL = umask 0
+DEV_NULL = > /dev/null 2>&1
+MKPATH = $(ABSPERLRUN) "-MExtUtils::Command" -e mkpath
+EQUALIZE_TIMESTAMP = $(ABSPERLRUN) "-MExtUtils::Command" -e eqtime
+ECHO = echo
+ECHO_N = echo -n
+UNINST = 0
+VERBINST = 0
+MOD_INSTALL = $(ABSPERLRUN) -MExtUtils::Install -e 'install({@ARGV}, '\''$(VERBINST)'\'', 0, '\''$(UNINST)'\'');' --
+DOC_INSTALL = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e perllocal_install
+UNINSTALL = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e uninstall
+WARN_IF_OLD_PACKLIST = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e warn_if_old_packlist
+MACROSTART = 
+MACROEND = 
+USEMAKEFILE = -f
+FIXIN = $(PERLRUN) "-MExtUtils::MY" -e "MY->fixin(shift)"
+
+
+# --- MakeMaker makemakerdflt section:
+makemakerdflt : all
+	$(NOECHO) $(NOOP)
+
+
+# --- MakeMaker dist section:
+TAR = tar
+TARFLAGS = cvf
+ZIP = zip
+ZIPFLAGS = -r
+COMPRESS = gzip --best
+SUFFIX = .gz
+SHAR = shar
+PREOP = $(PERL) -I. "-MModule::Install::Admin" -e "dist_preop(q($(DISTVNAME)))"
+POSTOP = $(NOECHO) $(NOOP)
+TO_UNIX = $(NOECHO) $(NOOP)
+CI = ci -u
+RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
+DIST_CP = best
+DIST_DEFAULT = tardist
+DISTNAME = Text-Markdown
+DISTVNAME = Text-Markdown-1.0.22
+
+
+# --- MakeMaker macro section:
+
+
+# --- MakeMaker depend section:
+
+
+# --- MakeMaker cflags section:
+
+
+# --- MakeMaker const_loadlibs section:
+
+
+# --- MakeMaker const_cccmd section:
+
+
+# --- MakeMaker post_constants section:
+
+
+# --- MakeMaker pasthru section:
+
+PASTHRU = LIBPERL_A="$(LIBPERL_A)"\
+	LINKTYPE="$(LINKTYPE)"\
+	PREFIX="$(PREFIX)"
+
+
+# --- MakeMaker special_targets section:
+.SUFFIXES : .xs .c .C .cpp .i .s .cxx .cc $(OBJ_EXT)
+
+.PHONY: all config static dynamic test linkext manifest blibdirs clean realclean disttest distdir
+
+
+
+# --- MakeMaker c_o section:
+
+
+# --- MakeMaker xs_c section:
+
+
+# --- MakeMaker xs_o section:
+
+
+# --- MakeMaker top_targets section:
+all :: pure_all manifypods
+	$(NOECHO) $(NOOP)
+
+
+pure_all :: config pm_to_blib subdirs linkext
+	$(NOECHO) $(NOOP)
+
+subdirs :: $(MYEXTLIB)
+	$(NOECHO) $(NOOP)
+
+config :: $(FIRST_MAKEFILE) blibdirs
+	$(NOECHO) $(NOOP)
+
+help :
+	perldoc ExtUtils::MakeMaker
+
+
+# --- MakeMaker blibdirs section:
+blibdirs : $(INST_LIBDIR)$(DFSEP).exists $(INST_ARCHLIB)$(DFSEP).exists $(INST_AUTODIR)$(DFSEP).exists $(INST_ARCHAUTODIR)$(DFSEP).exists $(INST_BIN)$(DFSEP).exists $(INST_SCRIPT)$(DFSEP).exists $(INST_MAN1DIR)$(DFSEP).exists $(INST_MAN3DIR)$(DFSEP).exists
+	$(NOECHO) $(NOOP)
+
+# Backwards compat with 6.18 through 6.25
+blibdirs.ts : blibdirs
+	$(NOECHO) $(NOOP)
+
+$(INST_LIBDIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_LIBDIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_LIBDIR)
+	$(NOECHO) $(TOUCH) $(INST_LIBDIR)$(DFSEP).exists
+
+$(INST_ARCHLIB)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_ARCHLIB)
+	$(NOECHO) $(CHMOD) 755 $(INST_ARCHLIB)
+	$(NOECHO) $(TOUCH) $(INST_ARCHLIB)$(DFSEP).exists
+
+$(INST_AUTODIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_AUTODIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_AUTODIR)
+	$(NOECHO) $(TOUCH) $(INST_AUTODIR)$(DFSEP).exists
+
+$(INST_ARCHAUTODIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_ARCHAUTODIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_ARCHAUTODIR)
+	$(NOECHO) $(TOUCH) $(INST_ARCHAUTODIR)$(DFSEP).exists
+
+$(INST_BIN)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_BIN)
+	$(NOECHO) $(CHMOD) 755 $(INST_BIN)
+	$(NOECHO) $(TOUCH) $(INST_BIN)$(DFSEP).exists
+
+$(INST_SCRIPT)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_SCRIPT)
+	$(NOECHO) $(CHMOD) 755 $(INST_SCRIPT)
+	$(NOECHO) $(TOUCH) $(INST_SCRIPT)$(DFSEP).exists
+
+$(INST_MAN1DIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_MAN1DIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_MAN1DIR)
+	$(NOECHO) $(TOUCH) $(INST_MAN1DIR)$(DFSEP).exists
+
+$(INST_MAN3DIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_MAN3DIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_MAN3DIR)
+	$(NOECHO) $(TOUCH) $(INST_MAN3DIR)$(DFSEP).exists
+
+
+
+# --- MakeMaker linkext section:
+
+linkext :: $(LINKTYPE)
+	$(NOECHO) $(NOOP)
+
+
+# --- MakeMaker dlsyms section:
+
+
+# --- MakeMaker dynamic section:
+
+dynamic :: $(FIRST_MAKEFILE) $(INST_DYNAMIC) $(INST_BOOT)
+	$(NOECHO) $(NOOP)
+
+
+# --- MakeMaker dynamic_bs section:
+
+BOOTSTRAP =
+
+
+# --- MakeMaker dynamic_lib section:
+
+
+# --- MakeMaker static section:
+
+## $(INST_PM) has been moved to the all: target.
+## It remains here for awhile to allow for old usage: "make static"
+static :: $(FIRST_MAKEFILE) $(INST_STATIC)
+	$(NOECHO) $(NOOP)
+
+
+# --- MakeMaker static_lib section:
+
+
+# --- MakeMaker manifypods section:
+
+POD2MAN_EXE = $(PERLRUN) "-MExtUtils::Command::MM" -e pod2man "--"
+POD2MAN = $(POD2MAN_EXE)
+
+
+manifypods : pure_all  \
+	lib/Text/Markdown.pm \
+	lib/Text/MultiMarkdown.pm
+	$(NOECHO) $(POD2MAN) --section=3 --perm_rw=$(PERM_RW) \
+	  lib/Text/Markdown.pm $(INST_MAN3DIR)/Text::Markdown.$(MAN3EXT) \
+	  lib/Text/MultiMarkdown.pm $(INST_MAN3DIR)/Text::MultiMarkdown.$(MAN3EXT) 
+
+
+
+
+# --- MakeMaker processPL section:
+
+
+# --- MakeMaker installbin section:
+
+
+# --- MakeMaker subdirs section:
+
+# none
+
+# --- MakeMaker clean_subdirs section:
+clean_subdirs :
+	$(NOECHO) $(NOOP)
+
+
+# --- MakeMaker clean section:
+
+# Delete temporary files but do not touch installed files. We don't delete
+# the Makefile here so a later make realclean still has a makefile to use.
+
+clean :: clean_subdirs
+	- $(RM_F) \
+	  *$(LIB_EXT) core \
+	  core.[0-9] $(INST_ARCHAUTODIR)/extralibs.all \
+	  core.[0-9][0-9] $(BASEEXT).bso \
+	  pm_to_blib.ts core.[0-9][0-9][0-9][0-9] \
+	  $(BASEEXT).x $(BOOTSTRAP) \
+	  perl$(EXE_EXT) tmon.out \
+	  *$(OBJ_EXT) pm_to_blib \
+	  $(INST_ARCHAUTODIR)/extralibs.ld blibdirs.ts \
+	  core.[0-9][0-9][0-9][0-9][0-9] *perl.core \
+	  core.*perl.*.? $(MAKE_APERL_FILE) \
+	  perl $(BASEEXT).def \
+	  core.[0-9][0-9][0-9] mon.out \
+	  lib$(BASEEXT).def perlmain.c \
+	  perl.exe so_locations \
+	  $(BASEEXT).exp 
+	- $(RM_RF) \
+	  blib 
+	- $(MV) $(FIRST_MAKEFILE) $(MAKEFILE_OLD) $(DEV_NULL)
+
+
+# --- MakeMaker realclean_subdirs section:
+realclean_subdirs :
+	$(NOECHO) $(NOOP)
+
+
+# --- MakeMaker realclean section:
+# Delete temporary files (via clean) and also delete dist files
+realclean purge ::  clean realclean_subdirs
+	- $(RM_F) \
+	  $(MAKEFILE_OLD) $(FIRST_MAKEFILE) 
+	- $(RM_RF) \
+	  $(DISTVNAME) 
+
+
+# --- MakeMaker metafile section:
+metafile :
+	$(NOECHO) $(NOOP)
+
+
+# --- MakeMaker signature section:
+signature :
+	cpansign -s
+
+
+# --- MakeMaker dist_basics section:
+distclean :: realclean distcheck
+	$(NOECHO) $(NOOP)
+
+distcheck :
+	$(PERLRUN) "-MExtUtils::Manifest=fullcheck" -e fullcheck
+
+skipcheck :
+	$(PERLRUN) "-MExtUtils::Manifest=skipcheck" -e skipcheck
+
+manifest :
+	$(PERLRUN) "-MExtUtils::Manifest=mkmanifest" -e mkmanifest
+
+veryclean : realclean
+	$(RM_F) *~ */*~ *.orig */*.orig *.bak */*.bak *.old */*.old 
+
+
+
+# --- MakeMaker dist_core section:
+
+dist : $(DIST_DEFAULT) $(FIRST_MAKEFILE)
+	$(NOECHO) $(ABSPERLRUN) -l -e 'print '\''Warning: Makefile possibly out of date with $(VERSION_FROM)'\''' \
+	  -e '    if -e '\''$(VERSION_FROM)'\'' and -M '\''$(VERSION_FROM)'\'' < -M '\''$(FIRST_MAKEFILE)'\'';' --
+
+tardist : $(DISTVNAME).tar$(SUFFIX)
+	$(NOECHO) $(NOOP)
+
+uutardist : $(DISTVNAME).tar$(SUFFIX)
+	uuencode $(DISTVNAME).tar$(SUFFIX) $(DISTVNAME).tar$(SUFFIX) > $(DISTVNAME).tar$(SUFFIX)_uu
+
+$(DISTVNAME).tar$(SUFFIX) : distdir
+	$(PREOP)
+	$(TO_UNIX)
+	$(TAR) $(TARFLAGS) $(DISTVNAME).tar $(DISTVNAME)
+	$(RM_RF) $(DISTVNAME)
+	$(COMPRESS) $(DISTVNAME).tar
+	$(POSTOP)
+
+zipdist : $(DISTVNAME).zip
+	$(NOECHO) $(NOOP)
+
+$(DISTVNAME).zip : distdir
+	$(PREOP)
+	$(ZIP) $(ZIPFLAGS) $(DISTVNAME).zip $(DISTVNAME)
+	$(RM_RF) $(DISTVNAME)
+	$(POSTOP)
+
+shdist : distdir
+	$(PREOP)
+	$(SHAR) $(DISTVNAME) > $(DISTVNAME).shar
+	$(RM_RF) $(DISTVNAME)
+	$(POSTOP)
+
+
+# --- MakeMaker distdir section:
+create_distdir :
+	$(RM_RF) $(DISTVNAME)
+	$(PERLRUN) "-MExtUtils::Manifest=manicopy,maniread" \
+		-e "manicopy(maniread(),'$(DISTVNAME)', '$(DIST_CP)');"
+
+distdir : create_distdir  
+	$(NOECHO) $(NOOP)
+
+
+
+# --- MakeMaker dist_test section:
+disttest : distdir
+	cd $(DISTVNAME) && $(ABSPERLRUN) Makefile.PL 
+	cd $(DISTVNAME) && $(MAKE) $(PASTHRU)
+	cd $(DISTVNAME) && $(MAKE) test $(PASTHRU)
+
+
+
+# --- MakeMaker dist_ci section:
+
+ci :
+	$(PERLRUN) "-MExtUtils::Manifest=maniread" \
+	  -e "@all = keys %{ maniread() };" \
+	  -e "print(qq{Executing $(CI) @all\n}); system(qq{$(CI) @all});" \
+	  -e "print(qq{Executing $(RCS_LABEL) ...\n}); system(qq{$(RCS_LABEL) @all});"
+
+
+# --- MakeMaker distmeta section:
+distmeta : create_distdir metafile
+	$(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'eval { maniadd({q{META.yml} => q{Module meta-data (added by MakeMaker)}}) } ' \
+	  -e '    or print "Could not add META.yml to MANIFEST: $${'\''@'\''}\n"' --
+
+
+
+# --- MakeMaker distsignature section:
+distsignature : create_distdir
+	$(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'eval { maniadd({q{SIGNATURE} => q{Public-key signature (added by MakeMaker)}}) } ' \
+	  -e '    or print "Could not add SIGNATURE to MANIFEST: $${'\''@'\''}\n"' --
+	$(NOECHO) cd $(DISTVNAME) && $(TOUCH) SIGNATURE
+	cd $(DISTVNAME) && cpansign -s
+
+
+
+# --- MakeMaker install section:
+
+install :: all pure_install doc_install
+	$(NOECHO) $(NOOP)
+
+install_perl :: all pure_perl_install doc_perl_install
+	$(NOECHO) $(NOOP)
+
+install_site :: all pure_site_install doc_site_install
+	$(NOECHO) $(NOOP)
+
+install_vendor :: all pure_vendor_install doc_vendor_install
+	$(NOECHO) $(NOOP)
+
+pure_install :: pure_$(INSTALLDIRS)_install
+	$(NOECHO) $(NOOP)
+
+doc_install :: doc_$(INSTALLDIRS)_install
+	$(NOECHO) $(NOOP)
+
+pure__install : pure_site_install
+	$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
+
+doc__install : doc_site_install
+	$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
+
+pure_perl_install ::
+	$(NOECHO) $(MOD_INSTALL) \
+		read $(PERL_ARCHLIB)/auto/$(FULLEXT)/.packlist \
+		write $(DESTINSTALLARCHLIB)/auto/$(FULLEXT)/.packlist \
+		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+		$(INST_BIN) $(DESTINSTALLBIN) \
+		$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
+		$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
+		$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR)
+	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
+		$(SITEARCHEXP)/auto/$(FULLEXT)
+
+
+pure_site_install ::
+	$(NOECHO) $(MOD_INSTALL) \
+		read $(SITEARCHEXP)/auto/$(FULLEXT)/.packlist \
+		write $(DESTINSTALLSITEARCH)/auto/$(FULLEXT)/.packlist \
+		$(INST_LIB) $(DESTINSTALLSITELIB) \
+		$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
+		$(INST_BIN) $(DESTINSTALLSITEBIN) \
+		$(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \
+		$(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \
+		$(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR)
+	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
+		$(PERL_ARCHLIB)/auto/$(FULLEXT)
+
+pure_vendor_install ::
+	$(NOECHO) $(MOD_INSTALL) \
+		read $(VENDORARCHEXP)/auto/$(FULLEXT)/.packlist \
+		write $(DESTINSTALLVENDORARCH)/auto/$(FULLEXT)/.packlist \
+		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
+		$(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \
+		$(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \
+		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
+
+doc_perl_install ::
+	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+	-$(NOECHO) $(DOC_INSTALL) \
+		"Module" "$(NAME)" \
+		"installed into" "$(INSTALLPRIVLIB)" \
+		LINKTYPE "$(LINKTYPE)" \
+		VERSION "$(VERSION)" \
+		EXE_FILES "$(EXE_FILES)" \
+		>> $(DESTINSTALLARCHLIB)/perllocal.pod
+
+doc_site_install ::
+	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+	-$(NOECHO) $(DOC_INSTALL) \
+		"Module" "$(NAME)" \
+		"installed into" "$(INSTALLSITELIB)" \
+		LINKTYPE "$(LINKTYPE)" \
+		VERSION "$(VERSION)" \
+		EXE_FILES "$(EXE_FILES)" \
+		>> $(DESTINSTALLARCHLIB)/perllocal.pod
+
+doc_vendor_install ::
+	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+	-$(NOECHO) $(DOC_INSTALL) \
+		"Module" "$(NAME)" \
+		"installed into" "$(INSTALLVENDORLIB)" \
+		LINKTYPE "$(LINKTYPE)" \
+		VERSION "$(VERSION)" \
+		EXE_FILES "$(EXE_FILES)" \
+		>> $(DESTINSTALLARCHLIB)/perllocal.pod
+
+
+uninstall :: uninstall_from_$(INSTALLDIRS)dirs
+	$(NOECHO) $(NOOP)
+
+uninstall_from_perldirs ::
+	$(NOECHO) $(UNINSTALL) $(PERL_ARCHLIB)/auto/$(FULLEXT)/.packlist
+
+uninstall_from_sitedirs ::
+	$(NOECHO) $(UNINSTALL) $(SITEARCHEXP)/auto/$(FULLEXT)/.packlist
+
+uninstall_from_vendordirs ::
+	$(NOECHO) $(UNINSTALL) $(VENDORARCHEXP)/auto/$(FULLEXT)/.packlist
+
+
+# --- MakeMaker force section:
+# Phony target to force checking subdirectories.
+FORCE :
+	$(NOECHO) $(NOOP)
+
+
+# --- MakeMaker perldepend section:
+
+
+# --- MakeMaker makefile section:
+# We take a very conservative approach here, but it's worth it.
+# We move Makefile to Makefile.old here to avoid gnu make looping.
+$(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP)
+	$(NOECHO) $(ECHO) "Makefile out-of-date with respect to $?"
+	$(NOECHO) $(ECHO) "Cleaning current config before rebuilding Makefile..."
+	-$(NOECHO) $(RM_F) $(MAKEFILE_OLD)
+	-$(NOECHO) $(MV)   $(FIRST_MAKEFILE) $(MAKEFILE_OLD)
+	- $(MAKE) $(USEMAKEFILE) $(MAKEFILE_OLD) clean $(DEV_NULL)
+	$(PERLRUN) Makefile.PL 
+	$(NOECHO) $(ECHO) "==> Your Makefile has been rebuilt. <=="
+	$(NOECHO) $(ECHO) "==> Please rerun the $(MAKE) command.  <=="
+	false
+
+
+
+# --- MakeMaker staticmake section:
+
+# --- MakeMaker makeaperl section ---
+MAP_TARGET    = perl
+FULLPERL      = /usr/bin/perl
+
+$(MAP_TARGET) :: static $(MAKE_APERL_FILE)
+	$(MAKE) $(USEMAKEFILE) $(MAKE_APERL_FILE) $@
+
+$(MAKE_APERL_FILE) : $(FIRST_MAKEFILE) pm_to_blib
+	$(NOECHO) $(ECHO) Writing \"$(MAKE_APERL_FILE)\" for this $(MAP_TARGET)
+	$(NOECHO) $(PERLRUNINST) \
+		Makefile.PL DIR= \
+		MAKEFILE=$(MAKE_APERL_FILE) LINKTYPE=static \
+		MAKEAPERL=1 NORECURS=1 CCCDLFLAGS=
+
+
+# --- MakeMaker test section:
+
+TEST_VERBOSE=0
+TEST_TYPE=test_$(LINKTYPE)
+TEST_FILE = test.pl
+TEST_FILES = t/*.t
+TESTDB_SW = -d
+
+testdb :: testdb_$(LINKTYPE)
+
+test :: $(TEST_TYPE) subdirs-test
+
+subdirs-test ::
+	$(NOECHO) $(NOOP)
+
+
+test_dynamic :: pure_all
+	PERL_DL_NONLAZY=1 $(FULLPERLRUN) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), 'inc', '$(INST_LIB)', '$(INST_ARCHLIB)')" $(TEST_FILES)
+
+testdb_dynamic :: pure_all
+	PERL_DL_NONLAZY=1 $(FULLPERLRUN) $(TESTDB_SW) "-Iinc" "-I$(INST_LIB)" "-I$(INST_ARCHLIB)" $(TEST_FILE)
+
+test_ : test_dynamic
+
+test_static :: test_dynamic
+testdb_static :: testdb_dynamic
+
+
+# --- MakeMaker ppd section:
+# Creates a PPD (Perl Package Description) for a binary distribution.
+ppd :
+	$(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="1,0,22,0">' > $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '    <TITLE>$(DISTNAME)</TITLE>' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '    <ABSTRACT>Convert Markdown syntax to (X)HTML</ABSTRACT>' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '    <AUTHOR>Tomas Doran &lt;bobtfish at bobtfish.net&gt;</AUTHOR>' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '    <IMPLEMENTATION>' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="Digest-MD5" VERSION="0,0,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="Encode" VERSION="0,0,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="ExtUtils-MakeMaker" VERSION="6,42,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="File-Slurp" VERSION="0,0,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="FindBin" VERSION="0,0,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="List-MoreUtils" VERSION="0,0,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="Test-Exception" VERSION="0,0,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="Test-More" VERSION="0,42,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <DEPENDENCY NAME="Text-Balanced" VERSION="0,0,0,0" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <OS NAME="$(OSNAME)" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <ARCHITECTURE NAME="darwin-thread-multi-2level-5.8" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '        <CODEBASE HREF="" />' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '    </IMPLEMENTATION>' >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) '</SOFTPKG>' >> $(DISTNAME).ppd
+
+
+# --- MakeMaker pm_to_blib section:
+
+pm_to_blib : $(TO_INST_PM)
+	$(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', '\''$(PM_FILTER)'\'')' -- \
+	  lib/Text/Markdown.pm blib/lib/Text/Markdown.pm \
+	  lib/Text/MultiMarkdown.pm blib/lib/Text/MultiMarkdown.pm 
+	$(NOECHO) $(TOUCH) pm_to_blib
+
+
+# --- MakeMaker selfdocument section:
+
+
+# --- MakeMaker postamble section:
+
+
+# End.
+# Postamble by Module::Install 0.75
+# --- Module::Install::Admin::Makefile section:
+
+realclean purge ::
+	$(RM_F) $(DISTVNAME).tar$(SUFFIX)
+	$(RM_RF) inc MANIFEST.bak _build
+	$(PERL) -I. "-MModule::Install::Admin" -e "remove_meta()"
+
+reset :: purge
+
+upload :: test dist
+	cpan-upload -verbose $(DISTVNAME).tar$(SUFFIX)
+
+grok ::
+	perldoc Module::Install
+
+distsign ::
+	cpansign -s
+

Modified: branches/upstream/libtext-markdown-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/Makefile.PL?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/Makefile.PL (original)
+++ branches/upstream/libtext-markdown-perl/current/Makefile.PL Sat Oct 25 16:02:50 2008
@@ -6,6 +6,7 @@
 author          'Tomas Doran <bobtfish at bobtfish.net>';
 license			'bsd';
 all_from        'lib/Text/Markdown.pm';
+resources repository => 'http://svn.kulp.ch/cpan/text_multimarkdown';
 
 # Specific dependencies
 perl_version    '5.008';

Modified: branches/upstream/libtext-markdown-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/README?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/README (original)
+++ branches/upstream/libtext-markdown-perl/current/README Sat Oct 25 16:02:50 2008
@@ -40,7 +40,7 @@
 
 OPTIONS
     Text::Markdown supports a number of options to it's processor which
-    control the behavior of the output document.
+    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
@@ -143,7 +143,7 @@
     Whilst this code aims to be compatible with the original Markdown.pl
     (and incorporates and passes the Markdown test suite) whilst fixing a
     number of bugs in the original - there may be differences between the
-    behavior of this module and Markdown.pl. If you find any differences
+    behaviour of this module and Markdown.pl. If you find any differences
     where you believe Text::Markdown behaves contrary to the Markdown spec,
     please report them as bugs.
 

Modified: branches/upstream/libtext-markdown-perl/current/Todo
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/Todo?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/Todo (original)
+++ branches/upstream/libtext-markdown-perl/current/Todo Sat Oct 25 16:02:50 2008
@@ -1,4 +1,4 @@
-Todo pre 1.0.22:
+Todo pre 1.0.23:
     . 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.23:
+Todo pre 1.0.24:
     . 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.24:
+Todo pre 1.0.25:
     . 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.25:
+Todo pre 1.0.26:
    . 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: branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm (original)
+++ branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm Sat Oct 25 16:02:50 2008
@@ -2,13 +2,14 @@
 require 5.008_000;
 use strict;
 use warnings;
+use re 'eval';
 
 use Digest::MD5 qw(md5_hex);
 use Encode      qw();
 use Carp        qw(croak);
 use base        'Exporter';
 
-our $VERSION   = '1.0.21';
+our $VERSION   = '1.0.22';
 our @EXPORT_OK = qw(markdown);
 
 =head1 NAME
@@ -57,7 +58,7 @@
 
 =head1 OPTIONS
 
-Text::Markdown supports a number of options to it's processor which control the behavior of the output document.
+Text::Markdown supports a number of options to it's 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.
@@ -1376,7 +1377,7 @@
         <
         (?:mailto:)?
         (
-            [-.\w]+
+            [-.\w\+]+
             \@
             [-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
         )
@@ -1607,7 +1608,7 @@
 
 Whilst this code aims to be compatible with the original Markdown.pl (and incorporates 
 and passes the Markdown test suite) whilst fixing a number of bugs in the original - 
-there may be differences between the behavior of this module and Markdown.pl. If you find
+there may be differences between the behaviour of this module and Markdown.pl. If you find
 any differences where you believe Text::Markdown behaves contrary to the Markdown spec, 
 please report them as bugs.
 

Modified: branches/upstream/libtext-markdown-perl/current/lib/Text/MultiMarkdown.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/lib/Text/MultiMarkdown.pm?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/lib/Text/MultiMarkdown.pm (original)
+++ branches/upstream/libtext-markdown-perl/current/lib/Text/MultiMarkdown.pm Sat Oct 25 16:02:50 2008
@@ -2,13 +2,14 @@
 require 5.008_000;
 use strict;
 use warnings;
+use re 'eval';
 
 use Digest::MD5 qw(md5_hex);
 use Encode      qw();
 use Carp        qw(croak);
 use base        qw(Text::Markdown);
 
-our $VERSION   = '1.0.21';
+our $VERSION   = '1.0.22';
 our @EXPORT_OK = qw(markdown);
 
 =head1 NAME
@@ -53,7 +54,7 @@
 
 This module implements the MultiMarkdown markdown syntax extensions from:
 
-    http://fletcherpenney.net/MultiMarkdown/
+    http://fletcherpenney.net/multimarkdown/
 
 =head1 SYNTAX
 
@@ -65,7 +66,7 @@
 
 The extension is documented at:
 
-    http://fletcherpenney.net/MultiMarkdown/
+    http://fletcherpenney.net/multimarkdown/
 
 and borrows from php-markdown, which lives at:
 
@@ -75,7 +76,7 @@
 
 =head1 OPTIONS
 
-MultiMarkdown supports a number of options to it's processor which control the behavior of the output document.
+MultiMarkdown supports a number of options to it's 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.
@@ -331,7 +332,7 @@
 }
 
 #
-# Routines which are overridden for slightly different behavior in MultiMarkdown
+# Routines which are overridden for slightly different behaviour in MultiMarkdown
 #
 
 # Delegate to super class, then do wiki links
@@ -369,7 +370,7 @@
 
 # Generating headers automatically generates X-refs in MultiMarkdown (always)
 # Also, by default, you get id attributes added to your headers, you can turn this
-# part of the MultiMarkdown behavior off with the heading_ids flag.
+# part of the MultiMarkdown behaviour off with the heading_ids flag.
 sub _GenerateHeader {
     my ($self, $level, $id) = @_;
     
@@ -1259,7 +1260,7 @@
 
 Whilst this code aims to be compatible with the original MultiMarkdown (and incorporates 
 and passes the MultiMarkdown test suite) whilst fixing a number of bugs in the original - 
-there may be differences between the behavior of this module and MultiMarkdown. If you find
+there may be differences between the behaviour of this module and MultiMarkdown. If you find
 any differences where you believe Text::MultiMarkdown behaves contrary to the MultiMarkdown spec, 
 please report them as bugs.
 

Modified: branches/upstream/libtext-markdown-perl/current/t/20fulldocs-text-multimarkdown.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/t/20fulldocs-text-multimarkdown.t?rev=26227&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/t/20fulldocs-text-multimarkdown.t (original)
+++ branches/upstream/libtext-markdown-perl/current/t/20fulldocs-text-multimarkdown.t Sat Oct 25 16:02:50 2008
@@ -4,6 +4,7 @@
 use FindBin qw($Bin);
 use List::MoreUtils qw(uniq);
 use File::Slurp qw(slurp);
+use Encode;
 
 our $TIDY = 0;
 
@@ -23,7 +24,7 @@
             return;
         }
         print "=" x 80 . "\nDIFFERENCES: + = processed version from .text, - = template from .html\n";
-        print Text::Diff::diff(\$expected => \$got, { STYLE => "Unified" }) . "\n";
+        print encode('utf8', Text::Diff::diff(\$expected => \$got, { STYLE => "Unified" }) . "\n");
         fail($testname);
     };
 }

Added: branches/upstream/libtext-markdown-perl/current/t/rt37909.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/t/rt37909.t?rev=26227&op=file
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/t/rt37909.t (added)
+++ branches/upstream/libtext-markdown-perl/current/t/rt37909.t Sat Oct 25 16:02:50 2008
@@ -1,0 +1,10 @@
+use strict;
+use warnings;
+use Test::More tests => 2;
+
+use_ok( 'Text::Markdown', 'markdown' );
+
+my $m     = Text::Markdown->new;
+my $html1 = $m->markdown('<a+b at c.org>');
+like( $html1, qr/<p><a href=".+&#.+">.+&#.+<\/a><\/p>/ );
+




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