Comment 94 for bug 1640978

Revision history for this message
Michael Casadevall (mcasadevall) wrote :

Breakdown of changes for python ACME; I caught a mistake in the previous debdiff so reuploading a revised one with this comment:

diff -Nru python-acme-0.22.2/debian/compat python-acme-0.22.2/debian/compat
--- python-acme-0.22.2/debian/compat 2018-03-17 15:24:35.000000000 +0000
+++ python-acme-0.22.2/debian/compat 2018-11-25 15:09:41.000000000 +0000
@@ -1 +1 @@
-11
+9

Explaination: debhelper version change

diff -Nru python-acme-0.22.2/debian/control python-acme-0.22.2/debian/control
--- python-acme-0.22.2/debian/control 2018-03-17 15:24:35.000000000 +0000
+++ python-acme-0.22.2/debian/control 2018-11-25 15:09:41.000000000 +0000
@@ -1,13 +1,14 @@
 Source: python-acme
 Section: python
 Priority: optional
-Maintainer: Debian Let's Encrypt <email address hidden>
+Maintainer: Ubuntu Developers <email address hidden>
+XSBC-Original-Maintainer: Debian Let's Encrypt <email address hidden>
 Uploaders: Harlan Lieberman-Berg <email address hidden>,
            Francois Marier <email address hidden>
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 9~),
                dh-python,
                python-all (>= 2.7),
- python-cryptography (>= 1.3.4),
+ python-cryptography,
                python-docutils,
                python-josepy,
                python-mock,

Explanation: This was an incorrect dependency in bionic; acme works proeprly against cryotpgraphy 1.2 which was shipped in Xenial.

@@ -19,7 +20,7 @@
                python-six (>= 1.9),
                python-tz,
                python3 (>= 3.4),
- python3-cryptography (>= 1.3.4),
+ python3-cryptography,
                python3-docutils,
                python3-josepy,
                python3-mock,

Explanation: See above.

diff -Nru python-acme-0.22.2/debian/rules python-acme-0.22.2/debian/rules
--- python-acme-0.22.2/debian/rules 2018-03-17 15:24:35.000000000 +0000
+++ python-acme-0.22.2/debian/rules 2018-11-25 15:09:30.000000000 +0000
@@ -7,11 +7,10 @@

 override_dh_auto_build:
  dh_auto_build
- PYTHONPATH=. \
- http_proxy='127.0.0.1:9' \
- https_proxy='127.0.0.1:9' \
- sphinx-build -N -bhtml docs/ build/html
+ PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml docs/ build/html

 override_dh_auto_install:
  dh_auto_install
  find $(CURDIR)/debian/ -type d -name testdata -print0 | xargs -0 rm -rf '{}' \;

Explaination: I reused the rules from the existing python-acme version in Trusty, dropping https_proxy. This may not be necessary TBH.