summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mathys <eraserix@gmail.com>2020-01-03 09:00:48 +0100
committerAndrej Shadura <andrewsh@debian.org>2020-01-03 10:17:51 +0100
commit38f4ec0348677a6108c1fe70d55ddb136295313b (patch)
treede90f9d67d80d08046343c18c9aceb7a7b40c60d
parent113d8dfe8e6c0ea2e02ed7d94c005540d6ff4f52 (diff)
Re-enable python2 support
-rw-r--r--debian/changelog4
-rw-r--r--debian/control6
-rwxr-xr-xdebian/rules2
3 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 1fd4ec8..219393c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-mercurial-keyring (1.3.0-1) UNRELEASED; urgency=medium
+mercurial-keyring (1.3.0-1) unstable; urgency=medium
* New upstream release.
- * Convert to python3 (Closes: #937012)
+ * Support python2 and python3 (Closes: #937012)
* Update Standards-Version and compat.
* Add Upstream-Contact to d/copyright.
diff --git a/debian/control b/debian/control
index d084bc3..5850d32 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,15 @@ Source: mercurial-keyring
Section: python
Priority: optional
Maintainer: Christoph Mathys <eraserix@gmail.com>
-Build-Depends: debhelper-compat (= 12), python3-all, python3-setuptools, dh-python
+Build-Depends: debhelper-compat (= 12), python-all, python-setuptools,
+ python3-all, python3-setuptools, dh-python
Standards-Version: 4.4.1
Homepage: http://pypi.python.org/pypi/mercurial_keyring
Package: mercurial-keyring
Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, mercurial, mercurial-extension-utils (>= 1.5.0)
+Depends: ${python:Depends}, ${python3:Depends}, ${misc:Depends}, mercurial,
+ mercurial-extension-utils (>= 1.5.0)
Description: Mercurial Keyring Extension
mercurial_keyring is a Mercurial extension used to securely save HTTP
and SMTP authentication passwords in password databases (GNOME Keyring,
diff --git a/debian/rules b/debian/rules
index 70bbb53..bc711e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
export PYBUILD_NAME="mercurial-keyring"
%:
- dh $@ --with python3 --buildsystem=pybuild
+ dh $@ --with python2,python3 --buildsystem=pybuild