diff -pruN 0.4.0+dfsg-1/bower.json 0.4.2+dfsg-1/bower.json --- 0.4.0+dfsg-1/bower.json 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/bower.json 2018-10-05 13:18:13.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "sphinx-rtd-theme", - "version": "0.4.0", + "version": "0.4.2", "homepage": "https://github.com/rtfd/sphinx_rtd_theme", "authors": [ "Dave Snider, Read the Docs, Inc. & contributors " diff -pruN 0.4.0+dfsg-1/debian/changelog 0.4.2+dfsg-1/debian/changelog --- 0.4.0+dfsg-1/debian/changelog 2018-07-05 16:36:50.000000000 +0000 +++ 0.4.2+dfsg-1/debian/changelog 2018-10-09 16:12:42.000000000 +0000 @@ -1,3 +1,12 @@ +sphinx-rtd-theme (0.4.2+dfsg-1) unstable; urgency=medium + + * New upstream release. + * Sphinx is now listed in install_requires. Stop recommending it. + * Add .gitattributes and docs/make.bat to debian/clean. + * Bump Standards-Version to 4.2.1, no changes needed. + + -- Dmitry Shachnev Tue, 09 Oct 2018 19:12:42 +0300 + sphinx-rtd-theme (0.4.0+dfsg-1) unstable; urgency=medium [ Ondřej Nový ] diff -pruN 0.4.0+dfsg-1/debian/clean 0.4.2+dfsg-1/debian/clean --- 0.4.0+dfsg-1/debian/clean 2018-07-05 16:36:50.000000000 +0000 +++ 0.4.2+dfsg-1/debian/clean 2018-10-09 16:12:42.000000000 +0000 @@ -1,4 +1,6 @@ +.gitattributes .pytest_cache/ .sass-cache/ +docs/make.bat sphinx_rtd_theme.egg-info/ sphinx_rtd_theme/static/ diff -pruN 0.4.0+dfsg-1/debian/control 0.4.2+dfsg-1/debian/control --- 0.4.0+dfsg-1/debian/control 2018-07-05 16:36:50.000000000 +0000 +++ 0.4.2+dfsg-1/debian/control 2018-10-09 16:12:42.000000000 +0000 @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 11), python3-sphinx, ruby-sass, woff2 -Standards-Version: 4.1.5 +Standards-Version: 4.2.1 Homepage: https://github.com/rtfd/sphinx_rtd_theme Vcs-Git: https://salsa.debian.org/python-team/modules/sphinx-rtd-theme.git Vcs-Browser: https://salsa.debian.org/python-team/modules/sphinx-rtd-theme @@ -44,7 +44,6 @@ Architecture: all Depends: sphinx-rtd-theme-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends} -Recommends: ${python:Recommends} Description: sphinx theme from readthedocs.org (Python 2) This mobile-friendly sphinx theme was initially created for readthedocs.org, but can be incorporated in any project. @@ -59,7 +58,6 @@ Architecture: all Depends: sphinx-rtd-theme-common (= ${binary:Version}), ${misc:Depends}, ${python3:Depends} -Recommends: ${python3:Recommends} Description: sphinx theme from readthedocs.org (Python 3) This mobile-friendly sphinx theme was initially created for readthedocs.org, but can be incorporated in any project. diff -pruN 0.4.0+dfsg-1/debian/rules 0.4.2+dfsg-1/debian/rules --- 0.4.0+dfsg-1/debian/rules 2018-07-05 16:36:50.000000000 +0000 +++ 0.4.2+dfsg-1/debian/rules 2018-10-09 16:12:42.000000000 +0000 @@ -32,12 +32,6 @@ override_dh_auto_build: set -ex; cd sphinx_rtd_theme/static/fonts/; for ttf in *.ttf; do woff2_compress $$ttf; done dh_auto_build -override_dh_python2: - dh_python2 --recommends=sphinx - -override_dh_python3: - dh_python3 --recommends=sphinx - override_dh_link: dh_link -p sphinx-rtd-theme-common rm -rf $(PY2_PATH)/static $(PY3_PATH)/static diff -pruN 0.4.0+dfsg-1/docs/changelog.rst 0.4.2+dfsg-1/docs/changelog.rst --- 0.4.0+dfsg-1/docs/changelog.rst 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/docs/changelog.rst 2018-10-05 13:18:13.000000000 +0000 @@ -3,6 +3,44 @@ Changelog ********* +v0.4.2 +====== + +:Date: Oct 5, 2018 + +New Features +------------- + +Fixes +----- + +* Set base font size on (#668) +* Fix HTML search not working with Sphinx-1.8 (#672) + +Other Changes +-------------- + +* Upload signed packages to PyPI with twine (#651) +* Do not enforce period at the end of copyright statement (666) + +v0.4.1 +====== + +:Date: July 27, 2018 + +New Features +------------- + +Fixes +----- + +* Line height adjustments for Liberation Mono (#656) + +Other Changes +-------------- + +* Add Sphinx as a dependency + v0.4.0 ====== diff -pruN 0.4.0+dfsg-1/docs/contributing.rst 0.4.2+dfsg-1/docs/contributing.rst --- 0.4.0+dfsg-1/docs/contributing.rst 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/docs/contributing.rst 2018-10-05 13:18:13.000000000 +0000 @@ -80,7 +80,14 @@ you should do the following: #. Commit that change. #. Tag the release in git: ``git tag $NEW_VERSION``. #. Push the tag to GitHub: ``git push --tags origin``. -#. Upload the package to PyPI: ``python setup.py sdist bdist_wheel upload``. +#. Upload the package to PyPI: + + .. code:: bash + + $ rm -rf dist/ + $ python setup.py sdist bdist_wheel + $ twine upload --sign --identity security@readthedocs.org dist/* + #. In the ``readthedocs.org`` repo, edit the ``bower.json`` file to point at the correct version (``sphinx-rtd-theme": "https://github.com/rtfd/sphinx-rtd-theme.git#$NEW_VERSION"``). #. In the ``readthedocs.org`` repo, run ``gulp build`` to update the distributed theme files. diff -pruN 0.4.0+dfsg-1/package.json 0.4.2+dfsg-1/package.json --- 0.4.0+dfsg-1/package.json 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/package.json 2018-10-05 13:18:13.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "sphinx_rtd_theme", - "version": "0.4.0", + "version": "0.4.2", "private": true, "devDependencies": { "bower": "^1.8.4", diff -pruN 0.4.0+dfsg-1/README.rst 0.4.2+dfsg-1/README.rst --- 0.4.0+dfsg-1/README.rst 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/README.rst 2018-10-05 13:18:13.000000000 +0000 @@ -17,7 +17,7 @@ Read the Docs Sphinx Theme :alt: Documentation Status The ``sphinx_rtd_theme`` is a sphinx_ theme designed to look modern and be mobile-friendly. -This theme is primary focused to be used on readthedocs.org_ but can work with your +This theme is primarily focused to be used on readthedocs.org_ but can work with your own sphinx projects. To read more and see a working demo_ head over to readthedocs.org_. .. _sphinx: http://www.sphinx-doc.org diff -pruN 0.4.0+dfsg-1/sass/_theme_layout.sass 0.4.2+dfsg-1/sass/_theme_layout.sass --- 0.4.0+dfsg-1/sass/_theme_layout.sass 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/sass/_theme_layout.sass 2018-10-05 13:18:13.000000000 +0000 @@ -1,3 +1,7 @@ +// Set uniform (but not relative) base font size +html + font-size: $base-font-size + .wy-affix position: fixed top: $gutter diff -pruN 0.4.0+dfsg-1/sass/_theme_rst.sass 0.4.2+dfsg-1/sass/_theme_rst.sass --- 0.4.0+dfsg-1/sass/_theme_rst.sass 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/sass/_theme_rst.sass 2018-10-05 13:18:13.000000000 +0000 @@ -93,7 +93,7 @@ pre.literal-block, div[class^='highlight'] pre, .linenodiv pre font-family: $code-font-family font-size: 12px - line-height: normal + line-height: 1.4 @media print .codeblock, div[class^='highlight'], div[class^='highlight'] pre diff -pruN 0.4.0+dfsg-1/setup.py 0.4.2+dfsg-1/setup.py --- 0.4.0+dfsg-1/setup.py 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/setup.py 2018-10-05 13:18:13.000000000 +0000 @@ -34,6 +34,9 @@ setup( 'sphinx_rtd_theme = sphinx_rtd_theme', ] }, + install_requires=[ + 'sphinx' + ], classifiers=[ 'Framework :: Sphinx', 'Framework :: Sphinx :: Theme', diff -pruN 0.4.0+dfsg-1/sphinx_rtd_theme/footer.html 0.4.2+dfsg-1/sphinx_rtd_theme/footer.html --- 0.4.0+dfsg-1/sphinx_rtd_theme/footer.html 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/sphinx_rtd_theme/footer.html 2018-10-05 13:18:13.000000000 +0000 @@ -16,9 +16,9 @@

{%- if show_copyright %} {%- if hasdoc('copyright') %} - {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}{% endtrans %} {%- else %} - {% trans copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %} + {% trans copyright=copyright|e %}© Copyright {{ copyright }}{% endtrans %} {%- endif %} {%- endif %} diff -pruN 0.4.0+dfsg-1/sphinx_rtd_theme/__init__.py 0.4.2+dfsg-1/sphinx_rtd_theme/__init__.py --- 0.4.0+dfsg-1/sphinx_rtd_theme/__init__.py 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/sphinx_rtd_theme/__init__.py 2018-10-05 13:18:13.000000000 +0000 @@ -5,7 +5,7 @@ From https://github.com/ryan-roemer/sphi """ from os import path -__version__ = '0.4.0' +__version__ = '0.4.2' __version_full__ = __version__ diff -pruN 0.4.0+dfsg-1/sphinx_rtd_theme/layout.html 0.4.2+dfsg-1/sphinx_rtd_theme/layout.html --- 0.4.0+dfsg-1/sphinx_rtd_theme/layout.html 2018-06-06 19:59:40.000000000 +0000 +++ 0.4.2+dfsg-1/sphinx_rtd_theme/layout.html 2018-10-05 13:18:13.000000000 +0000 @@ -188,20 +188,28 @@ {% if not embedded %} - - {%- for scriptfile in script_files %} - - {%- endfor %} + {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #} + {% if sphinx_version >= "1.8.0" %} + + {%- for scriptfile in script_files %} + {{ js_tag(scriptfile) }} + {%- endfor %} + {% else %} + + {%- for scriptfile in script_files %} + + {%- endfor %} + {% endif %} {% endif %}