Require six

to work towards Python3 support

Gbp-Dch: Ignore

diff --git a/debian/control b/debian/control
index e0d81fa95ab859a4114c18f02970fe2cbc43b681..e679bdf80665105c38ff19efb17b1bdbd4c47d8b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
  python-nosexcover,
  python-pkg-resources,
  python-rpm,
+ python-six,
  python-setuptools,
  rpm,
  sgml2x,
@@ -44,6 +45,7 @@ Depends: ${python:Depends},
  man-db,
  python-dateutil,
  python-pkg-resources,
+ python-six,
 Recommends: pristine-tar (>= 0.5), cowbuilder, python-requests
 Suggests: python-notify, unzip
 Description: Suite to help with Debian packages in Git repositories

diff --git a/setup.py b/setup.py
index 896edab24712384bb8c3064a1a398e40daa7a232..9216805aa721b7804f88ef8661428f1bb7df4b3b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(name = "gbp",
       scripts = ['bin/git-pbuilder'],
       packages = find_packages(exclude=['tests', 'tests.*']),
       data_files = [("/etc/git-buildpackage/", ["gbp.conf"]),],
+      requires = ["six"],
       setup_requires=['nose>=0.11.1', 'coverage>=2.85', 'nosexcover>=1.0.7'] if \
                         os.getenv('WITHOUT_NOSETESTS') is None else [],
       entry_points = {