--- a/__pkginfo__.py	Wed Sep 16 11:32:09 2015 +0200
+++ b/__pkginfo__.py	Wed Sep 16 14:45:15 2015 +0200
@@ -39,6 +39,7 @@
 ]
 
 __depends__ = {
+    'six': '>= 1.4.0',
     'logilab-common': '>= 0.63.1',
     'logilab-mtconverter': '>= 0.8.0',
     'rql': '>= 0.31.2',

--- a/cubicweb.spec	Wed Sep 16 11:32:09 2015 +0200
+++ b/cubicweb.spec	Wed Sep 16 14:45:15 2015 +0200
@@ -20,6 +20,7 @@
 BuildArch:      noarch
 
 Requires:       %{python}
+Requires:       %{python}-six >= 1.4.0
 Requires:       %{python}-logilab-common >= 0.63.1
 Requires:       %{python}-logilab-mtconverter >= 0.8.0
 Requires:       %{python}-rql >= 0.31.2

--- a/debian/control	Wed Sep 16 11:32:09 2015 +0200
+++ b/debian/control	Wed Sep 16 14:45:15 2015 +0200
@@ -10,6 +10,7 @@
 Build-Depends:
  debhelper (>= 7),
  python (>= 2.6),
+ python-six (>= 1.4.0),
  python-sphinx,
  python-logilab-common,
  python-unittest2 | python (>= 2.7),
@@ -155,6 +156,7 @@
  ${python:Depends},
  graphviz,
  gettext,
+ python-six (>= 1.4.0),
  python-logilab-mtconverter (>= 0.8.0),
  python-logilab-common (>= 0.63.1),
  python-markdown,

--- a/devtools/devctl.py	Wed Sep 16 11:32:09 2015 +0200
+++ b/devtools/devctl.py	Wed Sep 16 14:45:15 2015 +0200
@@ -650,7 +650,8 @@
         if verbose:
             longdesc = raw_input(
                 'Enter a long description (leave empty to reuse the short one): ')
-        dependencies = {'cubicweb': '>= %s' % cubicwebversion}
+        dependencies = {'cubicweb': '>= %s' % cubicwebversion,
+                        'six': '>= 1.4.0',}
         if verbose:
             dependencies.update(self._ask_for_dependencies())
         context = {'cubename' : cubename,

--- a/skeleton/DISTNAME.spec.tmpl	Wed Sep 16 11:32:09 2015 +0200
+++ b/skeleton/DISTNAME.spec.tmpl	Wed Sep 16 14:45:15 2015 +0200
@@ -21,6 +21,7 @@
 
 BuildRequires:  %%{python} %%{python}-setuptools
 Requires:       cubicweb >= %(version)s
+Requires:       %{python}-six >= 1.4.0
 
 %%description
 %(longdesc)s

--- a/skeleton/debian/control.tmpl	Wed Sep 16 11:32:09 2015 +0200
+++ b/skeleton/debian/control.tmpl	Wed Sep 16 14:45:15 2015 +0200
@@ -12,6 +12,7 @@
 Architecture: all
 Depends:
  cubicweb-common (>= %(version)s),
+ python-six (>= 1.4.0),
  ${python:Depends},
  ${misc:Depends},
 Description: %(shortdesc)s