diff -Nru python-designateclient-2.11.0/debian/changelog python-designateclient-2.11.0/debian/changelog --- python-designateclient-2.11.0/debian/changelog 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/changelog 2019-07-11 05:40:37.000000000 +0000 @@ -1,3 +1,14 @@ +python-designateclient (2.11.0-0ubuntu2) eoan; urgency=medium + + * Drop Python 2 support: + - d/control: Drop python-designateclient binary package. + - d/control: Drop BDI's on python-*. + - d/rules: Skip install and test of Python 2 module. + - d/*.postinst,prerm,postrm: Drop, no longer needed as binaries not + managed using alternatives. + + -- James Page Thu, 11 Jul 2019 06:40:37 +0100 + python-designateclient (2.11.0-0ubuntu1) disco; urgency=medium * New upstream release for OpenStack Stein. diff -Nru python-designateclient-2.11.0/debian/control python-designateclient-2.11.0/debian/control --- python-designateclient-2.11.0/debian/control 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/control 2019-07-11 05:40:37.000000000 +0000 @@ -19,25 +19,6 @@ python3-setuptools, python3-sphinx (>= 1.6.2), Build-Depends-Indep: - python-cliff (>= 2.8.0), - python-coverage (>= 4.0), - python-debtcollector (>= 1.2.0), - python-hacking (>= 0.12.0), - python-jsonschema (>= 2.6.0), - python-keystoneauth1 (>= 3.4.0), - python-mock (>= 2.0.0), - python-osc-lib (>= 1.8.0), - python-oslo.config (>= 1:5.2.0), - python-oslo.utils (>= 3.33.0), - python-oslotest (>= 1:3.2.0), - python-requests (>= 2.14.2), - python-requests-mock (>= 1.2.0), - python-six (>= 1.10.0), - python-stestr, - python-stevedore (>= 1:1.20.0), - python-subunit (>= 1.0.0), - python-tempest (>= 1:17.1.0), - python-testrepository (>= 0.0.18), python3-cliff (>= 2.8.0), python3-coverage (>= 4.0), python3-debtcollector (>= 1.2.0), @@ -59,44 +40,11 @@ python3-subunit (>= 1.0.0), python3-tempest (>= 1:17.1.0), python3-testrepository (>= 0.0.18), - subunit, - testrepository, Standards-Version: 4.1.2 Vcs-Git: git://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-designateclient Vcs-Browser: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-designateclient Homepage: https://github.com/openstack/python-designateclient -Package: python-designateclient -Architecture: all -Depends: - python-cliff (>= 2.8.0), - python-debtcollector (>= 1.2.0), - python-jsonschema (>= 2.6.0), - python-keystoneauth1 (>= 3.4.0), - python-osc-lib (>= 1.8.0), - python-oslo.utils (>= 3.33.0), - python-pbr (>= 2.0.0), - python-requests (>= 2.14.2), - python-six (>= 1.10.0), - python-stevedore (>= 1:1.20.0), - ${misc:Depends}, - ${python:Depends}, - ${sphinxdoc:Depends}, -Description: client library for the OpenStack Designate API - Python 2.7 - Designate provides DNSaaS services for OpenStack. It provides a multi-tenant - REST API for domain & record management. It is Integrated with Keystone for - authentication, and provides a framework in place to integrate with Nova and - Neutron notifications (for auto-generated records). Designate supports - PowerDNS and Bind9 out of the box. - . - This is a client for the OpenStack Designate API. There's a Python API - (the "designateclient" module), and a command-line script ("designate"). - . - Installing this package gets you a shell command, that you can use to - interact with Designate's API. - . - This package provides the Python 2.7 module. - Package: python-designateclient-doc Architecture: all Section: doc diff -Nru python-designateclient-2.11.0/debian/python3-designateclient.postinst python-designateclient-2.11.0/debian/python3-designateclient.postinst --- python-designateclient-2.11.0/debian/python3-designateclient.postinst 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/python3-designateclient.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ] ; then - update-alternatives --install /usr/bin/designate designate /usr/bin/python3-designate 200 -fi - -#DEBHELPER# - -exit 0 diff -Nru python-designateclient-2.11.0/debian/python3-designateclient.postrm python-designateclient-2.11.0/debian/python3-designateclient.postrm --- python-designateclient-2.11.0/debian/python3-designateclient.postrm 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/python3-designateclient.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then - update-alternatives --remove designate /usr/bin/python3-designate -fi - -#DEBHELPER# - -exit 0 diff -Nru python-designateclient-2.11.0/debian/python3-designateclient.prerm python-designateclient-2.11.0/debian/python3-designateclient.prerm --- python-designateclient-2.11.0/debian/python3-designateclient.prerm 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/python3-designateclient.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] ; then - update-alternatives --remove designate /usr/bin/python3-designate -fi - -#DEBHELPER# - -exit 0 diff -Nru python-designateclient-2.11.0/debian/python-designateclient-doc.manpages python-designateclient-2.11.0/debian/python-designateclient-doc.manpages --- python-designateclient-2.11.0/debian/python-designateclient-doc.manpages 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/python-designateclient-doc.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -doc/build/man/designate.1 diff -Nru python-designateclient-2.11.0/debian/python-designateclient.postinst python-designateclient-2.11.0/debian/python-designateclient.postinst --- python-designateclient-2.11.0/debian/python-designateclient.postinst 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/python-designateclient.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ] ; then - update-alternatives --install /usr/bin/designate designate /usr/bin/python2-designate 300 -fi - -#DEBHELPER# - -exit 0 diff -Nru python-designateclient-2.11.0/debian/python-designateclient.postrm python-designateclient-2.11.0/debian/python-designateclient.postrm --- python-designateclient-2.11.0/debian/python-designateclient.postrm 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/python-designateclient.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then - update-alternatives --remove designate /usr/bin/python2-designate -fi - -#DEBHELPER# - -exit 0 diff -Nru python-designateclient-2.11.0/debian/python-designateclient.prerm python-designateclient-2.11.0/debian/python-designateclient.prerm --- python-designateclient-2.11.0/debian/python-designateclient.prerm 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/python-designateclient.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] ; then - update-alternatives --remove designate /usr/bin/python2-designate -fi - -#DEBHELPER# - -exit 0 diff -Nru python-designateclient-2.11.0/debian/rules python-designateclient-2.11.0/debian/rules --- python-designateclient-2.11.0/debian/rules 2018-11-14 17:46:14.000000000 +0000 +++ python-designateclient-2.11.0/debian/rules 2019-07-11 05:40:37.000000000 +0000 @@ -1,37 +1,19 @@ #!/usr/bin/make -f -PYTHONS:=$(shell pyversions -vr) -PYTHON3S:=$(shell py3versions -vr) - include /usr/share/openstack-pkg-tools/pkgos.make -export OSLO_PACKAGE_VERSION=$(VERSION) %: - dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc + dh $@ --buildsystem=python_distutils --with python3,sphinxdoc override_dh_python3: dh_python3 --shebang=/usr/bin/python3 override_dh_auto_install: - set -e ; for pyvers in $(PYTHONS); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python-designateclient; \ - done - set -e ; for pyvers in $(PYTHON3S); do \ - python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-designateclient; \ - done - rm -f $(CURDIR)/debian/python*/usr/lib/python*/dist-packages/*.pth - install -d $(CURDIR)/debian/python-designateclient/usr/lib/python2.7/dist-packages/designateclient/resources/schemas/v1/ - install -d $(CURDIR)/debian/python3-designateclient/usr/lib/python3/dist-packages/designateclient/resources/schemas/v1/ - install -D -m 0644 designateclient/resources/schemas/v1/* $(CURDIR)/debian/python-designateclient/usr/lib/python2.7/dist-packages/designateclient/resources/schemas/v1/ - install -D -m 0644 designateclient/resources/schemas/v1/* $(CURDIR)/debian/python3-designateclient/usr/lib/python3/dist-packages/designateclient/resources/schemas/v1/ - mv $(CURDIR)/debian/python-designateclient/usr/bin/designate $(CURDIR)/debian/python-designateclient/usr/bin/python2-designate - mv $(CURDIR)/debian/python3-designateclient/usr/bin/designate $(CURDIR)/debian/python3-designateclient/usr/bin/python3-designate + pkgos-dh_auto_install --no-py2 override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - pkgos-dh_auto_test + pkgos-dh_auto_test --no-py2 endif override_dh_sphinxdoc: @@ -40,13 +22,6 @@ dh_sphinxdoc -O--buildsystem=python_distutils endif -override_dh_installman: -#ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) -# PYTHONPATH=. sphinx-build -b man doc/source doc/build/man -# mv doc/build/man/designateclient.1 doc/build/man/designate.1 -# dh_installman -O--buildsystem=python_distutils -#endif - override_dh_clean: dh_clean -O--buildsystem=python_distutils rm -rf doc/build .testrepository