summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Shadura <andrewsh@debian.org>2020-01-02 11:56:00 +0100
committerAndrej Shadura <andrewsh@debian.org>2020-01-02 11:56:59 +0100
commitcd3c586c667ec47ae88666f4a2e29cacfe1400ce (patch)
tree4aeac3c4af21eb0361e72fed760af3c0cdb24091
parent68d1a399d546ee54bf067a80011746e3544a287e (diff)
Temporarily reenable Python 2 to ease the transition
-rw-r--r--debian/changelog6
-rw-r--r--debian/control5
-rwxr-xr-xdebian/rules3
3 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 5c2d309..9a91bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
mercurial-extension-utils (1.5.0-1) UNRELEASED; urgency=medium
+ [ Christoph Mathys ]
* New upstream release.
- * Convert package to python3. (Closes: #937011)
+ * Convert to Python 3.
* Update Standards Version and compat.
* Add Upstream-Contact to d/copyright.
+ [ Andrej Shadura ]
+ * Temporarily reenable Python 2 to ease the transition.
+
-- Christoph Mathys <eraserix@gmail.com> Wed, 04 Dec 2019 20:58:18 +0100
mercurial-extension-utils (1.3.6-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index edf35c7..89e1c5a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Section: python
Priority: optional
Maintainer: Christoph Mathys <eraserix@gmail.com>
Build-Depends: debhelper-compat (= 12), python3-all,
- python3-setuptools, dh-python
+ python3-setuptools, dh-python,
+ python-all, python-setuptools
Standards-Version: 4.4.1
Homepage: http://pypi.python.org/pypi/mercurial_extension_utils
Package: mercurial-extension-utils
Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, mercurial
+Depends: ${python:Depends}, ${python3:Depends}, ${misc:Depends}, mercurial
Description: Contains functions for writing Mercurial extensions
Contains functions used by Mercurial extension mercurial-keyring. They are
mostly tiny utilities related to configuration processing or location
diff --git a/debian/rules b/debian/rules
index 70bbb53..4c169b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,5 @@
export PYBUILD_NAME="mercurial-keyring"
%:
- dh $@ --with python3 --buildsystem=pybuild
+ dh $@ --with python2,python3 --buildsystem=pybuild
+