r20781 - in /trunk/libtext-markdown-perl/debian: changelog control patches/ patches/add_missing_pod patches/series rules

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Fri Jun 6 17:32:05 UTC 2008


Author: gwolf
Date: Fri Jun  6 17:32:05 2008
New Revision: 20781

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20781
Log:
Added missing manpages

Added:
    trunk/libtext-markdown-perl/debian/patches/
    trunk/libtext-markdown-perl/debian/patches/add_missing_pod
    trunk/libtext-markdown-perl/debian/patches/series
Modified:
    trunk/libtext-markdown-perl/debian/changelog
    trunk/libtext-markdown-perl/debian/control
    trunk/libtext-markdown-perl/debian/rules

Modified: trunk/libtext-markdown-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/changelog?rev=20781&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/changelog (original)
+++ trunk/libtext-markdown-perl/debian/changelog Fri Jun  6 17:32:05 2008
@@ -1,3 +1,11 @@
+libtext-markdown-perl (1.0.19-2) unstable; urgency=low
+
+  * Added build-dependency on quilt
+  * Added manpages (POD documentation) to Markdown.pl and
+    Multimarkdown.pl (Closes: #477263)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 06 Jun 2008 12:15:38 -0500
+
 libtext-markdown-perl (1.0.19-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libtext-markdown-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/control?rev=20781&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/control (original)
+++ trunk/libtext-markdown-perl/debian/control Fri Jun  6 17:32:05 2008
@@ -4,7 +4,7 @@
 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)
+Build-Depends: debhelper (>= 5), 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

Added: trunk/libtext-markdown-perl/debian/patches/add_missing_pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/patches/add_missing_pod?rev=20781&op=file
==============================================================================
--- trunk/libtext-markdown-perl/debian/patches/add_missing_pod (added)
+++ trunk/libtext-markdown-perl/debian/patches/add_missing_pod Fri Jun  6 17:32:05 2008
@@ -1,0 +1,228 @@
+Index: libtext-markdown-perl/script/Markdown.pl
+===================================================================
+--- libtext-markdown-perl.orig/script/Markdown.pl	2008-06-06 11:07:33.000000000 -0500
++++ libtext-markdown-perl/script/Markdown.pl	2008-06-06 12:06:50.000000000 -0500
+@@ -3,6 +3,89 @@
+ use warnings;
+ use Text::Markdown qw(markdown);
+ 
++=head1 NAME
++
++markdown - Convert Markdown syntax to (X)HTML
++
++=head1 DESCRIPTION
++
++This program is distributed as part of Perl's Text::Markdown module,
++illustrating sample usage.
++
++Markdown can be invoked on any file containing Markdown-syntax, and
++will produce the corresponding (X)HTML on STDOUT:
++
++    $ cat file.txt
++    This is a *test*.
++
++    Absolutely _nothing_ to see here. _Just a **test**_!
++
++    * test
++    * Yup, test.
++    $ markdown file.txt
++    <p>This is a <em>test</em>.</p>
++
++    <p>Absolutely <em>nothing</em> to see here. <em>Just a <strong>test</strong></em>!</p>
++
++    <ul>
++    <li>test</li>
++    <li>Yup, test.</li>
++    </ul>
++
++If no file is specified, it will expect its input from STDIN:
++
++    $ echo "A **simple** test" | markdown
++    <p>A <strong>simple</strong> test</p>
++
++=head1 OPTIONS
++
++=over
++
++=item version
++
++Shows the full information for this version
++
++=item shortversion
++
++Shows only the version number
++
++=item html4tags
++
++Produce HTML 4-style tags instead of XHTML - XHTML requires elements
++that do not wrap a block (i.e. the C<hr> tag) to state they will not
++be closed, by closing with C</E<gt>>. HTML 4-style will plainly output
++the tag as it comes:
++
++    $ echo '---' | markdown
++    <hr />
++    $ echo '---' | markdown --html4tags
++    <hr>
++
++=item help
++
++Shows this documentation
++
++=back
++
++=head1 AUTHOR
++
++Copyright 2004 John Gruber
++
++Copyright 2008 Tomas Doran
++
++The manpage was written by Gunnar Wolf <gwolf at debian.org> for its use
++in Debian systems, but can be freely used elsewhere.
++
++For full licensing information, please refer to
++L<Text::MultiMarkdown.pm>'s full documentation, or -in Debian systems-
++to L</usr/share/doc/libtext-markdown-perl/copyright>
++
++=head1 SEE ALSO
++
++L<Text::Markdown>, L<http://daringfireball.net/projects/markdown/>
++
++=cut
++
+ #### Check for command-line switches: #################
+ my %cli_opts;
+ use Getopt::Long;
+@@ -25,7 +108,13 @@
+     print $Text::Markdown::VERSION;
+     exit 0;
+ }
+-
++if ($cli_opts{'help'}) {
++    for my $dir (split m/:/, $ENV{PATH}) {
++	my $cmd = "$dir/perldoc";
++	exec($cmd, $0) if (-f $cmd and -x $cmd);
++    }
++    die "perldoc could not be found in your path - Cannot show help, sorry\n";
++}
+ my $m;
+ if ($cli_opts{'html4tags'}) {           # Use HTML tag style instead of XHTML
+     $m = Text::Markdown->new(empty_element_suffix => '>');
+Index: libtext-markdown-perl/script/MultiMarkdown.pl
+===================================================================
+--- libtext-markdown-perl.orig/script/MultiMarkdown.pl	2008-06-06 11:43:13.000000000 -0500
++++ libtext-markdown-perl/script/MultiMarkdown.pl	2008-06-06 12:10:42.000000000 -0500
+@@ -3,6 +3,84 @@
+ use warnings;
+ use Text::MultiMarkdown qw(markdown);
+ 
++=head1 NAME
++
++multimarkdown - Convert MultiMarkdown syntax to (X)HTML
++
++=head1 DESCRIPTION
++
++This program is distributed as part of Perl's Text::MultiMarkdown module,
++illustrating sample usage.
++
++MultiMarkdown can be invoked on any file containing MultiMarkdown-syntax, and
++will produce the corresponding (X)HTML on STDOUT:
++
++    $ cat file.txt
++    [MultiMarkdown][] *extends* the very well-known [Markdown][] syntax.
++
++    [MultiMarkdown]: http://fletcherpenney.net/What_is_MultiMarkdown
++    [Markdown]: http://daringfireball.net/projects/markdown/
++
++    $ multimarkdown file.txt
++    <p><a href="http://fletcherpenney.net/What_is_MultiMarkdown">MultiMarkdown</a> <em>extends</em> the very well-known <a href="http://daringfireball.net/projects/markdown/">Markdown</a> syntax.</p>
++
++
++If no file is specified, it will expect its input from STDIN:
++
++    $ echo "A **simple** test" | multimarkdown
++    <p>A <strong>simple</strong> test</p>
++
++=head1 OPTIONS
++
++=over
++
++=item version
++
++Shows the full information for this version
++
++=item shortversion
++
++Shows only the version number
++
++=item html4tags
++
++Produce HTML 4-style tags instead of XHTML - XHTML requires elements
++that do not wrap a block (i.e. the C<hr> tag) to state they will not
++be closed, by closing with C</E<gt>>. HTML 4-style will plainly output
++the tag as it comes:
++
++    $ echo '---' | multimarkdown
++    <hr />
++    $ echo '---' | multimarkdown --html4tags
++    <hr>
++
++=item help
++
++Shows this documentation
++
++=back
++
++=head1 AUTHOR
++
++Copyright 2004 John Gruber
++
++Copyright 2006 Fletcher Penny
++
++Copyright 2008 Tomas Doran
++
++The manpage was written by Gunnar Wolf <gwolf at debian.org> for its use
++in Debian systems, but can be freely used elsewhere.
++
++For full licensing information, please refer to
++Text::MultiMarkdown.pm's full documentation, or -in Debian systems- to
++L</usr/share/doc/libtext-markdown-perl/copyright>
++
++=head1 SEE ALSO
++
++L<Text::MultiMarkdown>, L<http://fletcherpenney.net/What_is_MultiMarkdown>
++
++=cut
++
+ #### Check for command-line switches: #################
+ my %cli_opts;
+ use Getopt::Long;
+@@ -11,6 +89,7 @@
+     'version',
+     'shortversion',
+     'html4tags',
++    'help'
+ );
+ if ($cli_opts{'version'}) {     # Version info
+     print "\nThis is MultiMarkdown, version $Text::MultiMarkdown::VERSION.\n";
+@@ -25,7 +104,13 @@
+     print $Text::MultiMarkdown::VERSION;
+     exit 0;
+ }
+-
++if ($cli_opts{'help'}) {
++    for my $dir (split m/:/, $ENV{PATH}) {
++	my $cmd = "$dir/perldoc";
++	exec($cmd, $0) if (-f $cmd and -x $cmd);
++    }
++    die "perldoc could not be found in your path - Cannot show help, sorry\n";
++}
+ my $m;
+ if ($cli_opts{'html4tags'}) {           # Use HTML tag style instead of XHTML
+     $m = Text::MultiMarkdown->new(empty_element_suffix => '>');
+@@ -54,4 +139,4 @@
+     return $m->markdown($f);
+ }
+ 
+-print main(shift(@ARGV)) unless caller();
+\ No newline at end of file
++print main(shift(@ARGV)) unless caller();

Added: trunk/libtext-markdown-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/patches/series?rev=20781&op=file
==============================================================================
--- trunk/libtext-markdown-perl/debian/patches/series (added)
+++ trunk/libtext-markdown-perl/debian/patches/series Fri Jun  6 17:32:05 2008
@@ -1,0 +1,1 @@
+add_missing_pod

Modified: trunk/libtext-markdown-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-markdown-perl/debian/rules?rev=20781&op=diff
==============================================================================
--- trunk/libtext-markdown-perl/debian/rules (original)
+++ trunk/libtext-markdown-perl/debian/rules Fri Jun  6 17:32:05 2008
@@ -7,6 +7,8 @@
 # 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
@@ -15,7 +17,7 @@
 PACKAGE = $(shell dh_listpackages)
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
@@ -23,7 +25,7 @@
 	TEST_POD=1 $(MAKE) test
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp
@@ -35,8 +37,16 @@
 	dh_testroot
 	dh_clean -k
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+
+	# 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      $(CURDIR)/debian/$(PACKAGE)/usr/bin/markdown
 	install -D -m 755 script/MultiMarkdown.pl $(CURDIR)/debian/$(PACKAGE)/usr/bin/multimarkdown
+	install -d $(CURDIR)/debian/$(PACKAGE)/usr/share/man/man1/
+	pod2man $(CURDIR)/debian/$(PACKAGE)/usr/bin/markdown		$(CURDIR)/debian/$(PACKAGE)/usr/share/man/man1/markdown.1
+	pod2man $(CURDIR)/debian/$(PACKAGE)/usr/bin/multimarkdown	$(CURDIR)/debian/$(PACKAGE)/usr/share/man/man1/multimarkdown.1
+
 	[ ! -d $(TMP)/usr/lib/perl5 ] || \
 		rmdir --ignore-fail-on-non-empty --parents --verbose \
 		$(TMP)/usr/lib/perl5




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