[Python-modules-commits] [sphinx] 03/03: Drop cpp_no_assert and sourcelink_suffix_fallback.diff.

[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 b97e3df9421bef44477e7f3b57b5ed1ffc92787f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 23 12:19:40 2017 +0300

    Drop cpp_no_assert and sourcelink_suffix_fallback.diff.
    
    Applied in the new release.
---
 debian/changelog                               |  2 ++
 debian/patches/cpp_no_assert.diff              | 25 ----------------------
 debian/patches/series                          |  2 --
 debian/patches/sourcelink_suffix_fallback.diff | 29 --------------------------
 4 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d463b4..909786f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ sphinx (1.6.5-1) UNRELEASED; urgency=medium
   * New upstream release.
   * In singlehtml check, consider only HTML files that use doctools.js
     (closes: #872863).
+  * Drop cpp_no_assert and sourcelink_suffix_fallback.diff, applied in the
+    new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 22 Oct 2017 14:50:24 +0300
 
diff --git a/debian/patches/cpp_no_assert.diff b/debian/patches/cpp_no_assert.diff
deleted file mode 100644
index 2a9b420..0000000
--- a/debian/patches/cpp_no_assert.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Dmitry Shachnev <mitya57 at 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 8704642..609a68b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ 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
deleted file mode 100644
index ebfc589..0000000
--- a/debian/patches/sourcelink_suffix_fallback.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Dmitry Shachnev <mitya57 at 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) {

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