Added Python3 support.

Rewritten-From: 7e5d6344a3bf4597b6a3f38db2f669dabd006522

diff --git a/debian/changelog b/debian/changelog
index f1eea4535c0250a7579047f30942d17b0d462df5..e173e95b15862d2507e0a62fefecc25082bfd442 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 python-pysaml2 (3.0.0-1) experimental; urgency=medium
 
   * New upstream release.
+  * Added Python3 support.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 31 Jul 2015 08:47:57 +0000
 

diff --git a/debian/control b/debian/control
index 883c5c83f38820f222ef1ea46268fc03a9b98a94..c860ac017f174ce542fe074ebb61bcae6ea8b699 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
-               python-all (>= 2.6.6-3~),
+               python-all,
                python-setuptools,
                python-sphinx,
                python3-all (>= 3.4),
@@ -83,7 +83,6 @@ Description: SAML Version 2 to be used in a WSGI environment - Python 3.x
 Package: python-pysaml2-doc
 Section: doc
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~),
 Depends: ${misc:Depends},
          ${sphinxdoc:Depends},
 Description: SAML Version 2 to be used in a WSGI environment - doc

diff --git a/debian/rules b/debian/rules
index f91e758253ce167bd029d3e3b2a57c9713ad9cb8..600d98f9542d79c3edcd92b436c30345fb08362b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ BUILD_DATE  = $(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
        dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
 
 override_dh_install:
-       set -e && for pyvers in $(PYTHONS); do \
+       set -e ; for pyvers in $(PYTHONS); do \
                python$$pyvers setup.py install --install-layout=deb \
                        --no-compile --root $(CURDIR)/debian/python-pysaml2; \
        done
@@ -25,11 +25,10 @@ override_dh_install:
                $(CURDIR)/debian/python-pysaml2/usr/bin/pysaml2-parse-xsd2
        mv $(CURDIR)/debian/python-pysaml2/usr/bin/merge_metadata.py \
                $(CURDIR)/debian/python-pysaml2/usr/bin/pysaml2-merge-metadata
-# Python3 is not yet supported upstream
-#      set -e && for pyvers in $(PYTHON3S); do \
-#              python$$pyvers setup.py install --install-layout=deb \
-#                      --root $(CURDIR)/debian/python3-pysaml2; \
-#      done
+       set -e ; for pyvers in $(PYTHON3S); do \
+               python$$pyvers setup.py install --install-layout=deb \
+                       --root $(CURDIR)/debian/python3-pysaml2; \
+       done
        rm -rf $(CURDIR)/debian/python*-pysaml2/usr/lib/python*/dist-packages/*.pth
 
 override_dh_auto_test: