r72028 - in /trunk/libapache2-mod-perl2/debian: changelog control index.tmpl libapache2-mod-perl2-doc.doc-base libapache2-mod-perl2-doc.install rules transform_pod2html.pl

periapt-guest at users.alioth.debian.org periapt-guest at users.alioth.debian.org
Tue Mar 29 08:49:11 UTC 2011


Author: periapt-guest
Date: Tue Mar 29 08:48:59 2011
New Revision: 72028

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72028
Log:
  Idea: pdf : Use libpdf-create-perl to convert .png -> .pdf
  Need to index HTML files
  - Added dwww as a recommendation to doc package
  - Transformed .pod files to indexed HTML files

Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/control
    trunk/libapache2-mod-perl2/debian/index.tmpl
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.doc-base
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install
    trunk/libapache2-mod-perl2/debian/rules
    trunk/libapache2-mod-perl2/debian/transform_pod2html.pl

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=72028&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Tue Mar 29 08:48:59 2011
@@ -3,12 +3,9 @@
   TODO:
   - DEB_BUILD_OPTIONS does not seem to work
   - Resolve doc-base issues
-    Idea: support text, html, pdf
-        text: pod2text
-        html: pod2html
-        pdf : Use libpdf-create-perl to convert .png -> .pdf
+    Check that there are as few broken links as possible
+    Idea: pdf : Use libpdf-create-perl to convert .png -> .pdf
     Need to index HTML files
-    Check that there are as few broken links as possible
   - doc package should recommend dwww
   - Check dependencies
 
@@ -19,7 +16,8 @@
   * Added versioning of depdendency between dev and core packages
   * Registered documents with doc-base (in progress)
     - Adding todo files to doc package
-    - Experimental script to transform pod files to HTML
+    - Added dwww as a recommendation to doc package
+    - Transformed .pod files to indexed HTML files
   * New upstream release
   * Reviewed patches
     - Removed 009_allow_parallel_build.patch [applied upstream]

Modified: trunk/libapache2-mod-perl2/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/control?rev=72028&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/control (original)
+++ trunk/libapache2-mod-perl2/debian/control Tue Mar 29 08:48:59 2011
@@ -9,12 +9,12 @@
 Homepage: http://perl.apache.org/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libapache2-mod-perl2/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libapache2-mod-perl2/
-Build-Depends: perl (>= 5.8.7-3), libperl-dev (>= 5.8.7-3),
+Build-Depends: perl (>= 5.8.7-3), libperl-dev (>= 5.8.7-3), libautodie-perl,
  apache2-threaded-dev (>= 2.2.3) | apache2-prefork-dev (>= 2.2.3),
  debhelper (>= 7.0.50~), libwww-perl, libdevel-symdump-perl,
  libhtml-parser-perl, libgdbm-dev, libgtop2-dev, apache2, libcompress-zlib-perl,
- libbsd-resource-perl, locales-all, netbase,
- perl (>= 5.10.0-14) | libcgi-pm-perl (>= 3.33)
+ libbsd-resource-perl, locales-all, netbase, libhtml-template-perl,
+ perl (>= 5.10.0-14) | libcgi-pm-perl (>= 3.33), libreadonly-perl
 Build-Conflicts: libapache2-mod-perl2 (<= 1.999.22-1)
 
 Package: libapache2-mod-perl2
@@ -38,6 +38,7 @@
 Section: libdevel
 Depends: ${misc:Depends}, libapache2-mod-perl2 (>= ${source:Version}),
  libapache2-mod-perl2 (<< ${source:Version}.1~)
+Recommends: dwww
 Description: Integration of perl with the Apache2 web server - development files
  mod_perl allows the use of Perl for just about anything
  Apache-related, including <Perl> sections in the config

Modified: trunk/libapache2-mod-perl2/debian/index.tmpl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/index.tmpl?rev=72028&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/index.tmpl (original)
+++ trunk/libapache2-mod-perl2/debian/index.tmpl Tue Mar 29 08:48:59 2011
@@ -18,11 +18,9 @@
 
 	<li><a href="#name">NAME</a></li>
 	<ul>
-
-		<li><a href="#api">api</a></li>
-		<li><a href="#devel">devel</a></li>
-		<li><a href="#os">os</a></li>
-		<li><a href="#user">user</a></li>
+<TMPL_LOOP NAME="sections">
+		<li><a href="#<TMPL_VAR NAME="title">"><TMPL_VAR NAME="title"></a></li>
+</TMPL_LOOP>
 	</ul>
 
 </ul>
@@ -31,22 +29,33 @@
 </div>
 <!-- INDEX END -->
 
-<p>
-</p>
+<ul>
+<TMPL_LOOP NAME="links">
+<li><a name="<TMPL_VAR NAME="href">"><TMPL_VAR NAME="text"></a></li>
+</TMPL_LOOP>
+</ul>
 <h1><a name="name">NAME</a></h1>
 <p>index</p>
 <p>
 </p>
-<h2><a name="api">api</a></h2>
-<p>
-</p>
-<h2><a name="devel">devel</a></h2>
-<p>
-</p>
-<h2><a name="os">os</a></h2>
-<p>
-</p>
-<h2><a name="user">user</a></h2>
+<TMPL_LOOP NAME="sections">
+<h2><a name="<TMPL_VAR NAME="title">"><TMPL_VAR NAME="title"></a></h2>
+<ul>
+<TMPL_LOOP NAME="links">
+<li><a name="<TMPL_VAR NAME="href">"><TMPL_VAR NAME="text"></a></li>
+</TMPL_LOOP>
+</ul>
+<ul>
+<TMPL_LOOP NAME="sections">
+<h3><a name="<TMPL_VAR NAME="title">"><TMPL_VAR NAME="title"></a></h3>
+<ul>
+<TMPL_LOOP NAME="links">
+<li><a name="<TMPL_VAR NAME="href">"><TMPL_VAR NAME="text"></a></li>
+</TMPL_LOOP>
+</ul>
+</TMPL_LOOP>
+</ul>
+</TMPL_LOOP>
 
 </body>
 

Modified: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.doc-base
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.doc-base?rev=72028&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.doc-base (original)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.doc-base Tue Mar 29 08:48:59 2011
@@ -13,6 +13,10 @@
  /usr/share/doc/libapache2-mod-perl2-doc/TODO
  /usr/share/doc/libapache2-mod-perl2-doc/todo
 
+Format: HTML
+Index: /usr/share/doc/libapache2-mod-perl2-doc/2.0/index.html
+Files: /usr/share/doc/libapache2-mod-perl2-doc/2.0/*
+
 Format: PDF
 Files:
 

Modified: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install?rev=72028&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install (original)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install Tue Mar 29 08:48:59 2011
@@ -1,2 +1,2 @@
 todo /usr/share/doc/libapache2-mod-perl2-doc
-docs/* /usr/share/doc/libapache2-mod-perl2-doc
+debian/docs/* /usr/share/doc/libapache2-mod-perl2-doc

Modified: trunk/libapache2-mod-perl2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/rules?rev=72028&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (original)
+++ trunk/libapache2-mod-perl2/debian/rules Tue Mar 29 08:48:59 2011
@@ -24,11 +24,13 @@
 
 override_dh_clean:
 	dh_clean
-	rm -rf t/htdocs/hooks lib/Apache WrapXS
-        find . -name 'pod2htmd.tmp' -exec rm '{}' \;
-        find . -name 'pod2htmi.tmp' -exec rm '{}' \;
+	rm -rf t/htdocs/hooks lib/Apache WrapXS debian/docs
+	find . -name 'pod2htmd.tmp' -exec rm '{}' \;
+	find . -name 'pod2htmi.tmp' -exec rm '{}' \;
 
 override_dh_install:
+	mkdir -p $(CURDIR)/debian/docs/2.0
+	debian/transform_pod2html.pl $(CURDIR) docs debian/docs/2.0
 	dh_install
 	mv $(TMP)/usr/bin/mp2bug $(TMP)/usr/share/libapache2-mod-perl2/
 	rm -rf $(TMP)/usr/bin/

Modified: trunk/libapache2-mod-perl2/debian/transform_pod2html.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/transform_pod2html.pl?rev=72028&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/transform_pod2html.pl (original)
+++ trunk/libapache2-mod-perl2/debian/transform_pod2html.pl Tue Mar 29 08:48:59 2011
@@ -4,11 +4,12 @@
 use File::Find;
 use File::Spec;
 use Pod::Html;
-use HTML::Template;
 use File::Path qw(make_path);
 
-# dependencies: libreadonly-perl
+# dependencies
 use Readonly;
+use autodie qw(open close);
+use HTML::Template;
 
 Readonly my $CUR_DIR => $ARGV[0];
 Readonly my $SRC_DIR => $ARGV[1];
@@ -22,7 +23,11 @@
 my %data = (links=>[],sections=>[]);
 
 find( \&transform_pod2html, $SRC_DIR );
-my $template = HTML::Template->new(filename=>"$CUR_DIR/debian/index.tmpl");
+my $template = HTML::Template->new(filename=>"$CUR_DIR/debian/index.tmpl", die_on_bad_params=>0);
+$template->param(%data);
+open my $fh,'>', "$CUR_DIR/$DEST_DIR/index.html";
+print {$fh} $template->output;
+close$fh;
 
 exit(0);
 




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