[Python-modules-commits] r20237 - in packages/sphinx/branches/1.1/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Wednesday, February 1, 2012 @ 14:59:52
  Author: jwilk
Revision: 20237

dh_sphinxodc: remove websupport.js.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/dh-sphinxdoc/dh_sphinxdoc

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2012-02-01 13:04:59 UTC (rev 20236)
+++ packages/sphinx/branches/1.1/debian/changelog	2012-02-01 14:59:52 UTC (rev 20237)
@@ -12,9 +12,10 @@
   * Revert all the changes to manual pages that accumulated over the years.
   * Document that symlinking translations.js and non-English searchtools.js is
     not supported (see bug #658238).
-  * Don't include websupport.js in libjs-jquery.
+  * Don't include websupport.js in libjs-jquery. Make dh_sphinxdoc remove this
+    file from binary package.
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 01 Feb 2012 14:00:29 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 01 Feb 2012 15:57:10 +0100
 
 sphinx (1.1.2+dfsg-1) experimental; urgency=low
 

Modified: packages/sphinx/branches/1.1/debian/dh-sphinxdoc/dh_sphinxdoc
===================================================================
--- packages/sphinx/branches/1.1/debian/dh-sphinxdoc/dh_sphinxdoc	2012-02-01 13:04:59 UTC (rev 20236)
+++ packages/sphinx/branches/1.1/debian/dh-sphinxdoc/dh_sphinxdoc	2012-02-01 14:59:52 UTC (rev 20237)
@@ -57,6 +57,10 @@
 
 It removes the F<.buildinfo> file.
 
+=item *
+
+It removes the F<websupport.js> file.
+
 =back
 
 =head1 OPTIONS
@@ -90,6 +94,7 @@
 use Debian::Debhelper::Dh_Lib;
 
 my %packaged_js = ();
+my @cruft_js = qw(websupport.js);
 
 sub md5($)
 {
@@ -217,11 +222,12 @@
     my $message = "unknown JavaScript code: $js";
     $js =~ s{.*/}{};
     my $basic = grep { $_ eq $js } qw(searchtools.js doctools.js jquery.js underscore.js);
+    my $cruft = grep { $_ eq $js } @cruft_js;
     if ($basic)
     {
         error("error: $message");
     }
-    else
+    elsif (not $cruft)
     {
         warning("ignoring $message");
     }
@@ -297,6 +303,12 @@
         my $buildinfo = "$path/.buildinfo";
         doit('rm', '-f', $buildinfo) if -f $buildinfo;
     }
+    foreach my $js (@cruft_js)
+    {
+        my $js = "$path/_static/$js";
+        next if excludefile($js);
+        doit('rm', '-f', $js) if -f $js;
+    }
 }
  
 sub fix_sphinx_doc($$)