Merge "Update script for debian package creation."

14 files changed, 436 insertions, 28 deletions

diff --git a/keystonemiddleware-moon/debian/changelog b/keystonemiddleware-moon/debian/changelog
new file mode 100644
index 00000000..ffc44169
--- /dev/null
+++ b/keystonemiddleware-moon/debian/changelog
@@ -0,0 +1,121 @@
+python-keystonemiddleware (4.4.0-4) UNRELEASED; urgency=medium
+
+  * Standards-Version is 3.9.8 now (no change)
+  * d/rules: Changed UPSTREAM_GIT protocol to https
+  * d/copyright: Changed source URL to https protocol
+
+ -- Ondřej Nový <novy@ondrej.org>  Sat, 09 Apr 2016 19:27:43 +0200
+
+python-keystonemiddleware (4.4.0-3) unstable; urgency=medium
+
+  * Re-add missing auth options in oslo-config-generator:
+    - Add re-add-missing-auth-options.patch
+    - Disable now failing unit tests.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 06 Apr 2016 22:16:03 +0000
+
+python-keystonemiddleware (4.4.0-2) unstable; urgency=medium
+
+  * Added git as build-depends-indep.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 04 Apr 2016 11:22:51 +0000
+
+python-keystonemiddleware (4.4.0-1) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Fixed homepage (https).
+  * Fixed VCS URLs (https).
+
+  [ Thomas Goirand ]
+  * New upstream release.
+  * Uploading to unstable.
+  * Fixed (build-)depends for this release.
+  * Standards-Version: 3.9.7 (no change).
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 04 Apr 2016 12:21:37 +0200
+
+python-keystonemiddleware (4.0.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Also test with Python 3.
+  * Fixed debian/copyright ordering.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 10 Dec 2015 16:29:42 +0100
+
+python-keystonemiddleware (3.0.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 04 Dec 2015 11:02:00 +0100
+
+python-keystonemiddleware (2.3.0-3) unstable; urgency=medium
+
+  * Uploading to unstable.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 16 Oct 2015 10:04:17 +0000
+
+python-keystonemiddleware (2.3.0-2) experimental; urgency=medium
+
+  * Added Python 3 support.
+
+ -- Thomas Goirand <zigo@debian.org>  Sat, 03 Oct 2015 19:48:25 +0200
+
+python-keystonemiddleware (2.3.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Align dependencies with upstream.
+  * d/control: Update uploaders.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 30 Sep 2015 14:42:41 -0400
+
+python-keystonemiddleware (2.1.0-2) experimental; urgency=medium
+
+  * Removed python-bandit build-depends.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 30 Jul 2015 20:50:50 +0000
+
+python-keystonemiddleware (2.1.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Fixed watch file.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 30 Jul 2015 07:38:14 +0000
+
+python-keystonemiddleware (1.5.0-2) unstable; urgency=high
+
+  * CVE-2015-1852: S3Token TLS cert verification option not honored. Applied
+    upstream patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 17 Jun 2015 08:28:00 +0000
+
+python-keystonemiddleware (1.5.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Removed nature.css from debian/copyright (and it's BSD licence).
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 08 Apr 2015 10:08:46 +0200
+
+python-keystonemiddleware (1.0.0-3) unstable; urgency=medium
+
+  * Added CVE-2014-7144_convert_the_conf_value_into_correct_type.patch. Thanks
+    to Luciano Bello <luciano@debian.org> for the report (Closes: #762748).
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 25 Sep 2014 07:16:29 +0000
+
+python-keystonemiddleware (1.0.0-2) unstable; urgency=medium
+
+  * Do not attempt to run unit tests in Python 2.6, as it needs the discover
+    package, which we don't want as build-depends.
+  * Removes intersphinx plugin from docs build.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 28 Jul 2014 00:29:44 +0800
+
+python-keystonemiddleware (1.0.0-1) unstable; urgency=medium
+
+  * Initial release. (Closes: #755135)
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 08 Jul 2014 14:25:47 +0800
diff --git a/keystonemiddleware-moon/debian/compat b/keystonemiddleware-moon/debian/compat
new file mode 100644
index 00000000..ec635144
--- /dev/null
+++ b/keystonemiddleware-moon/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/keystonemiddleware-moon/debian/control b/keystonemiddleware-moon/debian/control
new file mode 100644
index 00000000..a6dd5eab
--- /dev/null
+++ b/keystonemiddleware-moon/debian/control
@@ -0,0 +1,136 @@
+Source: python-keystonemiddleware
+Section: python
+Priority: optional
+Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
+Uploaders: Thomas Goirand <zigo@debian.org>,
+           Corey Bryant <corey.bryant@canonical.com>,
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               openstack-pkg-tools,
+               python-all,
+               python-pbr (>= 1.8),
+               python-setuptools,
+               python-sphinx,
+               python3-all,
+               python3-pbr (>= 1.8),
+               python3-setuptools,
+Build-Depends-Indep: git,
+                     python-bandit,
+                     python-coverage,
+                     python-crypto,
+                     python-fixtures (>= 1.3.1),
+                     python-hacking,
+                     python-keystoneauth1 (>= 2.1.0),
+                     python-keystoneclient (>= 1:1.6.0),
+                     python-memcache (>= 1.56),
+                     python-mock (>= 1.2),
+                     python-oslo.config (>= 1:3.7.0),
+                     python-oslo.context (>= 0.2.0),
+                     python-oslo.i18n (>= 2.1.0),
+                     python-oslo.messaging (>= 4.0.0),
+                     python-oslo.serialization (>= 1.10.0),
+                     python-oslo.utils (>= 3.5.0),
+                     python-oslosphinx (>= 2.5.0),
+                     python-oslotest (>= 1.10.0),
+                     python-positional (>= 1.0.1),
+                     python-pycadf (>= 1.1.0),
+                     python-requests (>= 2.8.1),
+                     python-requests-mock (>= 0.7.0),
+                     python-six (>= 1.9.0),
+                     python-stevedore (>= 1.5.0),
+                     python-testresources,
+                     python-testtools (>= 1.4.0),
+                     python-webob,
+                     python3-bandit,
+                     python3-crypto,
+                     python3-fixtures (>= 1.3.1),
+                     python3-keystoneauth1 (>= 2.1.0),
+                     python3-keystoneclient (>= 1:1.6.0),
+                     python3-memcache (>= 1.56),
+                     python3-mock (>= 1.2),
+                     python3-oslo.config (>= 1:3.7.0),
+                     python3-oslo.context (>= 0.2.0),
+                     python3-oslo.i18n (>= 2.1.0),
+                     python3-oslo.messaging (>= 4.0.0),
+                     python3-oslo.serialization (>= 1.10.0),
+                     python3-oslo.utils (>= 3.5.0),
+                     python3-oslotest (>= 1.10.0),
+                     python3-positional (>= 1.0.1),
+                     python3-pycadf (>= 1.1.0),
+                     python3-requests (>= 2.8.1),
+                     python3-requests-mock (>= 0.7.0),
+                     python3-six (>= 1.9.0),
+                     python3-stevedore (>= 1.5.0),
+                     python3-subunit,
+                     python3-testresources,
+                     python3-testtools (>= 1.4.0),
+                     python3-webob,
+                     subunit,
+                     testrepository,
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-keystonemiddleware.git/
+Vcs-Git: https://anonscm.debian.org/git/openstack/python-keystonemiddleware.git
+Homepage: https://launchpad.net/keystonemiddleware
+
+Package: python-keystonemiddleware
+Architecture: all
+Depends: python-keystoneauth1 (>= 2.1.0),
+         python-keystoneclient (>= 1:1.6.0),
+         python-oslo.config (>= 1:3.7.0),
+         python-oslo.context (>= 0.2.0),
+         python-oslo.i18n (>= 2.1.0),
+         python-oslo.serialization (>= 1.10.0),
+         python-oslo.utils (>= 3.5.0),
+         python-pbr (>= 1.8),
+         python-positional (>= 1.0.1),
+         python-pycadf (>= 1.1.0),
+         python-requests (>= 2.8.1),
+         python-six (>= 1.9.0),
+         python-webob,
+         ${misc:Depends},
+         ${python:Depends},
+Description: Middleware for OpenStack Identity (Keystone) - Python 2.x
+ This package contains middleware modules designed to provide authentication
+ and authorization features to web services other than Keystone. The most
+ prominent module is keystonemiddleware.auth_token. This package does not
+ expose any CLI or Python API features.
+ .
+ This package contains the Python 2.x module.
+
+Package: python3-keystonemiddleware
+Architecture: all
+Depends: python3-keystoneauth1 (>= 2.1.0),
+         python3-keystoneclient (>= 1:1.6.0),
+         python3-oslo.config (>= 1:3.7.0),
+         python3-oslo.context (>= 0.2.0),
+         python3-oslo.i18n (>= 2.1.0),
+         python3-oslo.serialization (>= 1.10.0),
+         python3-oslo.utils (>= 3.5.0),
+         python3-pbr (>= 1.8),
+         python3-positional (>= 1.0.1),
+         python3-pycadf (>= 1.1.0),
+         python3-requests (>= 2.8.1),
+         python3-six (>= 1.9.0),
+         python3-webob,
+         ${misc:Depends},
+         ${python3:Depends},
+Description: Middleware for OpenStack Identity (Keystone) - Python 3.x
+ This package contains middleware modules designed to provide authentication
+ and authorization features to web services other than Keystone. The most
+ prominent module is keystonemiddleware.auth_token. This package does not
+ expose any CLI or Python API features.
+ .
+ This package contains the Python 3.x module.
+
+Package: python-keystonemiddleware-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends},
+Description: Middleware for OpenStack Identity (Keystone) - doc
+ This package contains middleware modules designed to provide authentication
+ and authorization features to web services other than Keystone. The most
+ prominent module is keystonemiddleware.auth_token. This package does not
+ expose any CLI or Python API features.
+ .
+ This package contains the documentation.
diff --git a/keystonemiddleware-moon/debian/copyright b/keystonemiddleware-moon/debian/copyright
new file mode 100644
index 00000000..cae54f2a
--- /dev/null
+++ b/keystonemiddleware-moon/debian/copyright
@@ -0,0 +1,27 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: keystonemiddleware
+Source: https://launchpad.net/keystonemiddleware
+
+Files: *
+Copyright: (c) 2013-2016, OpenStack Foundation <openstack-dev@lists.openstack.org>
+License: Apache-2
+
+Files: debian/*
+Copyright: (c) 2014-2016, Thomas Goirand <zigo@debian.org>
+License: Apache-2
+
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in /usr/share/common-licenses/Apache-2.0.
diff --git a/keystonemiddleware-moon/debian/create_deb.py b/keystonemiddleware-moon/debian/create_deb.py
index e8e082ba..03d6b790 100644
--- a/keystonemiddleware-moon/debian/create_deb.py
+++ b/keystonemiddleware-moon/debian/create_deb.py
@@ -4,9 +4,16 @@ import os
 import sys
 import subprocess
 import glob
+import argparse
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--src', help='Do not clone Moon repository, use SRC as source directory', dest="src")
+args = parser.parse_args()
 
 
 TMP_DIR = "/tmp/debian-moon"
+MOON_DIR = os.path.join(TMP_DIR, "moon")
 INIT_dir = os.path.split(os.path.abspath(sys.argv[0]))[0]
 
 print("init dir: {}".format(INIT_dir))
@@ -21,36 +28,40 @@ _run = subprocess.run(["sudo", "apt-get", "install", "-y", "git"])
 if _run.returncode != 0:
     exit("\033[31mCannot install Git\033[m")
 
-print("\033[32mCloning Debian version\033[m")
-_run = subprocess.run(["git", "clone", "https://anonscm.debian.org/git/openstack/python-keystonemiddleware.git"])
-if _run.returncode != 0:
-    os.chdir(os.path.join(TMP_DIR, "python-keystonemiddleware"))
-    _run = subprocess.run(["git", "pull"])
-    if _run.returncode != 0:
-        print("\033[31mCannot clone ou pull debian version\033[m")
+# print("\033[32mCloning Debian version\033[m")
+# _run = subprocess.run(["git", "clone", "https://anonscm.debian.org/git/openstack/python-keystonemiddleware.git"])
+# if _run.returncode != 0:
+#     os.chdir(os.path.join(TMP_DIR, "python-keystonemiddleware"))
+#     _run = subprocess.run(["git", "pull"])
+#     if _run.returncode != 0:
+#         print("\033[31mCannot clone ou pull debian version\033[m")
 
 os.chdir(TMP_DIR)
 
-print("\033[32mCloning Moon project\033[m")
-_run = subprocess.run(["git", "clone", "https://git.opnfv.org/moon"])
-if _run.returncode != 0:
-    os.chdir(os.path.join(TMP_DIR, "moon"))
-    _run = subprocess.run(["git", "pull"])
+if args.src:
+    print("\033[32mUsing {} as source directory\033[m".format(args.src))
+    MOON_DIR = args.src
+else:
+    print("\033[32mCloning Moon project\033[m")
+    _run = subprocess.run(["git", "clone", "https://git.opnfv.org/moon"])
     if _run.returncode != 0:
-        print("\033[31mCannot clone Moon project\033[m")
+        os.chdir(os.path.join(TMP_DIR, "moon"))
+        _run = subprocess.run(["git", "pull"])
+        if _run.returncode != 0:
+            print("\033[31mCannot clone Moon project\033[m")
 
 os.chdir(TMP_DIR)
 
-src_path = os.path.join(TMP_DIR, "python-keystonemiddleware", "debian")
-dst_path = os.path.join(TMP_DIR, "moon", "keystonemiddleware-moon")
-print("\033[32mCopying from {} to {}\033[m".format(src_path, dst_path))
-_run = subprocess.run(["cp",
-                       "-rv",
-                       src_path,
-                       dst_path])
+# src_path = os.path.join(TMP_DIR, "python-keystonemiddleware", "debian")
+# dst_path = os.path.join(TMP_DIR, "moon", "keystonemiddleware-moon")
+# print("\033[32mCopying from {} to {}\033[m".format(src_path, dst_path))
+# _run = subprocess.run(["cp",
+#                        "-rv",
+#                        src_path,
+#                        dst_path])
 
 print("\033[32mBuilding Moon project\033[m")
-os.chdir(os.path.join(TMP_DIR, "moon", "keystonemiddleware-moon"))
+os.chdir(os.path.join(MOON_DIR, "keystonemiddleware-moon"))
 
 mandatory_deb_pkg = """dh-apparmor
 dh-systemd
@@ -142,8 +153,7 @@ _command.extend(mandatory_deb_pkg.split())
 _run = subprocess.run(_command)
 
 print("\033[32mremove a Debian patch as it inserts a bug in Moon\033[m")
-series_filename = os.path.join(TMP_DIR,
-                               "moon", "keystonemiddleware-moon",
+series_filename = os.path.join(MOON_DIR, "keystonemiddleware-moon",
                                "debian", "patches", "series")
 series_lines = open(series_filename).readlines()
 
@@ -153,18 +163,17 @@ for line in series_lines:
         output.write(line)
         output.write("\n")
 output.close()
-os.remove(os.path.join(TMP_DIR,
-                       "moon", "keystonemiddleware-moon",
+os.remove(os.path.join(MOON_DIR, "keystonemiddleware-moon",
                        "debian", "patches", "re-add-missing-auth-options.patch"))
 
 os.putenv("DEB_BUILD_OPTIONS", "nocheck")
 
-changelog = open(os.path.join(TMP_DIR, "moon", "keystonemiddleware-moon", "debian", "changelog"), "rt")
+changelog = open(os.path.join(MOON_DIR, "keystonemiddleware-moon", "debian", "changelog"), "rt")
 changelog_str = changelog.read()
 # print(changelog_str.splitlines()[0])
 current_version = changelog_str.splitlines()[0].split("(")[1].split(")")[0]
 changelog.close()
-changelog = open(os.path.join(TMP_DIR, "moon", "keystonemiddleware-moon", "debian", "changelog"), "wt")
+changelog = open(os.path.join(MOON_DIR, "keystonemiddleware-moon", "debian", "changelog"), "wt")
 changelog.write("""python-keystonemiddleware ({version}) UNRELEASED; urgency=medium
 
   * integration of the Moon platform.
@@ -182,6 +191,6 @@ _run = subprocess.run(["dpkg-buildpackage", "-b", "-us"])
 print("\033[32mResults:\033[m")
 subprocess.run(["mkdir", "-p", "/tmp/deb"])
 
-files = glob.glob(os.path.join(TMP_DIR, "moon", "*.deb"))
+files = glob.glob(os.path.join(MOON_DIR, "*.deb"))
 for _file in files:
     subprocess.run(["mv", "-v", _file, "/tmp/deb/"])
diff --git a/keystonemiddleware-moon/debian/gbp.conf b/keystonemiddleware-moon/debian/gbp.conf
new file mode 100644
index 00000000..7436424b
--- /dev/null
+++ b/keystonemiddleware-moon/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+upstream-branch = master
+debian-branch = debian/mitaka
+upstream-tag = %(version)s
+compression = xz
+
+[buildpackage]
+export-dir = ../build-area/
+
diff --git a/keystonemiddleware-moon/debian/patches/no-intersphinx.patch b/keystonemiddleware-moon/debian/patches/no-intersphinx.patch
new file mode 100644
index 00000000..a5e25751
--- /dev/null
+++ b/keystonemiddleware-moon/debian/patches/no-intersphinx.patch
@@ -0,0 +1,17 @@
+Description: Remove the intersphinx plugin.
+ Do not use the intersphinx plugin which is doing network access during
+ the build.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2014-07-28
+
+--- python-keystonemiddleware-1.0.0.orig/doc/source/conf.py
++++ python-keystonemiddleware-1.0.0/doc/source/conf.py
+@@ -42,7 +42,6 @@ sys.path.insert(0, os.path.abspath(os.pa
+ extensions = ['sphinx.ext.autodoc',
+               'sphinx.ext.todo',
+               'sphinx.ext.coverage',
+-              'sphinx.ext.intersphinx',
+               # NOTE(blk-u): Uncomment the [pbr] section in setup.cfg and
+               # remove this Sphinx extension when
+               # https://launchpad.net/bugs/1260495 is fixed.
diff --git a/keystonemiddleware-moon/debian/patches/re-add-missing-auth-options.patch b/keystonemiddleware-moon/debian/patches/re-add-missing-auth-options.patch
new file mode 100644
index 00000000..fc981d0c
--- /dev/null
+++ b/keystonemiddleware-moon/debian/patches/re-add-missing-auth-options.patch
@@ -0,0 +1,18 @@
+Description: Re-add missing auth options
+ Upstream went a bit quick to remove Auth options from the default generated
+ config files.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-04-07
+
+--- python-keystonemiddleware-4.4.0.orig/keystonemiddleware/auth_token/__init__.py
++++ python-keystonemiddleware-4.4.0/keystonemiddleware/auth_token/__init__.py
+@@ -370,7 +370,7 @@ _OPTS = [
+                 ' only while migrating from a less secure algorithm to a more'
+                 ' secure one. Once all the old tokens are expired this option'
+                 ' should be set to a single value for better performance.'),
+-]
++] + _auth.OPTS
+ 
+ CONF = cfg.CONF
+ CONF.register_opts(_OPTS, group=_base.AUTHTOKEN_GROUP)
diff --git a/keystonemiddleware-moon/debian/patches/series b/keystonemiddleware-moon/debian/patches/series
new file mode 100644
index 00000000..3c47073f
--- /dev/null
+++ b/keystonemiddleware-moon/debian/patches/series
@@ -0,0 +1,2 @@
+no-intersphinx.patch
+re-add-missing-auth-options.patch
diff --git a/keystonemiddleware-moon/debian/python-keystonemiddleware-doc.doc-base b/keystonemiddleware-moon/debian/python-keystonemiddleware-doc.doc-base
new file mode 100644
index 00000000..bd08be62
--- /dev/null
+++ b/keystonemiddleware-moon/debian/python-keystonemiddleware-doc.doc-base
@@ -0,0 +1,9 @@
+Document: keystonemiddleware-doc
+Title: keystonemiddleware Documentation
+Author: N/A
+Abstract: Sphinx documentation for keystonemiddleware
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-keystonemiddleware-doc/html/index.html
+Files: /usr/share/doc/python-keystonemiddleware-doc/html/*
diff --git a/keystonemiddleware-moon/debian/rules b/keystonemiddleware-moon/debian/rules
new file mode 100755
index 00000000..2229093a
--- /dev/null
+++ b/keystonemiddleware-moon/debian/rules
@@ -0,0 +1,54 @@
+#!/usr/bin/make -f
+
+PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
+
+UPSTREAM_GIT := https://github.com/openstack/keystonemiddleware.git
+include /usr/share/openstack-pkg-tools/pkgos.make
+
+export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1)
+
+%:
+	dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
+
+override_dh_auto_install:
+	set -e ; for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-keystonemiddleware; \
+	done
+	set -e ; for pyvers in $(PYTHON3S); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python3-keystonemiddleware; \
+	done
+
+override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	echo "===> Running tests"
+	set -e ; for i in 2.7 $(PYTHON3S) ; do \
+		PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
+		echo "===> Testing with python$$i (python$$PYMAJOR)" ; \
+		rm -rf .testrepository ; \
+		testr-python$$PYMAJOR init ; \
+		TEMP_REZ=`mktemp -t` ; \
+		PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'keystonemiddleware.tests\.unit\.(?!(.*OptsTestCase.test_entry_point.*|.*test_opts.OptsTestCase.test_list_auth_token_opts.*|.*test_opts.OptsTestCase.test_original_list_all_options.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
+		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
+		rm -f $$TEMP_REZ ; \
+		testr-python$$PYMAJOR slowest ; \
+	done
+endif
+
+override_dh_clean:
+	dh_clean -O--buildsystem=python_distutils
+	rm -rf build
+
+override_dh_sphinxdoc:
+	sphinx-build -b html doc/source debian/python-keystonemiddleware-doc/usr/share/doc/python-keystonemiddleware-doc/html
+	dh_sphinxdoc -O--buildsystem=python_distutils
+
+# Commands not to run
+override_dh_installcatalogs:
+override_dh_installemacsen override_dh_installifupdown:
+override_dh_installinfo override_dh_installmenu override_dh_installmime:
+override_dh_installmodules override_dh_installlogcheck:
+override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm:
+override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal:
diff --git a/keystonemiddleware-moon/debian/source/format b/keystonemiddleware-moon/debian/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/keystonemiddleware-moon/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/keystonemiddleware-moon/debian/source/options b/keystonemiddleware-moon/debian/source/options
new file mode 100644
index 00000000..cb61fa52
--- /dev/null
+++ b/keystonemiddleware-moon/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
diff --git a/keystonemiddleware-moon/debian/watch b/keystonemiddleware-moon/debian/watch
new file mode 100644
index 00000000..d7d3dbeb
--- /dev/null
+++ b/keystonemiddleware-moon/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/\.(b|rc)/~$1/" \
+https://github.com/openstack/keystonemiddleware/tags .*/(\d[\d\.]+)\.tar\.gz