[Python-modules-commits] [sphinx] 01/01: Relax the check in dh_sphinxdoc to allow different locations of searchindex.js.

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch master
in repository sphinx.

commit 7b1c7a8aacf50e7b5aaa23203de8481d6123d459
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 19 18:23:38 2016 +0300

    Relax the check in dh_sphinxdoc to allow different locations of searchindex.js.
    
    Closes: #841141.
---
 debian/changelog                 | 7 +++++++
 debian/dh-sphinxdoc/dh_sphinxdoc | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e2929d2..00fae77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sphinx (1.4.8-2) UNRELEASED; urgency=medium
+
+  * Relax the check in dh_sphinxdoc to allow different locations of
+    searchindex.js file (closes: #841141).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 19 Oct 2016 18:22:04 +0300
+
 sphinx (1.4.8-1) unstable; urgency=medium
 
   * New upstream bugfix release.
diff --git a/debian/dh-sphinxdoc/dh_sphinxdoc b/debian/dh-sphinxdoc/dh_sphinxdoc
index 4f4cac9..b8d89d9 100755
--- a/debian/dh-sphinxdoc/dh_sphinxdoc
+++ b/debian/dh-sphinxdoc/dh_sphinxdoc
@@ -189,7 +189,7 @@ sub sanity_check($)
     $search =~ s/<!--.*?-->//g; # strip comments
     my %js = ();
     grep { s/[?#].*//; $js{$_} = 1 unless m/^[a-z][a-z0-9.+-]*:/i or excludefile("$path/$_"); } $search =~ m{<script type="text/javascript" src="([^"]++)"></script>}g;
-    my $loads_searchindex = $search =~ m/\QjQuery(function() { Search.loadIndex("searchindex.js"); });\E/;
+    my $loads_searchindex = $search =~ m/\QjQuery(function() { Search.loadIndex("\E/;
     my ($has_source) = $search =~ m{HAS_SOURCE:\s*(true|false)};
     my ($url_root) = $search =~ m{URL_ROOT:\s*'([^']*)'};
     (%js and $loads_searchindex and defined $has_source and defined $url_root) or error("$searchfn doesn't look like a Sphinx search page");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git