[Python-modules-commits] [python-cryptography] 01/01: Filter out manually translated dependencies from requires.txt as dh_python is not doing this for us (closes: #882011, #882170).

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-cryptography.

commit 5244c67863973274f91de0206037134d7d816992
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Nov 20 00:17:47 2017 +0200

    Filter out manually translated dependencies from requires.txt as dh_python is not doing this for us (closes: #882011, #882170).
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 debian/rules     | 5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb6de2a..0ae221b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-cryptography (2.1.3-3) unstable; urgency=medium
+
+  * Filter out manually translated dependencies from requires.txt as
+    dh_python is not doing this for us (closes: #882011, #882170).
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Sun, 19 Nov 2017 23:31:53 +0200
+
 python-cryptography (2.1.3-2) unstable; urgency=medium
 
   * Work around lack of environment marker support in dh_python by
diff --git a/debian/control b/debian/control
index 659cf14..5a59515 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,11 @@ Build-Depends:
  dh-python (>= 2.20151103),
  dpkg-dev (>= 1.17.14),
  libssl-dev,
- python-dev,
  python-asn1crypto (>= 0.21.0~),
  python-cffi (>= 1.7~),
  python-cryptography-vectors (<< 2.1.4~) <!nocheck>,
  python-cryptography-vectors (>= 2.1.3~) <!nocheck>,
+ python-dev,
  python-enum34,
  python-hypothesis <!nocheck>,
  python-idna (>= 2.0~),
@@ -23,11 +23,11 @@ Build-Depends:
  python-six (>= 1.4.1~),
  python-sphinx-rtd-theme <!nodoc>,
  python-tz <!nocheck>,
- python3-dev,
  python3-asn1crypto (>= 0.21.0~),
  python3-cffi (>= 1.7~),
  python3-cryptography-vectors (<< 2.1.4~) <!nocheck>,
  python3-cryptography-vectors (>= 2.1.3~) <!nocheck>,
+ python3-dev,
  python3-hypothesis <!nocheck>,
  python3-idna (>= 2.0~),
  python3-iso8601 <!nocheck>,
diff --git a/debian/rules b/debian/rules
index 2b99b28..6f88517 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,12 +35,15 @@ endif
 
 override_dh_python2:
 	dh_python2 --depends=cffi --depends=enum34 --depends=ipaddress
+	sed -Ei -e '/^cffi|^enum34|^ipaddress/d' debian/python-cryptography/usr/lib/python*/dist-packages/cryptography*.egg-info/requires.txt
 
 
 override_dh_python3:
 	dh_python3 --depends=cffi
+	sed -Ei -e '/^cffi/d' debian/python3-cryptography/usr/lib/python3*/dist-packages/cryptography*.egg-info/requires.txt
 
 
+# Not used yet, here for futureproofing
 override_dh_pypy:
-	# Not used yet, here for futureproofing
 	dh_pypy --depends=enum34 --depends=ipaddress
+	sed -Ei -e '/^enum34|^ipaddress/d' debian/python3-cryptography/usr/lib/pypy/dist-packages/cryptography*.egg-info/requires.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-cryptography.git