[Pkg-auth-maintainers] Bug#934861: python-yubico-tools not installable, broken dependency

[Gianfranco Costamagna]

control: severity -1 serious
control: tags -1 patch pending

On Thu, 15 Aug 2019 17:20:35 -0700 Darsey Litzenberger <dlitz at dlitz.net> wrote:
> tags 934861 +patch
> thanks
> 
> The fix for this is included in my merge request on Salsa (which 
> includes several patches):
> https://salsa.debian.org/auth-team/python-yubico/merge_requests/1
> 
> I'll also attach the patch specific to this bug.  Its change log entry 
> would be:
> 
>   * Fix python-yubico-tools not installable. (Closes: #934861)
> 

Uploaded, with some more refinements and a fix for some lintian warnings (due to the newly introduced python3 package with the same long description)

Please update the pull request with the attached debdiff
-------------- next part --------------
diff -Nru python-yubico-1.3.2/debian/changelog python-yubico-1.3.2/debian/changelog
--- python-yubico-1.3.2/debian/changelog	2019-08-08 20:15:22.000000000 +0200
+++ python-yubico-1.3.2/debian/changelog	2019-08-23 10:45:57.000000000 +0200
@@ -1,3 +1,17 @@
+python-yubico (1.3.2-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix some lintian warnings, e.g. duplicate long description
+  * Fix nocheck not honoured in dh_auto_test
+  * Fix copyright non in secure mode
+  * Bump std-version to 4.4.0
+  * Bump compat level to 12
+
+  [ Darsey Litzenberger <dlitz at dlitz.net> ]
+  * Fixup previous upload Closes: #934861
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 23 Aug 2019 10:45:57 +0200
+
 python-yubico (1.3.2-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru python-yubico-1.3.2/debian/compat python-yubico-1.3.2/debian/compat
--- python-yubico-1.3.2/debian/compat	2018-02-23 20:59:59.000000000 +0100
+++ python-yubico-1.3.2/debian/compat	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -Nru python-yubico-1.3.2/debian/control python-yubico-1.3.2/debian/control
--- python-yubico-1.3.2/debian/control	2019-08-08 20:13:27.000000000 +0200
+++ python-yubico-1.3.2/debian/control	2019-08-23 10:45:57.000000000 +0200
@@ -3,7 +3,7 @@
 Uploaders: Klas Lindfors <klas at yubico.com>, Dain Nilsson <dain at yubico.com>
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper-compat (= 12),
 	       dh-python,
 	       python-all (>= 2.6.6-3),
 	       python-nose (>= 0.10.0b1),
@@ -13,22 +13,19 @@
 	       python3-nose (>= 0.10.0b1),
 	       python3-setuptools (>= 0.6b3),
 	       python3-usb,
-Standards-Version: 3.9.8
+Standards-Version: 4.4.0
 Homepage: https://developers.yubico.com/python-yubico/
 Vcs-Browser: https://salsa.debian.org/auth-team/python-yubico
 Vcs-Git: https://salsa.debian.org/auth-team/python-yubico.git
-X-Python-Version: >= 2.8
-X-Python3-Version: >= 3.6
 
 Package: python-yubico
 Architecture: all
 Depends: ${python:Depends},
 	 ${misc:Depends},
 	 python-usb
-XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
-Description: Python library for talking to Yubico YubiKeys
- The YubiKey is a hardware authentication token. This is a Python
+Description: Python2 library for talking to Yubico YubiKeys
+ The YubiKey is a hardware authentication token. This is a Python2
  library for interacting with YubiKeys. Typical use is to detect,
  configure (personalize) or issue challenge-responses to YubiKeys.
 
@@ -39,7 +36,6 @@
 	 ${misc:Depends},
 	 python-argparse,
 	 python-yubico (= ${binary:Version})
-XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Description: Tools for Yubico YubiKeys
  The YubiKey is a hardware authentication token. This package
@@ -57,6 +53,6 @@
 	 python3-usb
 Provides: ${python3:Provides}
 Description: Python3 library for talking to Yubico YubiKeys
- The YubiKey is a hardware authentication token. This is a Python
+ The YubiKey is a hardware authentication token. This is a Python3
  library for interacting with YubiKeys. Typical use is to detect,
  configure (personalize) or issue challenge-responses to YubiKeys.
diff -Nru python-yubico-1.3.2/debian/copyright python-yubico-1.3.2/debian/copyright
--- python-yubico-1.3.2/debian/copyright	2018-02-23 19:26:29.000000000 +0100
+++ python-yubico-1.3.2/debian/copyright	2019-08-23 10:45:57.000000000 +0200
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-yubico
 Source: https://developers.yubico.com/python-yubico/
 
diff -Nru python-yubico-1.3.2/debian/rules python-yubico-1.3.2/debian/rules
--- python-yubico-1.3.2/debian/rules	2019-08-08 20:12:12.000000000 +0200
+++ python-yubico-1.3.2/debian/rules	2019-08-23 10:45:57.000000000 +0200
@@ -6,8 +6,10 @@
 	dh_installchangelogs ChangeLog
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	nosetests-2.7 -e test_challenge_response -e test_serial -e test_status
 	nosetests3 -e test_challenge_response -e test_serial -e test_status
+endif
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild