Merge branch 'debian/unstable' into debian/experimental

Rewritten-From: 51c60027dbbd6d8da849f1e473a305fc0d73643b

diff --cc debian/control
Simple merge

diff --cc debian/gbp.conf
Simple merge

diff --cc debian/rules
index ed292194c251d00b16e4b5f334181ee89796cac1,46a3e27e09b134414001548e156111c0b7a8e366..f91e758253ce167bd029d3e3b2a57c9713ad9cb8
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -6,32 -6,30 +6,30 @@@ PYTHON3S:=$(shell py3versions -vr
  UPSTREAM_GIT = git://github.com/rohe/pysaml2.git
  -include /usr/share/openstack-pkg-tools/pkgos.make
  
+ LAST_CHANGE = $(shell dpkg-parsechangelog -S Date)
+ BUILD_DATE  = $(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
+ 
  %:
 -      dh $@ --buildsystem=python_distutils --with python2,sphinxdoc
 +      dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
  
  override_dh_install:
        set -e && for pyvers in $(PYTHONS); do \
                python$$pyvers setup.py install --install-layout=deb \
 -                      --root $(CURDIR)/debian/python-pysaml2; \
 +                      --no-compile --root $(CURDIR)/debian/python-pysaml2; \
        done
        mv $(CURDIR)/debian/python-pysaml2/usr/bin/make_metadata.py \
 -              $(CURDIR)/debian/python-pysaml2/usr/bin/pysaml2-make-metadata
 +              $(CURDIR)/debian/python-pysaml2/usr/bin/python2-pysaml2-make-metadata
        mv $(CURDIR)/debian/python-pysaml2/usr/bin/mdexport.py \
 -              $(CURDIR)/debian/python-pysaml2/usr/bin/pysaml2-mdexport
 +              $(CURDIR)/debian/python-pysaml2/usr/bin/python2-pysaml2-mdexport
        mv $(CURDIR)/debian/python-pysaml2/usr/bin/parse_xsd2.py \
-               $(CURDIR)/debian/python-pysaml2/usr/bin/python2-pysaml2-parse-xsd2
- 
-       set -e && for pyvers in $(PYTHON3S); do \
-               python$$pyvers setup.py install --install-layout=deb \
-                       --no-compile --root $(CURDIR)/debian/python3-pysaml2; \
-       done
-       mv $(CURDIR)/debian/python3-pysaml2/usr/bin/make_metadata.py \
-               $(CURDIR)/debian/python3-pysaml2/usr/bin/python3-pysaml2-make-metadata
-       mv $(CURDIR)/debian/python3-pysaml2/usr/bin/mdexport.py \
-               $(CURDIR)/debian/python3-pysaml2/usr/bin/python3-pysaml2-mdexport
-       mv $(CURDIR)/debian/python3-pysaml2/usr/bin/parse_xsd2.py \
-               $(CURDIR)/debian/python3-pysaml2/usr/bin/python3-pysaml2-parse-xsd2
- 
+               $(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
        rm -rf $(CURDIR)/debian/python*-pysaml2/usr/lib/python*/dist-packages/*.pth
  
  override_dh_auto_test: