Merge ~ahasenack/ubuntu/+source/shadowsocks-libev:focal-dep8-py2-explicit into ~ahasenack/ubuntu/+source/shadowsocks-libev:master

[Andreas Hasenack]

This package isn't in git-ubuntu, so I'm proposing this MP against my own master branch which represents the current package in focal.

This fixes the dep8 dependency on "python":
E: Package 'python' has no installation candidate

I checked upstream and there is no new release nor recent activity. I also tried running this with py3, but it failed. Porting to py3 doesn't seem to be too hard, but not worth it at the moment I believe.

This package is blocking the bind9 migration.

7c891e7... by Andreas Hasenack on 2020-01-28

changelog

474d96e... by Andreas Hasenack on 2020-01-28

update-metadata

[Bryce Harrington (bryce)]

LGTM, +1

Verified python2 is valid package in focal; I didn't realize we could just change deps to require that.

* Changelog:
  - [?] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [v] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
    + 3.3.4 is latest upstream release - https://github.com/shadowsocks/shadowsocks-libev/releases
  - [√] no further upstream version to consider
    + This is a build fix, so kept to just solving the issue at hand
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] patches match what was proposed upstream
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [-] build is ok
  - [-] verified PPA package installs/uninstalls
  - [-] autopkgtest against the PPA package passes
  - [-] sanity checks test fine

I didn't do build testing, I trust if there are any issues they'll become immediately apparent. Presumably this has been locally tested and/or in a PPA already.

[Bryce Harrington (bryce)]

review: Approve

[Andreas Hasenack (ahasenack)]

Uploading 474d96e7e63ee0327a8f8117c3ab57619cfbd2f2

$ dput ubuntu ../shadowsocks-libev_3.3.4+ds-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../shadowsocks-libev_3.3.4+ds-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../shadowsocks-libev_3.3.4+ds-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading shadowsocks-libev_3.3.4+ds-1ubuntu1.dsc: done.
  Uploading shadowsocks-libev_3.3.4+ds-1ubuntu1.debian.tar.xz: done.
  Uploading shadowsocks-libev_3.3.4+ds-1ubuntu1_source.buildinfo: done.
  Uploading shadowsocks-libev_3.3.4+ds-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This is done.

diff --git a/debian/changelog b/debian/changelog
index 2bf550a..cbf4808 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shadowsocks-libev (3.3.4+ds-1ubuntu1) focal; urgency=medium
+
+  * d/t/control: depend on python2
+  * d/p/use-py2-for-dep8-tests.patch: be specific about the python
+    version the tests need.
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 28 Jan 2020 14:34:14 -0300
+
 shadowsocks-libev (3.3.4+ds-1) unstable; urgency=medium
 
   * New upstream release: v3.3.4
diff --git a/debian/control b/debian/control
index 21cd8b4..73da305 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: shadowsocks-libev
 Section: net
 Priority: optional
-Maintainer: Debian Bridges Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Bridges Team <[e-mail]>
 Uploaders:
  Max Lv <[e-mail]>,
  Boyuan Yang <[e-mail]>,
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..419371a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-py2-for-dep8-tests.patch
diff --git a/debian/patches/use-py2-for-dep8-tests.patch b/debian/patches/use-py2-for-dep8-tests.patch
new file mode 100644
index 0000000..2df506a
--- /dev/null
+++ b/debian/patches/use-py2-for-dep8-tests.patch
@@ -0,0 +1,43 @@
+Description: Be explicit about the python version the tests need
+ Explicitly request python2 to run the dep8 tests.
+Author: Andreas Hasenack <[e-mail]>
+Forwarded: no, unsure about the py2/py3 situation in debian at the moment
+Last-Update: 2020-01-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/tests/test.py b/tests/test.py
+index 0a1297b..d926f63 100755
+--- a/tests/test.py
++++ b/tests/test.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright 2015 clowwindy
+diff --git a/tests/test.sh b/tests/test.sh
+index b666eb1..0221f10 100755
+--- a/tests/test.sh
++++ b/tests/test.sh
+@@ -32,13 +32,13 @@ if [ "$http_proxy" ]; then
+     exit 0
+ fi
+ 
+-run_test python tests/test.py $BIN -c tests/aes.json
+-run_test python tests/test.py $BIN -c tests/aes-gcm.json
+-run_test python tests/test.py $BIN -c tests/aes-ctr.json
+-run_test python tests/test.py $BIN -c tests/rc4-md5.json
+-run_test python tests/test.py $BIN -c tests/salsa20.json
+-run_test python tests/test.py $BIN -c tests/chacha20.json
+-run_test python tests/test.py $BIN -c tests/chacha20-ietf.json
+-run_test python tests/test.py $BIN -c tests/chacha20-ietf-poly1305.json
++run_test python2 tests/test.py $BIN -c tests/aes.json
++run_test python2 tests/test.py $BIN -c tests/aes-gcm.json
++run_test python2 tests/test.py $BIN -c tests/aes-ctr.json
++run_test python2 tests/test.py $BIN -c tests/rc4-md5.json
++run_test python2 tests/test.py $BIN -c tests/salsa20.json
++run_test python2 tests/test.py $BIN -c tests/chacha20.json
++run_test python2 tests/test.py $BIN -c tests/chacha20-ietf.json
++run_test python2 tests/test.py $BIN -c tests/chacha20-ietf-poly1305.json
+ 
+ exit $result
diff --git a/debian/tests/control b/debian/tests/control
index 8a90408..1bf6d49 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Test-Command: bash tests/test.sh
-Depends: @, python, curl, dnsutils
+Depends: @, python2, curl, dnsutils
 Restrictions: allow-stderr