From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 31 Jul 2015 08:47:50 +0000 (+0000)
Subject: Merge branch 'debian/unstable' into debian/experimental
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bd9b5add724e85290534bf01433b3faaf5d7f883;p=packages%2Ftrusty%2Fpython-pysaml2.git

Merge branch 'debian/unstable' into debian/experimental

Rewritten-From: 51c60027dbbd6d8da849f1e473a305fc0d73643b
---

bd9b5add724e85290534bf01433b3faaf5d7f883
diff --cc debian/rules
index ed29219,46a3e27..f91e758
--- a/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: