[Python-modules-commits] r31227 - in packages/flask-openid/trunk/debian (8 files)

Thu Oct 23 12:23:15 UTC 2014

Date: Thursday, October 23, 2014 @ 12:23:14
  Author: sramacher
Revision: 31227

* Add package for Python 3.
  - debian/control: Add python3-flask, python3-all, python3-openid,
    python3-setuptools and python3-openid to Build-Depends.
  - debian/rules: Build with --with python3.
* debian/python-flask-openid{,-doc}.examples: Move examples to
  python-flask-openid-doc package.
* debian/{rules,copyright}: Use uscan's File-Excluded support instead of
  custom get-orig-source-target.

Added:
  packages/flask-openid/trunk/debian/python-flask-openid-doc.examples
    (from rev 31218, packages/flask-openid/trunk/debian/python-flask-openid.examples)
  packages/flask-openid/trunk/debian/python3-flask-openid.install
  packages/flask-openid/trunk/debian/python3-flask-openid.pyremove
Modified:
  packages/flask-openid/trunk/debian/changelog
  packages/flask-openid/trunk/debian/control
  packages/flask-openid/trunk/debian/copyright
  packages/flask-openid/trunk/debian/rules
Deleted:
  packages/flask-openid/trunk/debian/python-flask-openid.examples

Modified: packages/flask-openid/trunk/debian/changelog
===================================================================

--- packages/flask-openid/trunk/debian/changelog	2014-10-23 06:56:07 UTC (rev 31226)
+++ packages/flask-openid/trunk/debian/changelog	2014-10-23 12:23:14 UTC (rev 31227)
@@ -1,3 +1,16 @@
+flask-openid (1.2.3+dfsg-2) experimental; urgency=medium
+
+  * Add package for Python 3.
+    - debian/control: Add python3-flask, python3-all, python3-openid,
+      python3-setuptools and python3-openid to Build-Depends.
+    - debian/rules: Build with --with python3.
+  * debian/python-flask-openid{,-doc}.examples: Move examples to
+    python-flask-openid-doc package.
+  * debian/{rules,copyright}: Use uscan's File-Excluded support instead of
+    custom get-orig-source-target.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Thu, 23 Oct 2014 14:18:42 +0200
+
 flask-openid (1.2.3+dfsg-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/flask-openid/trunk/debian/control
===================================================================
--- packages/flask-openid/trunk/debian/control	2014-10-23 06:56:07 UTC (rev 31226)
+++ packages/flask-openid/trunk/debian/control	2014-10-23 12:23:14 UTC (rev 31227)
@@ -7,10 +7,14 @@
  debhelper (>= 9),
  dh-python,
  python-all,
+ python3-all,
  python-setuptools,
+ python3-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
  python-flask (>= 0.8),
+ python3-flask (>= 0.8),
  python-openid (>= 2.0),
+ python3-openid (>= 2.0),
  python-doc
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.6
@@ -26,11 +30,28 @@
  python-flask (>= 0.8),
  python-openid (>= 2.0)
 Suggests: python-flask-openid-doc
-Description: OpenID support for Flask applications
+Description: OpenID support for Flask applications (Python 2)
  Flask-OpenID is an extension to Flask to add OpenID based authentication. It
  supports OpenID 2.x and has basic support for the Simple Registration (SReg)
  and Attribute Exchange (AX) extensions.
+ .
+ This package contains the module for Python 2.
 
+Package: python3-flask-openid
+Architecture: all
+Depends:
+ ${python3:Depends},
+ ${misc:Depends},
+ python3-flask (>= 0.8),
+ python3-openid (>= 2.0)
+Suggests: python-flask-openid-doc
+Description: OpenID support for Flask applications (Python 3)
+ Flask-OpenID is an extension to Flask to add OpenID based authentication. It
+ supports OpenID 2.x and has basic support for the Simple Registration (SReg)
+ and Attribute Exchange (AX) extensions.
+ .
+ This package contains the module for Python 3.
+
 Package: python-flask-openid-doc
 Architecture: all
 Section: doc

Modified: packages/flask-openid/trunk/debian/copyright
===================================================================
--- packages/flask-openid/trunk/debian/copyright	2014-10-23 06:56:07 UTC (rev 31226)
+++ packages/flask-openid/trunk/debian/copyright	2014-10-23 12:23:14 UTC (rev 31227)
@@ -4,6 +4,7 @@
 Comment:
  The file example/static/openid.png has been removed since the license and the
  usage policy of the OpenID logo are unclear.
+Files-Excluded: example/static/openid.png
 
 Files: *
 Copyright: 2010 by Armin Ronacher <armin.ronacher at active-4.com>

Copied: packages/flask-openid/trunk/debian/python-flask-openid-doc.examples (from rev 31218, packages/flask-openid/trunk/debian/python-flask-openid.examples)
===================================================================
--- packages/flask-openid/trunk/debian/python-flask-openid-doc.examples	                        (rev 0)
+++ packages/flask-openid/trunk/debian/python-flask-openid-doc.examples	2014-10-23 12:23:14 UTC (rev 31227)
@@ -0,0 +1 @@
+example/*

Deleted: packages/flask-openid/trunk/debian/python-flask-openid.examples
===================================================================
--- packages/flask-openid/trunk/debian/python-flask-openid.examples	2014-10-23 06:56:07 UTC (rev 31226)
+++ packages/flask-openid/trunk/debian/python-flask-openid.examples	2014-10-23 12:23:14 UTC (rev 31227)
@@ -1 +0,0 @@
-example/*

Added: packages/flask-openid/trunk/debian/python3-flask-openid.install
===================================================================
--- packages/flask-openid/trunk/debian/python3-flask-openid.install	                        (rev 0)
+++ packages/flask-openid/trunk/debian/python3-flask-openid.install	2014-10-23 12:23:14 UTC (rev 31227)
@@ -0,0 +1 @@
+usr/lib/python3*

Added: packages/flask-openid/trunk/debian/python3-flask-openid.pyremove
===================================================================
--- packages/flask-openid/trunk/debian/python3-flask-openid.pyremove	                        (rev 0)
+++ packages/flask-openid/trunk/debian/python3-flask-openid.pyremove	2014-10-23 12:23:14 UTC (rev 31227)
@@ -0,0 +1 @@
+SOURCES.txt

Modified: packages/flask-openid/trunk/debian/rules
===================================================================
--- packages/flask-openid/trunk/debian/rules	2014-10-23 06:56:07 UTC (rev 31226)
+++ packages/flask-openid/trunk/debian/rules	2014-10-23 12:23:14 UTC (rev 31227)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with=python2,sphinxdoc --buildsystem=pybuild
+	dh $@ --with=python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_clean:
 	dh_clean
@@ -10,29 +10,3 @@
 override_dh_auto_build:
 	dh_auto_build
 	python setup.py build_sphinx
-
-DEB_DEBDIR=$(dir $(firstword $(MAKEFILE_LIST)))
-DEB_VER_DFSG=$(shell dpkg-parsechangelog -l$(DEB_DEBDIR)/changelog \
-	| sed -ne 's/^Version: \(.*\)-[^-]*/\1/p')
-DEB_VER=$(shell echo $(DEB_VER_DFSG) \
-	| sed -ne 's/\(.*\)+dfsg/\1/p')
-get-orig-source:
-	uscan --no-conf \
-		--download \
-		--force-download \
-		--rename \
-		--watchfile $(DEB_DEBDIR)/watch \
-		--package flask-openid \
-		--upstream-version $(DEB_VER_DFSG) \
-		--destdir=.
-	TMPD=`mktemp -d` && \
-		tar -xaf "flask-openid_$(DEB_VER).orig.tar.gz" -C "$$TMPD" && \
-		rm "flask-openid_$(DEB_VER).orig.tar.gz" && \
-		mv "$$TMPD/Flask-OpenID-$(DEB_VER)" \
-			"$$TMPD/Flask-OpenID-$(DEB_VER_DFSG)" && \
-		find "$$TMPD" -name openid.png -delete && \
-		GZIP="-9fn" tar -ca \
-			--owner=root --group=root \
-			-f "flask-openid_$(DEB_VER_DFSG).orig.tar.gz" \
-			-C "$$TMPD" . && \
-		rm -rf "$$TMPD"


