[Python-modules-commits] r17785 - in packages/sphinx/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, July 9, 2011 @ 20:55:19
  Author: jwilk
Revision: 17785

dh_sphinxdoc: store list of known .js in an index file.

Added:
  packages/sphinx/trunk/debian/dh-sphinxdoc/index
  packages/sphinx/trunk/debian/libjs-sphinxdoc.install
Modified:
  packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc

Modified: packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2011-07-09 20:51:33 UTC (rev 17784)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/dh_sphinxdoc	2011-07-09 20:55:19 UTC (rev 17785)
@@ -46,12 +46,31 @@
 
 sub load_packaged_js()
 {
+    my %versions = ();
     my $root = tmpdir('libjs-sphinxdoc');    
     $root = '' unless -d $root;
+    my $path = "$root/usr/share/javascript/sphinxdoc";
+    open(F, '<', "$path/index") or error("cannot open $path/index");
+    while (<F>)
+    {
+        chomp;
+        next if /^(#|\s*$)/;
+        my ($js, $minver) = split(/\s+/, $_, 2);
+        unless (defined($minver))
+        {
+            $js =~ m{^([0-9.]+)/} or error("syntax error in $path/index");
+            $minver = $1;
+        }
+        $versions{$js} = $minver;
+    }
+    close(F);
     find({
         wanted => sub {
             my $js = $_;
-            my ($version, $name) = m{([0-9.]+)/(\w+[.]js)$} or return;
+            my ($jsbase, $jsname) = m{([0-9.]+/(\w+[.]js))$} or return;
+            my $version = $versions{$jsbase};
+            defined($version) or error("$jsbase is not in the index; is it up-to-date?");
+            delete $versions{$jsbase};
             my $md5;
             if (-l $js)
             {
@@ -71,10 +90,11 @@
             $js =~ s{^\Q$root\E}{};
             my $data = [$js, "libjs-sphinxdoc (>= $version)"];
             $packaged_js{$md5} = $data;
-            $packaged_js{$name} = $data;
+            $packaged_js{$jsname} = $data;
         },
         no_chdir => 1
-    }, "$root/usr/share/javascript/sphinxdoc/");
+    }, $path);
+    map { error("$path/$_ is missing") } keys(%versions);
 }
 
 sub looks_like_sphinx_doc($)

Added: packages/sphinx/trunk/debian/dh-sphinxdoc/index
===================================================================
--- packages/sphinx/trunk/debian/dh-sphinxdoc/index	                        (rev 0)
+++ packages/sphinx/trunk/debian/dh-sphinxdoc/index	2011-07-09 20:55:19 UTC (rev 17785)
@@ -0,0 +1,7 @@
+# <filename> [min-version]
+1.0/doctools.js
+1.0/jquery.js
+1.0/searchtools.js
+1.0/sidebar.js
+1.0/theme_extras.js
+1.0/underscore.js

Added: packages/sphinx/trunk/debian/libjs-sphinxdoc.install
===================================================================
--- packages/sphinx/trunk/debian/libjs-sphinxdoc.install	                        (rev 0)
+++ packages/sphinx/trunk/debian/libjs-sphinxdoc.install	2011-07-09 20:55:19 UTC (rev 17785)
@@ -0,0 +1 @@
+debian/dh-sphinxdoc/index /usr/share/javascript/sphinxdoc/