[Python-modules-commits] [sphinx] 02/02: Update dh_sphinxdoc for the previous change.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch debian/master
in repository sphinx.

commit d4a7a211bff165e14e1072c5c6e5354fd90171d6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Oct 4 11:32:54 2017 +0700

    Update dh_sphinxdoc for the previous change.
    
    There is no more need to error about missing SOURCELINK_SUFFIX.
---
 debian/changelog                 | 2 ++
 debian/dh-sphinxdoc/dh_sphinxdoc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8af8bb7..345bf92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ sphinx (1.6.4-2) UNRELEASED; urgency=medium
     (cpp_no_assert.diff; closes: #877014).
   * Backport upstream patch to make searchtools.js work with pre-Sphinx 1.5
     templates (sourcelink_suffix_fallback.diff).
+  * Update dh_sphinxdoc for the above change: there is no more need to error
+    about missing SOURCELINK_SUFFIX.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 28 Sep 2017 19:44:01 +0300
 
diff --git a/debian/dh-sphinxdoc/dh_sphinxdoc b/debian/dh-sphinxdoc/dh_sphinxdoc
index 3512c96..76a70bb 100755
--- a/debian/dh-sphinxdoc/dh_sphinxdoc
+++ b/debian/dh-sphinxdoc/dh_sphinxdoc
@@ -242,11 +242,11 @@ sub sanity_check($$)
     my $loads_searchindex = $search =~ m/\QjQuery(function() { Search.loadIndex("\E/;
     my ($has_source) = $search =~ m{HAS_SOURCE:\s*(true|false)};
     my ($sourcelink_suffix) = $search =~ m{SOURCELINK_SUFFIX:\s*'([^']*)'};
+    $sourcelink_suffix = ".txt" unless defined $sourcelink_suffix;
     my ($url_root) = $search =~ m{URL_ROOT:\s*'([^']*)'};
     %js or error("$searchfn does not include any JavaScript code");
     $is_singlehtml or $loads_searchindex or error("$searchfn does not load searchindex.js");
     defined $has_source or error("DOCUMENTATION_OPTIONS does not define HAS_SOURCE");
-    defined $sourcelink_suffix or error("DOCUMENTATION_OPTIONS does not define SOURCELINK_SUFFIX");
     defined $url_root or error("DOCUMENTATION_OPTIONS does not define URL_ROOT");
     $has_source = $has_source eq 'true';
     $url_root =~ m{^([a-z]+:/)?/} and error("URL_ROOT in $searchfn is not relative");

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