[Python-modules-commits] [sphinx-rtd-theme] 01/01: Update patches for the new release.

Dmitry Shachnev mitya57 at moszumanska.debian.org
Tue Jun 20 11:59:15 UTC 2017


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

mitya57 pushed a commit to branch master
in repository sphinx-rtd-theme.

commit 3a3ecd0a61f094acb94fad41b804f09298561b6d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jun 20 14:57:10 2017 +0300

    Update patches for the new release.
    
    - Drop do-not-require-sphinx.patch, applied upstream.
    - Drop sourcelink-suffix.patch, it was coming from upstream.
    - Rebase theme-path.patch.
    
    Gbp-Dch: Full
---
 debian/patches/do-not-require-sphinx.patch | 14 --------------
 debian/patches/series                      |  2 --
 debian/patches/sourcelink-suffix.patch     | 30 ------------------------------
 debian/patches/theme-path.patch            |  8 ++++----
 4 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/debian/patches/do-not-require-sphinx.patch b/debian/patches/do-not-require-sphinx.patch
deleted file mode 100644
index da76ba0..0000000
--- a/debian/patches/do-not-require-sphinx.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Do not require sphinx 
- Needed to avoid circular dependency with sphinx. It is replaced by a
- Recommends.
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug: https://github.com/snide/sphinx_rtd_theme/issues/189
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783795
-Last-Update: 2015-05-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1 +1 @@
--sphinx>=1.3
-+
diff --git a/debian/patches/series b/debian/patches/series
index fc4479a..f4ed938 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-do-not-require-sphinx.patch
 theme-path.patch
-sourcelink-suffix.patch
diff --git a/debian/patches/sourcelink-suffix.patch b/debian/patches/sourcelink-suffix.patch
deleted file mode 100644
index 8f7511b..0000000
--- a/debian/patches/sourcelink-suffix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: add missing SOURCELINK_SUFFIX
- Adds DOCUMENTATION_OPTIONS.SOURCELINK_SUFFIX which is expected by the
- searchtools.js.
-Origin: upstream, https://github.com/snide/sphinx_rtd_theme/commit/a5e0e304d30ed7aa
-Last-Update: 2017-02-01
-
---- a/sphinx_rtd_theme/layout.html
-+++ b/sphinx_rtd_theme/layout.html
-@@ -167,7 +167,8 @@
-             VERSION:'{{ release|e }}',
-             COLLAPSE_INDEX:false,
-             FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
--            HAS_SOURCE:  {{ has_source|lower }}
-+            HAS_SOURCE:  {{ has_source|lower }},
-+            SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
-         };
-     </script>
-     {%- for scriptfile in script_files %}
---- a/sphinx_rtd_theme/layout_old.html
-+++ b/sphinx_rtd_theme/layout_old.html
-@@ -91,7 +91,8 @@
-         VERSION:     '{{ release|e }}',
-         COLLAPSE_INDEX: false,
-         FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
--        HAS_SOURCE:  {{ has_source|lower }}
-+        HAS_SOURCE:  {{ has_source|lower }},
-+        SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
-       };
-     </script>
-     {%- for scriptfile in script_files %}
diff --git a/debian/patches/theme-path.patch b/debian/patches/theme-path.patch
index b28777b..f4e2ab8 100644
--- a/debian/patches/theme-path.patch
+++ b/debian/patches/theme-path.patch
@@ -1,11 +1,11 @@
 Description: use /usr/share/ as theme path
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
-Last-Update: 2016-01-11
+Last-Update: 2017-06-20
 
 --- a/sphinx_rtd_theme/__init__.py
 +++ b/sphinx_rtd_theme/__init__.py
-@@ -13,5 +13,4 @@
+@@ -11,5 +11,4 @@
  
  def get_html_theme_path():
      """Return list of HTML theme paths."""
@@ -26,6 +26,6 @@ Last-Update: 2016-01-11
 -        'static/font/*.*'
 -    ]},
 -    include_package_data=True,
-     install_requires=open('requirements.txt').read().splitlines(),
      classifiers=[
-         'Development Status :: 3 - Alpha',
+         'Development Status :: 5 - Production/Stable',
+         'License :: OSI Approved :: MIT License',

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



More information about the Python-modules-commits mailing list