r72412 - in /trunk/libapache2-mod-perl2/debian: clean libapache2-mod-perl2-doc.install libapache2-mod-perl2-doc.links rules transform_pod2html.pl

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

Author: periapt-guest
Date: Sat Apr  9 19:51:44 2011
New Revision: 72412

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72412
Log:
making progress with dwww but docs has slipped back into the top layer

Added:
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.links
Modified:
    trunk/libapache2-mod-perl2/debian/clean
    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/clean
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/clean?rev=72412&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/clean (original)
+++ trunk/libapache2-mod-perl2/debian/clean Sat Apr  9 19:51:44 2011
@@ -8,3 +8,4 @@
 ModPerl-Registry/Makefile.old t/conf/perlsection.conf
 t/htdocs/perlio/test
 Makefile
+debian/index.html

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=72412&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install (original)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install Sat Apr  9 19:51:44 2011
@@ -1,2 +1,3 @@
 todo /usr/share/doc/libapache2-mod-perl2-doc
+debian/index.html /usr/share/doc/libapache2-mod-perl2-doc
 debian/docs /usr/share/doc/libapache2-mod-perl2-doc

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.links
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.links?rev=72412&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.links (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.links Sat Apr  9 19:51:44 2011
@@ -1,0 +1,2 @@
+usr/share/doc/libapache2-mod-perl2-doc/docs/ usr/share/doc/libapache2-mod-perl2-doc/docs/2.0
+

Modified: trunk/libapache2-mod-perl2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/rules?rev=72412&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (original)
+++ trunk/libapache2-mod-perl2/debian/rules Sat Apr  9 19:51:44 2011
@@ -38,7 +38,7 @@
 
 override_dh_install:
 	mkdir -p $(CURDIR)/debian/docs
-	perl debian/transform_pod2html.pl $(CURDIR) docs debian/docs
+	perl debian/transform_pod2html.pl $(CURDIR) docs debian
 	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=72412&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/transform_pod2html.pl (original)
+++ trunk/libapache2-mod-perl2/debian/transform_pod2html.pl Sat Apr  9 19:51:44 2011
@@ -15,8 +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';
+#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;
 
@@ -43,7 +43,9 @@
     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);
-    my $newdir = File::Spec->catdir($CUR_DIR, $DEST_DIR, @dirs);
+#    shift @dirs; # should be docs
+    my $catdirs = File::Spec->catdir(@dirs);
+    my $newdir = File::Spec->catdir($CUR_DIR, $DEST_DIR, $catdirs);
     make_path($newdir, {verbose=>1});
     my $oldfile = File::Spec->catfile($CUR_DIR, $File::Find::name);
     if ($ext eq 'pod') {
@@ -57,15 +59,17 @@
             "--outfile=$newfile",
             "--podroot=$CUR_DIR",
             "--verbose",
-            "--htmldir=$CUR_DIR/debian/docs",
-            "--htmlroot=$HTML_ROOT",
+            "--htmldir=$CUR_DIR/debian",
+#            "--htmlroot=$HTML_ROOT",
         );
     }
     else {
         copy($oldfile, $newfile);
     }
-    my $new_url_dir = File::Spec->catdir($HTML_ROOT, '2.0', @dirs);    
-    index_file($name, "/$new_url_dir/$name", $ext, @dirs);
+    my $index_file = "/${catdirs}/$name";
+    $index_file =~ s{^/+}{};
+    $index_file =~ s{/+}{/}g;
+    index_file($name, $index_file, $ext, @dirs);
     return;
 }