[Python-modules-commits] r26045 - in packages/python-cliff/trunk/debian (3 files)

[zigo at users.alioth.debian.org]

    Date: Saturday, October 5, 2013 @ 09:33:59
  Author: zigo
Revision: 26045

  * New upstream release.
  * Added myself as uploader.
  * Ran wrap-and-sort.
  * python-pyparsing build-depends is now >= 2.0.1.
  * Now build-depends on python-all (>= 2.6.6-3~) and python3, added python3
    support and the corresponding build-depends.

Modified:
  packages/python-cliff/trunk/debian/changelog
  packages/python-cliff/trunk/debian/control
  packages/python-cliff/trunk/debian/rules

Modified: packages/python-cliff/trunk/debian/changelog
===================================================================
--- packages/python-cliff/trunk/debian/changelog	2013-10-05 09:25:29 UTC (rev 26044)
+++ packages/python-cliff/trunk/debian/changelog	2013-10-05 09:33:59 UTC (rev 26045)
@@ -1,3 +1,14 @@
+python-cliff (1.4.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added myself as uploader.
+  * Ran wrap-and-sort.
+  * python-pyparsing build-depends is now >= 2.0.1.
+  * Now build-depends on python-all (>= 2.6.6-3~) and python3, added python3
+    support and the corresponding build-depends.
+
+ -- Thomas Goirand <zigo at debian.org>  Sat, 05 Oct 2013 08:20:05 +0000
+
 python-cliff (1.4-1) unstable; urgency=low
 
   * Team upload.

Modified: packages/python-cliff/trunk/debian/control
===================================================================
--- packages/python-cliff/trunk/debian/control	2013-10-05 09:25:29 UTC (rev 26044)
+++ packages/python-cliff/trunk/debian/control	2013-10-05 09:33:59 UTC (rev 26045)
@@ -2,17 +2,19 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Jan Dittberner <jandd at debian.org>
-Build-Depends:
- debhelper (>= 9),
- python (>= 2.6.5~),
- python-cmd2,
- python-mock,
- python-nose,
- python-prettytable,
- python-pyparsing (>= 1.5.7+dfsg1),
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg-1~)
+Uploaders: Jan Dittberner <jandd at debian.org>, Thomas Goirand <zigo at debian.org>
+Build-Depends: debhelper (>= 9),
+               python-all (>= 2.6.6-3~),
+               python-cmd2,
+               python-mock,
+               python-nose,
+               python-prettytable,
+               python-pyparsing (>= 2.0.1),
+               python-setuptools,
+               python-sphinx (>= 1.0.7+dfsg-1~),
+               python3-all,
+               python3-pyparsing (>= 2.0.1),
+               python3-setuptools
 Standards-Version: 3.9.4
 Homepage: https://github.com/dreamhost/cliff
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-cliff/trunk/
@@ -21,8 +23,8 @@
 Package: python-cliff
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Recommends: python-cliff-doc (=${binary:Version})
-Description: command line interface formulation framework
+Recommends: python-cliff-doc (=${binary:Version}), ${python:Recommends}
+Description: command line interface formulation framework - Python 2.x
  Cliff is a framework for building command line programs. It uses plugins to
  define sub-commands, output formatters, and other extensions.
  .
@@ -30,8 +32,22 @@
  Subversion and git, where the main program handles some basic argument parsing
  and then invokes a sub-command to do the work.
  .
- This is the Python2 version of the package.
+ This package provides the Python 2.x module.
 
+Package: python3-cliff
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Recommends: python-cliff-doc (=${binary:Version}), ${python3:Recommends}
+Description: command line interface formulation framework - Python 3.x
+ Cliff is a framework for building command line programs. It uses plugins to
+ define sub-commands, output formatters, and other extensions.
+ .
+ The cliff framework is meant to be used to create multi-level commands such as
+ Subversion and git, where the main program handles some basic argument parsing
+ and then invokes a sub-command to do the work.
+ .
+ This package provides the Python 3.x module.
+
 Package: python-cliff-doc
 Architecture: all
 Section: doc

Modified: packages/python-cliff/trunk/debian/rules
===================================================================
--- packages/python-cliff/trunk/debian/rules	2013-10-05 09:25:29 UTC (rev 26044)
+++ packages/python-cliff/trunk/debian/rules	2013-10-05 09:33:59 UTC (rev 26045)
@@ -1,29 +1,42 @@
 #!/usr/bin/make -f
 
+PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
+
+%:
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=python_distutils
+
 override_dh_auto_install:
+	# Install the docs with sphinx
 	PYTHONPATH=$(CURDIR) sphinx-build -b html -a -c docs/source docs/source \
 	    $(CURDIR)/debian/python-cliff-doc/usr/share/doc/python-cliff-doc/html
-	python setup.py install --install-layout=deb \
-	    --root $(CURDIR)/debian/python-cliff
-#	python3 setup.py install --install-layout=deb \
-#	    --root $(CURDIR)/debian/python3-cliff
-	dh_installchangelogs docs/source/history.rst
+	set -e && for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-cliff; \
+	done
+	set -e && for pyvers in $(PYTHON3S); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python3-cliff; \
+	done
 
+override_dh_installchangelogs:
+	dh_installchangelogs -O--buildsystem=python_distutils docs/source/history.rst
+
 override_dh_clean:
 	dh_clean
-	rm -rf cliff.egg-info
+	rm -rf cliff.egg-info build
 
 override_dh_python2:
-	dh_python2 -ppython-cliff
+	dh_python2 -O--buildsystem=python_distutils -ppython-cliff
 
-#override_dh_python3:
-#	dh_python3 -ppython3-cliff
+override_dh_python3:
+	dh_python3 -O--buildsystem=python_distutils -ppython3-cliff
 
 override_dh_sphinxdoc:
-	dh_sphinxdoc -ppython-cliff-doc
+	dh_sphinxdoc -O--buildsystem=python_distutils -ppython-cliff-doc
 
 override_dh_compress:
-	dh_compress -i -X.rst -X.js -X.html -X.txt -X.py
+	dh_compress -O--buildsystem=python_distutils -i -X.rst -X.js -X.html -X.txt -X.py
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -31,5 +44,3 @@
 	PYTHONPATH=$(CURDIR)/build/lib.* python setup.py nosetests
 endif
 
-%:
-	dh $@ --with python2,sphinxdoc --buildsystem=python_distutils