summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-10-04 09:06:32 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-10-04 09:06:52 +0000
commitac4154dd166fcb76e12f261c8651cef145610072 (patch)
treec481991b9e492c99faa8a5c1e4c44cda5f2ab486
parentReleasing progress-linux version 1.6.4-1~dschinn1. (diff)
downloadsphinx-ac4154dd166fcb76e12f261c8651cef145610072.zip
sphinx-ac4154dd166fcb76e12f261c8651cef145610072.tar.xz
Merging debian version 1.6.4-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog14
-rw-r--r--debian/control2
-rwxr-xr-xdebian/dh-sphinxdoc/dh_sphinxdoc10
-rw-r--r--debian/patches/cpp_no_assert.diff25
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/sourcelink_suffix_fallback.diff29
6 files changed, 80 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 9a76917..6b495b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+sphinx (1.6.4-2) unstable; urgency=medium
+
+ * Add a note that dh_sphinxdoc does not actually build the documentation
+ to its manpage.
+ * Backport upstream patch to fix wrong AssertionError in C++ domain
+ (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.
+ * Bump Standards-Version to 4.1.1, no changes needed.
+
+ -- Dmitry Shachnev <mitya57@debian.org> Wed, 04 Oct 2017 11:53:44 +0700
+
sphinx (1.6.4-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index f28fa05..e5b8870 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends-Indep: dh-python,
perl
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.4
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/sphinx
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/sphinx
XSBC-Original-Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/sphinx.git
diff --git a/debian/dh-sphinxdoc/dh_sphinxdoc b/debian/dh-sphinxdoc/dh_sphinxdoc
index 0d7f602..76a70bb 100755
--- a/debian/dh-sphinxdoc/dh_sphinxdoc
+++ b/debian/dh-sphinxdoc/dh_sphinxdoc
@@ -80,6 +80,14 @@ It removes the F<websupport.js> file.
=back
+Note that B<dh_sphinxdoc> does not build the documentation, it only performs
+the above operations when the documentation is already installed into the
+package build path. To build the docs, please use L<sphinx-build(1)> command
+or B<python3 -m sphinx> syntax.
+
+You can pass B<--with sphinxdoc> to L<dh(1)> to make it automatically call
+B<dh_sphinxdoc> after B<dh_install>.
+
=head1 OPTIONS
=over 4
@@ -234,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");
diff --git a/debian/patches/cpp_no_assert.diff b/debian/patches/cpp_no_assert.diff
new file mode 100644
index 0000000..2a9b420
--- /dev/null
+++ b/debian/patches/cpp_no_assert.diff
@@ -0,0 +1,25 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Thu, 28 Sep 2017 21:48:22 +0300
+Subject: C++: Do not assert False if type and declType mismatch
+
+Revert to 1.6.4 behavior where a warning was raised instead.
+(cherry picked from commit b01de08e19c918fddd8645c431c071725a623042)
+---
+ sphinx/domains/cpp.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
+index f8a77ce..f55018b 100644
+--- a/sphinx/domains/cpp.py
++++ b/sphinx/domains/cpp.py
+@@ -4963,8 +4963,8 @@ class CPPDomain(Domain):
+ if declTyp == 'templateParam':
+ return True
+ objtypes = self.objtypes_for_role(typ)
+- if objtypes and declTyp in objtypes:
+- return True
++ if objtypes:
++ return declTyp in objtypes
+ print("Type is %s, declType is %s" % (typ, declTyp))
+ assert False
+ if not checkType():
diff --git a/debian/patches/series b/debian/patches/series
index 609a68b..8704642 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ disable_js_version_check.diff
no_snowballstemmer.diff
skip_tests_network.diff
no_require_websupport.diff
+cpp_no_assert.diff
+sourcelink_suffix_fallback.diff
diff --git a/debian/patches/sourcelink_suffix_fallback.diff b/debian/patches/sourcelink_suffix_fallback.diff
new file mode 100644
index 0000000..ebfc589
--- /dev/null
+++ b/debian/patches/sourcelink_suffix_fallback.diff
@@ -0,0 +1,29 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Tue, 3 Oct 2017 18:42:06 +0700
+Subject: Make searchtools.js compatible with pre-Sphinx1.5 templates
+
+There are still plenty of projects which use custom templates where
+DOCUMENTATION_OPTIONS does not define SOURCELINK_SUFFIX.
+
+Currently search does not work in these projects. Make suffix fall
+back to .txt since that is the default value of configuration option.
+
+(cherry picked from commit 9da3bf93ff58e6f9fe4ab503f6e849c45fc05f9f)
+---
+ sphinx/themes/basic/static/searchtools.js_t | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sphinx/themes/basic/static/searchtools.js_t b/sphinx/themes/basic/static/searchtools.js_t
+index 149d162..306fdf5 100644
+--- a/sphinx/themes/basic/static/searchtools.js_t
++++ b/sphinx/themes/basic/static/searchtools.js_t
+@@ -269,6 +269,9 @@ var Search = {
+ });
+ } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
+ var suffix = DOCUMENTATION_OPTIONS.SOURCELINK_SUFFIX;
++ if (suffix === undefined) {
++ suffix = '.txt';
++ }
+ $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[5] + (item[5].slice(-suffix.length) === suffix ? '' : suffix),
+ dataType: "text",
+ complete: function(jqxhr, textstatus) {