debian/changelog

+custodia (0.6.0-3) unstable; urgency=medium
+
+  * Migrate to python3. (Closes: #939100)
+  * control: Bump policy to 4.4.0.
+  * control: Add adduser to custodia depends.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 11 Sep 2019 23:59:40 +0300
+
 custodia (0.6.0-2) unstable; urgency=medium
 
   * rules: Set locale so we get an error msg if something goes wrong

debian/control

@@ -7,18 +7,7 @@ Build-Depends:
  debhelper (>= 11),
  dh-python,
  pep8,
- pylint,
-# pylint3,
- python-all (>= 2.6.6-3),
- python-coverage,
- python-flake8,
- python-jwcrypto (>= 0.4.2),
- python-pep8-naming,
- python-pytest,
- python-requests,
- python-setuptools,
- python-six,
- python-systemd,
+ pylint3,
  python3-all (>= 2.6.6-3),
  python3-coverage,
  python3-flake8,
@@ -30,17 +19,18 @@ Build-Depends:
  python3-six,
  python3-systemd,
  tox,
-Standards-Version: 4.1.2
+Standards-Version: 4.4.0
 Vcs-Git: https://salsa.debian.org/freeipa-team/custodia.git
 Vcs-Browser: https://salsa.debian.org/freeipa-team/custodia
 Homepage: https://github.com/latchset/custodia
 
 Package: custodia
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
- python-custodia,
- python-jwcrypto (>= 0.4.2),
- python-six,
+Depends: ${misc:Depends}, ${python3:Depends},
+ adduser,
+ python3-custodia,
+ python3-jwcrypto (>= 0.4.2),
+ python3-six,
 Description: Modular and pluggable Secrets Manager
  Custodia allows one to serve retrieve, manage and store secrets for other
  applications. It is useful for distributed, stateless applications that use
@@ -48,23 +38,6 @@ Description: Modular and pluggable Secrets Manager
  But it is alaso useful to manage distribution of key material across a
  multiple machines over a network.
 
-Package: python-custodia
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
- python-configparser,
- python-cryptography,
- python-jwcrypto (>= 0.4.2),
- python-requests,
- python-systemd,
-Description: Python bindings to Custodia -- Modular and pluggable Secrets Manager
- Custodia allows one to serve retrieve, manage and store secrets for other
- applications. It is useful for distributed, stateless applications that use
- an image file base approach for instantiation like container based images.
- But it is alaso useful to manage distribution of key material across a
- multiple machines over a network.
- .
- This package includes the bindings for python2.
-
 Package: python3-custodia
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends},

debian/rules

@@ -7,7 +7,7 @@ export PYBUILD_NAME=custodia
 # don't download packages
 export PIP_INDEX_URL=http://host.invalid./
 
-# Don't try to download dnspython3. The package is provided by python-dnspython
+# Don't try to download dnspython3. The package is provided by python3-dnspython
 export PIP_NO_DEPS=yes
 
 # Ignore all install packages to enforce installation of sdist. Otherwise tox
@@ -17,17 +17,15 @@ export PIP_IGNORE_INSTALLED=yes
 export LC_ALL=C.UTF-8
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_test:
-#	tox --sitepackages -e py27 -- --skip-servertests
 #	tox --sitepackages -e py36 -- --skip-servertests
 
 override_dh_install:
 	mkdir -p debian/tmp/usr/bin debian/tmp/usr/sbin
-	mv debian/python-custodia/usr/bin/custodia-cli debian/tmp/usr/bin
-	mv debian/python-custodia/usr/bin/custodia debian/tmp/usr/sbin
-	rm -rf debian/python-custodia/usr/bin
+	mv debian/python3-custodia/usr/bin/custodia-cli debian/tmp/usr/bin
+	mv debian/python3-custodia/usr/bin/custodia debian/tmp/usr/sbin
 	rm -rf debian/python3-custodia/usr/bin
 
 	dh_install