Merge lp:~ddellav/ubuntu/wily/python-pysaml2/debian-merge into lp:ubuntu/wily/python-pysaml2

[David Della Vecchia]

Merging in changes from Debian

[Corey Bryant (corey.bryant)]

Hey DDV, Just a couple of comments. One inline below in the changelog. Can you also get rid of the delta we have in gbp.conf? And might as well update debian/watch since it doesn't work as is (e.g. try uscan to get the original source tarball). You can update it to be similar to: https://wiki.debian.org/Python/LibraryStyleGuide#debian.2Fwatch (pypi.debian.net).

[lp:~ddellav/ubuntu/wily/python-pysaml2/debian-merge]

7. By David Della Vecchia on 2015-08-19

Merging changes to gbp.conf

8. By David Della Vecchia on 2015-08-20

Merging watch file. Adding entry to changelog.

9. By David Della Vecchia on 2015-08-20

Fixing stupid changelog formatting issue

Unmerged revisions

9. By David Della Vecchia on 2015-08-20

Fixing stupid changelog formatting issue

8. By David Della Vecchia on 2015-08-20

Merging watch file. Adding entry to changelog.

7. By David Della Vecchia on 2015-08-19

Merging changes to gbp.conf

6. By David Della Vecchia on 2015-08-18

Merging changes from debian upstream

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-23 13:33:26 +0000
+++ debian/changelog	2015-08-20 16:34:47 +0000
@@ -1,3 +1,29 @@
+python-pysaml2 (2.4.0-2ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Copy contents of /script directory.
+    - Create /work directory.
+    - Copy /CHANGES, /LICENSE.txt, /README.rst, /release-howto.rst.
+    - Copy /.travis.yml, /.gitignore, /.idea.
+    - Merge /setup.py.
+
+ -- David Della Vecchia <[e-mail]>  Wed, 19 Aug 2015 13:10:22 -0400
+
+python-pysaml2 (2.4.0-2) unstable; urgency=medium
+
+  * Makes build reproducible thanks to Juan Picca (Closes: #789751).
+
+ -- Thomas Goirand <[e-mail]>  Fri, 26 Jun 2015 15:41:09 +0200
+
+python-pysaml2 (2.4.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Dropped X-Python-Version: >= 2.7.
+  * Standard-Versions: is now 3.9.6.
+  * Also renames /usr/bin/merge_metadata.py as pysaml2-merge-metadata.
+
+ -- Thomas Goirand <[e-mail]>  Fri, 15 May 2015 17:48:07 +0200
+
 python-pysaml2 (2.4.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release, supporting MIR for keystone (LP: #1434526):

=== modified file 'debian/control'
--- debian/control	2015-03-23 13:33:26 +0000
+++ debian/control	2015-08-20 16:34:47 +0000
@@ -22,8 +22,7 @@
                      python-tz,
                      python-zope.interface,
                      xmlsec1
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.7
+Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-pysaml2.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-pysaml2.git
 Homepage: https://github.com/rohe/pysaml2

=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2014-09-08 16:11:53 +0000
+++ debian/gbp.conf	2015-08-20 16:34:47 +0000
@@ -4,6 +4,6 @@
 upstream-tag = %(version)s
 compression = xz
 
-[git-buildpackage]
+[buildpackage]
 export-dir = ../build-area/
 

=== modified file 'debian/rules'
--- debian/rules	2015-01-08 11:43:42 +0000
+++ debian/rules	2015-08-20 16:34:47 +0000
@@ -6,6 +6,9 @@
 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
 
@@ -20,6 +23,8 @@
 		$(CURDIR)/debian/python-pysaml2/usr/bin/pysaml2-mdexport
 	mv $(CURDIR)/debian/python-pysaml2/usr/bin/parse_xsd2.py \
 		$(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 \
@@ -39,7 +44,7 @@
 	rm -rf build
 
 override_dh_sphinxdoc:
-	sphinx-build -b html doc debian/python-pysaml2-doc/usr/share/doc/python-pysaml2-doc/html
+	sphinx-build -D today="$(BUILD_DATE)" -b html doc debian/python-pysaml2-doc/usr/share/doc/python-pysaml2-doc/html
 	dh_sphinxdoc -O--buildsystem=python_distutils
 
 # Commands not to run

=== modified file 'debian/watch'
--- debian/watch	2015-01-08 11:43:42 +0000
+++ debian/watch	2015-08-20 16:34:47 +0000
@@ -1,3 +1,3 @@
 version=3
-http://pypi.python.org/packages/source/p/pysaml2/ pysaml2-(.*).tar.gz
+http://pypi.python.org/packages/source/p/pysaml2 pysaml2-(.*).tar.gz