[Python-modules-commits] [sphinx] 01/01: Update dh_sphinxdoc for upstream changes to document extensions.

[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 3ada9c7e5889607441a87a53bd1ded6de20cab02
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 20 17:13:54 2016 +0300

    Update dh_sphinxdoc for upstream changes to document extensions.
    
    Introduced in upstream commit 71e1aaf3770831df.
---
 debian/changelog                 |  1 +
 debian/dh-sphinxdoc/dh_sphinxdoc | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e06e1a..8a9bfe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ sphinx (1.5.1-1) UNRELEASED; urgency=medium
   * Backport upstream change to fix Xapian search adapter crashes
     (fix_xapian_search.diff).
   * Skip tests that require internet access (skip_tests_network.diff).
+  * Update dh_sphinxdoc for upstream changes to document extensions.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 15 Dec 2016 11:52:28 +0300
 
diff --git a/debian/dh-sphinxdoc/dh_sphinxdoc b/debian/dh-sphinxdoc/dh_sphinxdoc
index 680f44a..87af1e8 100755
--- a/debian/dh-sphinxdoc/dh_sphinxdoc
+++ b/debian/dh-sphinxdoc/dh_sphinxdoc
@@ -218,13 +218,17 @@ sub sanity_check($)
     }
     for my $page (split(/","/, $index))
     {
-        -f "$path/$page.html"
-            or excludefile("$path/$page.html")
-            or error("$path/$page.html is missing");
+        # If the original file had .rst extension, $page will end with .rst.
+        # If it had .txt extension, $page will have no extension.
         -f "$path/_sources/$page.txt"
             or excludefile("$path/_sources/$page.txt")
             or error("$path/_sources/$page.txt is missing")
             if $has_source;
+        # Get the page basename before appending .html.
+        $page =~ s/\.rst$//;
+        -f "$path/$page.html"
+            or excludefile("$path/$page.html")
+            or error("$path/$page.html is missing");
     }
     if (opendir(D, "$path/_static/"))
     {

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