r72094 - in /trunk/libapache2-mod-perl2/debian: libapache2-mod-perl2-doc.doc-base libapache2-mod-perl2-doc.install rules transform_pod2html.pl

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Thu Mar 31 14:58:04 2011
New Revision: 72094

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72094
Log:
pod2html seems to insist on doc directory

Modified:
    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/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=72094&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 Thu Mar 31 14:58:04 2011
@@ -13,6 +13,6 @@
  /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/*
+Index: /usr/share/doc/libapache2-mod-perl2-doc/docs/index.html
+Files: /usr/share/doc/libapache2-mod-perl2-doc/docs
 

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=72094&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install (original)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install Thu Mar 31 14:58:04 2011
@@ -1,2 +1,2 @@
 todo /usr/share/doc/libapache2-mod-perl2-doc
-debian/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=72094&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (original)
+++ trunk/libapache2-mod-perl2/debian/rules Thu Mar 31 14:58:04 2011
@@ -29,8 +29,8 @@
 	find . -name 'pod2htmi.tmp' -exec rm '{}' \;
 
 override_dh_install:
-	mkdir -p $(CURDIR)/debian/docs/2.0
-	perl debian/transform_pod2html.pl $(CURDIR) docs debian/docs/2.0
+	mkdir -p $(CURDIR)/debian/docs
+	perl debian/transform_pod2html.pl $(CURDIR) docs debian/docs
 	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=72094&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/transform_pod2html.pl (original)
+++ trunk/libapache2-mod-perl2/debian/transform_pod2html.pl Thu Mar 31 14:58:04 2011
@@ -15,6 +15,8 @@
 Readonly my $CUR_DIR => $ARGV[0];
 Readonly my $SRC_DIR => $ARGV[1];
 Readonly my $DEST_DIR => $ARGV[2];
+Readonly my $HTML_ROOT =>
+    '/cgi-bin/dwww/usr/share/doc/libapache2-mod-perl2-doc';
 croak "No source directory: $SRC_DIR" if not -d $SRC_DIR;
 croak "No destination directory: $DEST_DIR" if not -d $DEST_DIR;
 
@@ -41,7 +43,6 @@
     return if $ext ne 'pod' and $ext ne 'png';
     my ($v, $directories, $file) = File::Spec->splitpath($File::Find::name);
     my @dirs = File::Spec->splitdir($directories);
-    shift @dirs; # should be 'docs'
     my $newdir = File::Spec->catdir($CUR_DIR, $DEST_DIR, @dirs);
     make_path($newdir, {verbose=>1});
     my $oldfile = File::Spec->catfile($CUR_DIR, $File::Find::name);
@@ -51,15 +52,19 @@
     my $newfile = File::Spec->catfile($newdir, $name);
     print "$File::Find::name -> $newfile\n";
     if ($ext eq 'pod') {
-        pod2html("--infile=$oldfile", "--outfile=$newfile");
+        pod2html(
+            "--infile=$oldfile",
+            "--outfile=$newfile",
+            "--podroot=$CUR_DIR",
+            "--verbose",
+            "--htmldir=$CUR_DIR/debian/docs",
+            "--htmlroot=$HTML_ROOT",
+        );
     }
     else {
         copy($oldfile, $newfile);
     }
-    my $new_url_dir = File::Spec->catdir(
-        'cgi-bin', 'dwww', 'usr', 'share', 'doc', 'libapache2-mod-perl2-doc',
-        @dirs
-    );    
+    my $new_url_dir = File::Spec->catdir($HTML_ROOT, '2.0', @dirs);    
     index_file($name, "/$new_url_dir/$name", $ext, @dirs);
     return;
 }