diff -Nru oslo-sphinx-4.15.1/ChangeLog oslo-sphinx-4.17.0/ChangeLog --- oslo-sphinx-4.15.1/ChangeLog 2017-07-10 20:14:32.000000000 +0000 +++ oslo-sphinx-4.17.0/ChangeLog 2017-10-04 14:06:52.000000000 +0000 @@ -1,6 +1,19 @@ CHANGES ======= +4.17.0 +------ + + +4.16.0 +------ + +* Updated from global requirements +* mark oslosphinx as obsolete +* Updated from global requirements +* Update reno for stable/pike +* Updated from global requirements + 4.15.1 ------ diff -Nru oslo-sphinx-4.15.1/debian/changelog oslo-sphinx-4.17.0/debian/changelog --- oslo-sphinx-4.15.1/debian/changelog 2017-08-09 17:43:58.000000000 +0000 +++ oslo-sphinx-4.17.0/debian/changelog 2017-11-14 15:26:12.000000000 +0000 @@ -1,3 +1,11 @@ +oslo-sphinx (4.17.0-0ubuntu1) bionic; urgency=medium + + * New upstream release. + * d/control: Align (Build-)Depends with upstream. + * d/p/drop-openstackdoctheme.patch: Dropped. No longer needed. + + -- Corey Bryant Tue, 14 Nov 2017 10:26:12 -0500 + oslo-sphinx (4.15.1-0ubuntu1) artful; urgency=medium * New upstream release. diff -Nru oslo-sphinx-4.15.1/debian/control oslo-sphinx-4.17.0/debian/control --- oslo-sphinx-4.15.1/debian/control 2017-08-09 17:43:58.000000000 +0000 +++ oslo-sphinx-4.17.0/debian/control 2017-11-14 15:26:12.000000000 +0000 @@ -13,16 +13,16 @@ python-all, python-pbr (>= 2.0.0), python-setuptools, - python-sphinx (>= 1.5.1), + python-sphinx (>= 1.6.2), python3-all, python3-pbr (>= 2.0.0), python3-setuptools, - python3-sphinx (>= 1.5.1), + python3-sphinx (>= 1.6.2), Build-Depends-Indep: python-hacking (>= 0.10.0), - python-openstackdocstheme (>= 1.11.0), + python-openstackdocstheme (>= 1.17.0), python-requests (>= 2.14.2), python-six (>= 1.9.0), - python3-openstackdocstheme (>= 1.11.0), + python3-openstackdocstheme (>= 1.17.0), python3-requests (>= 2.14.2), python3-six (>= 1.9.0) Standards-Version: 3.9.8 diff -Nru oslo-sphinx-4.15.1/debian/patches/drop-openstackdoctheme.patch oslo-sphinx-4.17.0/debian/patches/drop-openstackdoctheme.patch --- oslo-sphinx-4.15.1/debian/patches/drop-openstackdoctheme.patch 2017-08-09 17:43:58.000000000 +0000 +++ oslo-sphinx-4.17.0/debian/patches/drop-openstackdoctheme.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Description: Temporarily drop openstackdocstheme sphinx extension - until sphinx>=1.6.2 is available. -Author: Corey Bryant -Forwarded: no -Last-Update: 2017-08-09 - ---- a/doc/source/conf.py -+++ b/doc/source/conf.py -@@ -23,7 +23,7 @@ - extensions = [ - 'sphinx.ext.autodoc', - #'sphinx.ext.intersphinx', -- 'openstackdocstheme' -+ #'openstackdocstheme' - ] - - # -- Options for openstackdocstheme ------------------------------------------- -@@ -65,7 +65,7 @@ - # The theme to use for HTML and HTML Help pages. Major themes that come with - # Sphinx are currently 'default' and 'sphinxdoc'. - # html_theme_path = ["."] --html_theme = 'openstackdocs' -+# html_theme = 'openstackdocs' - # html_static_path = ['static'] - - # Output file base name for HTML help builder. diff -Nru oslo-sphinx-4.15.1/debian/patches/series oslo-sphinx-4.17.0/debian/patches/series --- oslo-sphinx-4.15.1/debian/patches/series 2017-08-09 17:43:58.000000000 +0000 +++ oslo-sphinx-4.17.0/debian/patches/series 2017-11-14 15:26:12.000000000 +0000 @@ -1,4 +1,3 @@ -drop-openstackdoctheme.patch remove-google-analytics.patch move_theme.patch package-missing-files.patch diff -Nru oslo-sphinx-4.15.1/oslosphinx.egg-info/pbr.json oslo-sphinx-4.17.0/oslosphinx.egg-info/pbr.json --- oslo-sphinx-4.15.1/oslosphinx.egg-info/pbr.json 2017-07-10 20:14:32.000000000 +0000 +++ oslo-sphinx-4.17.0/oslosphinx.egg-info/pbr.json 2017-10-04 14:06:52.000000000 +0000 @@ -1 +1 @@ -{"git_version": "1cb173e", "is_release": true} \ No newline at end of file +{"git_version": "eae6cb9", "is_release": true} \ No newline at end of file diff -Nru oslo-sphinx-4.15.1/oslosphinx.egg-info/PKG-INFO oslo-sphinx-4.17.0/oslosphinx.egg-info/PKG-INFO --- oslo-sphinx-4.15.1/oslosphinx.egg-info/PKG-INFO 2017-07-10 20:14:32.000000000 +0000 +++ oslo-sphinx-4.17.0/oslosphinx.egg-info/PKG-INFO 2017-10-04 14:06:52.000000000 +0000 @@ -1,46 +1,29 @@ Metadata-Version: 1.1 Name: oslosphinx -Version: 4.15.1 +Version: 4.17.0 Summary: OpenStack Sphinx Extensions and Theme Home-page: http://docs.openstack.org/developer/oslosphinx Author: OpenStack Author-email: openstack-dev@lists.openstack.org License: UNKNOWN -Description: ======================== - Team and repository tags - ======================== - - .. image:: http://governance.openstack.org/badges/oslosphinx.svg - :target: http://governance.openstack.org/reference/tags/index.html - - .. Change things from this point on - - ============================= +Description-Content-Type: UNKNOWN +Description: ============================= OpenStack Sphinx Extensions ============================= - .. image:: https://img.shields.io/pypi/v/oslosphinx.svg - :target: https://pypi.python.org/pypi/oslosphinx/ - :alt: Latest Version - - .. image:: https://img.shields.io/pypi/dm/oslosphinx.svg - :target: https://pypi.python.org/pypi/oslosphinx/ - :alt: Downloads - - Theme and extension support for Sphinx documentation from the - OpenStack project. - - Using the Theme - =============== - - Prior to using this theme, ensure your project can use the OpenStack - brand by referring to the brand guidelines at - http://www.openstack.org/brand. + oslosphinx is obsolete. The openstackdocstheme package should be used + instead. oslosphinx will be maintained for the pike, ocata, and newton + release series and completely remove after that pike is marked + end-of-life. + + The contents of this repository are still available in the Git source + code management system. To see the contents of this repository before + it reached its end of life, please check out the previous commit with + "git checkout HEAD^1", or check out one of the supported stable + branches. - * Free software: Apache License, Version 2.0 - * Documentation: http://docs.openstack.org/developer/oslosphinx - * Source: http://git.openstack.org/cgit/openstack/oslosphinx - * Bugs: http://bugs.launchpad.net/oslosphinx + For any further questions, please email + openstack-dev@lists.openstack.org or join #openstack-oslo on Freenode. Platform: UNKNOWN diff -Nru oslo-sphinx-4.15.1/oslosphinx.egg-info/SOURCES.txt oslo-sphinx-4.17.0/oslosphinx.egg-info/SOURCES.txt --- oslo-sphinx-4.15.1/oslosphinx.egg-info/SOURCES.txt 2017-07-10 20:14:32.000000000 +0000 +++ oslo-sphinx-4.17.0/oslosphinx.egg-info/SOURCES.txt 2017-10-04 14:06:53.000000000 +0000 @@ -36,9 +36,11 @@ oslosphinx/theme/openstack/static/openstack_logo.png oslosphinx/theme/openstack/static/tweaks.css releasenotes/notes/add-reno-996dd44974d53238.yaml +releasenotes/notes/obsolete-3da30e6cd2867d0e.yaml releasenotes/source/conf.py releasenotes/source/index.rst releasenotes/source/ocata.rst +releasenotes/source/pike.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder diff -Nru oslo-sphinx-4.15.1/PKG-INFO oslo-sphinx-4.17.0/PKG-INFO --- oslo-sphinx-4.15.1/PKG-INFO 2017-07-10 20:14:32.000000000 +0000 +++ oslo-sphinx-4.17.0/PKG-INFO 2017-10-04 14:06:53.000000000 +0000 @@ -1,46 +1,29 @@ Metadata-Version: 1.1 Name: oslosphinx -Version: 4.15.1 +Version: 4.17.0 Summary: OpenStack Sphinx Extensions and Theme Home-page: http://docs.openstack.org/developer/oslosphinx Author: OpenStack Author-email: openstack-dev@lists.openstack.org License: UNKNOWN -Description: ======================== - Team and repository tags - ======================== - - .. image:: http://governance.openstack.org/badges/oslosphinx.svg - :target: http://governance.openstack.org/reference/tags/index.html - - .. Change things from this point on - - ============================= +Description-Content-Type: UNKNOWN +Description: ============================= OpenStack Sphinx Extensions ============================= - .. image:: https://img.shields.io/pypi/v/oslosphinx.svg - :target: https://pypi.python.org/pypi/oslosphinx/ - :alt: Latest Version - - .. image:: https://img.shields.io/pypi/dm/oslosphinx.svg - :target: https://pypi.python.org/pypi/oslosphinx/ - :alt: Downloads - - Theme and extension support for Sphinx documentation from the - OpenStack project. - - Using the Theme - =============== - - Prior to using this theme, ensure your project can use the OpenStack - brand by referring to the brand guidelines at - http://www.openstack.org/brand. + oslosphinx is obsolete. The openstackdocstheme package should be used + instead. oslosphinx will be maintained for the pike, ocata, and newton + release series and completely remove after that pike is marked + end-of-life. + + The contents of this repository are still available in the Git source + code management system. To see the contents of this repository before + it reached its end of life, please check out the previous commit with + "git checkout HEAD^1", or check out one of the supported stable + branches. - * Free software: Apache License, Version 2.0 - * Documentation: http://docs.openstack.org/developer/oslosphinx - * Source: http://git.openstack.org/cgit/openstack/oslosphinx - * Bugs: http://bugs.launchpad.net/oslosphinx + For any further questions, please email + openstack-dev@lists.openstack.org or join #openstack-oslo on Freenode. Platform: UNKNOWN diff -Nru oslo-sphinx-4.15.1/README.rst oslo-sphinx-4.17.0/README.rst --- oslo-sphinx-4.15.1/README.rst 2017-07-10 20:13:02.000000000 +0000 +++ oslo-sphinx-4.17.0/README.rst 2017-10-04 14:04:56.000000000 +0000 @@ -1,35 +1,17 @@ -======================== -Team and repository tags -======================== - -.. image:: http://governance.openstack.org/badges/oslosphinx.svg - :target: http://governance.openstack.org/reference/tags/index.html - -.. Change things from this point on - ============================= OpenStack Sphinx Extensions ============================= -.. image:: https://img.shields.io/pypi/v/oslosphinx.svg - :target: https://pypi.python.org/pypi/oslosphinx/ - :alt: Latest Version - -.. image:: https://img.shields.io/pypi/dm/oslosphinx.svg - :target: https://pypi.python.org/pypi/oslosphinx/ - :alt: Downloads - -Theme and extension support for Sphinx documentation from the -OpenStack project. - -Using the Theme -=============== - -Prior to using this theme, ensure your project can use the OpenStack -brand by referring to the brand guidelines at -http://www.openstack.org/brand. +oslosphinx is obsolete. The openstackdocstheme package should be used +instead. oslosphinx will be maintained for the pike, ocata, and newton +release series and completely remove after that pike is marked +end-of-life. + +The contents of this repository are still available in the Git source +code management system. To see the contents of this repository before +it reached its end of life, please check out the previous commit with +"git checkout HEAD^1", or check out one of the supported stable +branches. -* Free software: Apache License, Version 2.0 -* Documentation: http://docs.openstack.org/developer/oslosphinx -* Source: http://git.openstack.org/cgit/openstack/oslosphinx -* Bugs: http://bugs.launchpad.net/oslosphinx +For any further questions, please email +openstack-dev@lists.openstack.org or join #openstack-oslo on Freenode. diff -Nru oslo-sphinx-4.15.1/releasenotes/notes/obsolete-3da30e6cd2867d0e.yaml oslo-sphinx-4.17.0/releasenotes/notes/obsolete-3da30e6cd2867d0e.yaml --- oslo-sphinx-4.15.1/releasenotes/notes/obsolete-3da30e6cd2867d0e.yaml 1970-01-01 00:00:00.000000000 +0000 +++ oslo-sphinx-4.17.0/releasenotes/notes/obsolete-3da30e6cd2867d0e.yaml 2017-10-04 14:04:56.000000000 +0000 @@ -0,0 +1,6 @@ +--- +prelude: >- + oslosphinx is obsolete. The openstackdocstheme package should be used + instead. oslosphinx will be maintained for the pike, ocata, and newton + release series and completely remove after that pike is marked + end-of-life. diff -Nru oslo-sphinx-4.15.1/releasenotes/source/index.rst oslo-sphinx-4.17.0/releasenotes/source/index.rst --- oslo-sphinx-4.15.1/releasenotes/source/index.rst 2017-07-10 20:13:02.000000000 +0000 +++ oslo-sphinx-4.17.0/releasenotes/source/index.rst 2017-10-04 14:04:56.000000000 +0000 @@ -6,4 +6,5 @@ :maxdepth: 1 unreleased + pike ocata diff -Nru oslo-sphinx-4.15.1/releasenotes/source/pike.rst oslo-sphinx-4.17.0/releasenotes/source/pike.rst --- oslo-sphinx-4.15.1/releasenotes/source/pike.rst 1970-01-01 00:00:00.000000000 +0000 +++ oslo-sphinx-4.17.0/releasenotes/source/pike.rst 2017-10-04 14:04:56.000000000 +0000 @@ -0,0 +1,6 @@ +=================================== + Pike Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/pike diff -Nru oslo-sphinx-4.15.1/test-requirements.txt oslo-sphinx-4.17.0/test-requirements.txt --- oslo-sphinx-4.15.1/test-requirements.txt 2017-07-10 20:13:02.000000000 +0000 +++ oslo-sphinx-4.17.0/test-requirements.txt 2017-10-04 14:04:56.000000000 +0000 @@ -6,5 +6,5 @@ # this is required for the docs build jobs sphinx>=1.6.2 # BSD -openstackdocstheme>=1.11.0 # Apache-2.0 -reno!=2.3.1,>=1.8.0 # Apache-2.0 +openstackdocstheme>=1.17.0 # Apache-2.0 +reno>=2.5.0 # Apache-2.0