Merge lp:~coreygoldberg/python-keystoneclient/py3-packaging-keystoneclient into lp:~ubuntu-server-dev/python-keystoneclient/juno

[Corey Goldberg]

packaging for python3-keystoneclient

packaging for python3-keystoneclient.

[lp:~coreygoldberg/python-keystoneclient/py3-packaging-keystoneclient]

96. By Corey Goldberg on 2014-09-18

updated build rules for py3

97. By Corey Goldberg on 2014-09-18

packaging fix

98. By Corey Goldberg on 2014-09-19

added .install files for packaging

99. By Corey Goldberg on 2014-09-19

fix packaging .install files

100. By Corey Goldberg on 2014-09-19

packaging fix

101. By Corey Goldberg on 2014-09-19

another packaging fix

102. By Corey Goldberg on 2014-09-19

packaging fix

103. By Corey Goldberg on 2014-09-19

packaging fix

104. By Corey Goldberg on 2014-09-19

packaging fix

105. By Corey Goldberg on 2014-09-21

added py3dist-overrides

106. By Corey Goldberg on 2014-09-30

create new bin package keystoneclient-bin

107. By Corey Goldberg on 2014-09-30

added .install for packaging

[Martin Pitt (pitti)]

python3-keystoneclient is in wily, so this was done already

=== modified file 'debian/control'
--- debian/control	2014-04-22 15:26:52 +0000
+++ debian/control	2014-09-30 17:49:11 +0000
@@ -12,6 +12,7 @@
  python-keyring,
  python-httpretty,
  python-iso8601,
+ python-lxml,
  python-oslo.config,
  python-mock,
  python-mox3,
@@ -23,8 +24,31 @@
  python-six,
  python-testtools,
  python-webob,
+ python3-all (>= 3.4),
+ python3-babel,
+ python3-coverage,
+ python3-crypto,
+ python3-pbr,
+ python3-fixtures,
+ python3-keyring,
+ python3-httpretty,
+ python3-iso8601,
+ python3-oslo.config,
+ python3-lxml,
+ python3-mock,
+ python3-mox3,
+ python3-netaddr,
+ python3-prettytable,
+ python3-requests (>= 1.1.0),
+ python3-setuptools,
+ python3-simplejson,
+ python3-six,
+ python3-testtools,
+ python3-webob,
  testrepository
 Standards-Version: 3.9.4
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.4
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-keystoneclient/juno/files
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/python-keystoneclient/juno
 XS-Testsuite: autopkgtest
@@ -36,6 +60,27 @@
  python-requests (>= 1.1.0),
  ${misc:Depends},
  ${python:Depends}
+Description: Client library for OpenStack Identity API.
+ .
+ This is the Python 2 version.
+
+Package: python3-keystoneclient
+Architecture: all
+Depends: python3-iso8601,
+ python3-pkg-resources,
+ python3-requests (>= 1.1.0),
+ ${misc:Depends},
+ ${python3:Depends}
+Description: Client library for OpenStack Identity API.
+ .
+ This is the Python 3 version.
+
+Package: keystoneclient-bin
+Architecture: all
+Depends: python3-iso8601,
+ python3-pkg-resources,
+ python3-requests (>= 1.1.0),
+ ${misc:Depends},
+ ${python3:Depends}
 Description: Client library for OpenStack Identity API
- This is a client for the OpenStack Identity API. There's a Python API
- (the ``keystoneclient`` module), and a command-line script (``keystone``).
+ Provides the command-line script ``keystone``.

=== added file 'debian/keystoneclient-bin.install'
--- debian/keystoneclient-bin.install	1970-01-01 00:00:00 +0000
+++ debian/keystoneclient-bin.install	2014-09-30 17:49:11 +0000
@@ -0,0 +1,1 @@
+usr/bin/keystone

=== added file 'debian/py3dist-overrides'
--- debian/py3dist-overrides	1970-01-01 00:00:00 +0000
+++ debian/py3dist-overrides	2014-09-30 17:49:11 +0000
@@ -0,0 +1,1 @@
+argparse

=== added file 'debian/python-keystoneclient.install'
--- debian/python-keystoneclient.install	1970-01-01 00:00:00 +0000
+++ debian/python-keystoneclient.install	2014-09-30 17:49:11 +0000
@@ -0,0 +1,1 @@
+usr/lib/python2*

=== added file 'debian/python3-keystoneclient.install'
--- debian/python3-keystoneclient.install	1970-01-01 00:00:00 +0000
+++ debian/python3-keystoneclient.install	2014-09-30 17:49:11 +0000
@@ -0,0 +1,1 @@
+usr/lib/python3*

=== modified file 'debian/rules'
--- debian/rules	2013-11-14 15:51:35 +0000
+++ debian/rules	2014-09-30 17:49:11 +0000
@@ -4,12 +4,15 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@  --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	bash run_tests.sh -N -P || true
 endif
 
+override_dh_python3:
+	dh_python3 --shebang /usr/bin/python3
+
 get-orig-source:
 	uscan --verbose --force-download --rename --destdir=../build-area