diff -pruN 0.2.1-3/debian/changelog 1.0.0-0ubuntu1/debian/changelog
--- 0.2.1-3/debian/changelog	2019-08-27 10:04:40.000000000 +0000
+++ 1.0.0-0ubuntu1/debian/changelog	2020-03-13 14:52:46.000000000 +0000
@@ -1,3 +1,13 @@
+python-microversion-parse (1.0.0-0ubuntu1) focal; urgency=medium
+
+  * d/gbp.conf: Update gbp configuration file.
+  * d/control: Update Vcs-* links and maintainers.
+  * New upstream release.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/p/*: Dropped. No longer needed.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 13 Mar 2020 10:52:46 -0400
+
 python-microversion-parse (0.2.1-3) unstable; urgency=medium
 
   * Use debhelper-compat instead of debian/compat.
diff -pruN 0.2.1-3/debian/control 1.0.0-0ubuntu1/debian/control
--- 0.2.1-3/debian/control	2019-08-27 10:04:33.000000000 +0000
+++ 1.0.0-0ubuntu1/debian/control	2020-03-13 14:52:46.000000000 +0000
@@ -1,7 +1,8 @@
 Source: python-microversion-parse
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
 Uploaders:
  Corey Bryant <corey.bryant@canonical.com>,
  Ondřej Nový <onovy@debian.org>,
@@ -12,17 +13,18 @@ Build-Depends:
  python3-all,
  python3-pbr (>= 1.3),
  python3-setuptools,
- python3-sphinx,
+ python3-sphinx (>= 1.6.2),
 Build-Depends-Indep:
  python3-gabbi (>= 1.35.0),
  python3-hacking,
+ python3-openstackdocstheme (>= 1.18.1),
  python3-oslosphinx (>= 2.5.0),
- python3-stestr,
+ python3-stestr (>= 1.0.0),
  python3-testtools (>= 1.4.0),
- python3-webob (>= 1.2.3),
+ python3-webob (>= 1:1.2.3),
 Standards-Version: 4.4.0
-Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-microversion-parse
-Vcs-Git: https://salsa.debian.org/openstack-team/python/python-microversion-parse.git
+Vcs-Browser: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-microversion-parse
+Vcs-Git: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-microversion-parse
 Homepage: https://launchpad.net/microversion-parse
 Testsuite: autopkgtest-pkg-python
 
@@ -30,6 +32,7 @@ Package: python-microversion-parse-doc
 Section: doc
 Architecture: all
 Depends:
+ python3-webob (>= 1:1.2.3),
  ${misc:Depends},
  ${sphinxdoc:Depends},
 Description: OpenStack microversion header parsing library - doc
diff -pruN 0.2.1-3/debian/gbp.conf 1.0.0-0ubuntu1/debian/gbp.conf
--- 0.2.1-3/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ 1.0.0-0ubuntu1/debian/gbp.conf	2020-03-13 14:52:46.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -pruN 0.2.1-3/debian/patches/html-static-path.patch 1.0.0-0ubuntu1/debian/patches/html-static-path.patch
--- 0.2.1-3/debian/patches/html-static-path.patch	2019-08-27 09:52:28.000000000 +0000
+++ 1.0.0-0ubuntu1/debian/patches/html-static-path.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-Author: Corey Bryant <corey.bryant@canonical.com>
-Last-Update: 2016-05-18
-Forwarded: not-needed
-
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -140,7 +140,7 @@
- # Add any paths that contain custom static files (such as style sheets) here,
- # relative to this directory. They are copied after the builtin static files,
- # so a file named "default.css" will overwrite the builtin "default.css".
--html_static_path = ['_static']
-+#html_static_path = ['_static']
- 
- # Add any extra paths that contain custom files (such as robots.txt or
- # .htaccess) here, relative to this directory. These files are copied
diff -pruN 0.2.1-3/debian/patches/series 1.0.0-0ubuntu1/debian/patches/series
--- 0.2.1-3/debian/patches/series	2019-08-27 09:52:28.000000000 +0000
+++ 1.0.0-0ubuntu1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-html-static-path.patch
diff -pruN 0.2.1-3/doc/requirements.txt 1.0.0-0ubuntu1/doc/requirements.txt
--- 0.2.1-3/doc/requirements.txt	1970-01-01 00:00:00.000000000 +0000
+++ 1.0.0-0ubuntu1/doc/requirements.txt	2020-02-03 16:12:24.000000000 +0000
@@ -0,0 +1,2 @@
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
diff -pruN 0.2.1-3/doc/source/conf.py 1.0.0-0ubuntu1/doc/source/conf.py
--- 0.2.1-3/doc/source/conf.py	2018-03-21 17:39:24.000000000 +0000
+++ 1.0.0-0ubuntu1/doc/source/conf.py	2020-02-03 16:12:24.000000000 +0000
@@ -12,10 +12,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
-import os
-import shlex
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -32,6 +28,7 @@ import shlex
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
+    'openstackdocstheme'
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -53,14 +50,11 @@ project = u'microversion-parse'
 copyright = u'2016, OpenStack'
 author = u'OpenStack'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = u'0.1.0'
-# The full version, including alpha/beta/rc tags.
-release = u'0.1.0'
+# openstackdocstheme options
+repository_name = 'openstack/microversion-parse'
+bug_project = 'microversion-parse'
+bug_tag = ''
+html_theme = 'openstackdocs'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -140,7 +134,7 @@ todo_include_todos = False
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
diff -pruN 0.2.1-3/.gitreview 1.0.0-0ubuntu1/.gitreview
--- 0.2.1-3/.gitreview	2018-03-21 17:39:24.000000000 +0000
+++ 1.0.0-0ubuntu1/.gitreview	2020-02-03 16:12:24.000000000 +0000
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/microversion-parse.git
diff -pruN 0.2.1-3/setup.cfg 1.0.0-0ubuntu1/setup.cfg
--- 0.2.1-3/setup.cfg	2018-03-21 17:39:24.000000000 +0000
+++ 1.0.0-0ubuntu1/setup.cfg	2020-02-03 16:12:24.000000000 +0000
@@ -3,28 +3,22 @@ name = microversion_parse
 summary = OpenStack microversion header parser
 description-file = README.rst
 author = OpenStack
-author-email = openstack-dev@lists.openstack.org
+author-email = openstack-discuss@lists.openstack.org
 home-page = http://www.openstack.org/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: Implementation :: CPython
 
 [files]
 packages =
     microversion_parse
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-
-[bdist_wheel]
-universal=1
diff -pruN 0.2.1-3/test-requirements.txt 1.0.0-0ubuntu1/test-requirements.txt
--- 0.2.1-3/test-requirements.txt	2018-03-21 17:39:24.000000000 +0000
+++ 1.0.0-0ubuntu1/test-requirements.txt	2020-02-03 16:12:24.000000000 +0000
@@ -1,7 +1,5 @@
-hacking>=0.10.2,<0.11 # Apache-2.0
+hacking>=2.0,<2.1 # Apache-2.0
 coverage>=3.6 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
-oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 testtools>=1.4.0 # MIT
 gabbi>=1.35.0 # Apache-2.0
diff -pruN 0.2.1-3/tox.ini 1.0.0-0ubuntu1/tox.ini
--- 0.2.1-3/tox.ini	2018-03-21 17:39:24.000000000 +0000
+++ 1.0.0-0ubuntu1/tox.ini	2020-02-03 16:12:24.000000000 +0000
@@ -1,9 +1,10 @@
 [tox]
-minversion = 2.0
+minversion = 3.1.1
 skipsdist = True
 # If you want pypy or pypy3, do 'tox -epypy,pypy3', it might work!
 # And you can get coverage with 'tox -ecover'.
-envlist = py27,py36,py35,pep8
+envlist = py36,py35,pep8
+ignore_basepython_conflict = True
 
 [testenv]
 deps = -r{toxinidir}/requirements.txt
@@ -18,7 +19,6 @@ deps = -r{toxinidir}/requirements.txt
 commands = {posargs}
 
 [testenv:pep8]
-deps = hacking
 usedevelop = False
 commands =
     flake8
@@ -35,9 +35,10 @@ whitelist_externals =
     find
 
 [testenv:docs]
+deps = -r{toxinidir}/doc/requirements.txt
 commands =
     rm -rf doc/build
-    python setup.py build_sphinx
+    sphinx-build -W --keep-going -b html -d doc/build/doctrees doc/source doc/build/html
 whitelist_externals =
     rm
 
diff -pruN 0.2.1-3/.zuul.yaml 1.0.0-0ubuntu1/.zuul.yaml
--- 0.2.1-3/.zuul.yaml	1970-01-01 00:00:00.000000000 +0000
+++ 1.0.0-0ubuntu1/.zuul.yaml	2020-02-03 16:12:24.000000000 +0000
@@ -0,0 +1,4 @@
+- project:
+    templates:
+      - openstack-python3-ussuri-jobs
+      - check-requirements
