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

[zigo at users.alioth.debian.org]

    Date: Wednesday, April 15, 2015 @ 15:54:10
  Author: zigo
Revision: 32367

  * Fixed calls of nose.
  * Also testing with nose and python3.
  * Standards-Version is now 3.9.6.

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	2015-04-15 15:54:06 UTC (rev 32366)
+++ packages/python-cliff/trunk/debian/changelog	2015-04-15 15:54:10 UTC (rev 32367)
@@ -1,6 +1,9 @@
 python-cliff (1.10.1-1) experimental; urgency=medium
 
   * New upstream release.
+  * Fixed calls of nose.
+  * Also testing with nose and python3.
+  * Standards-Version is now 3.9.6.
 
  -- Thomas Goirand <zigo at debian.org>  Wed, 15 Apr 2015 14:57:33 +0000
 

Modified: packages/python-cliff/trunk/debian/control
===================================================================
--- packages/python-cliff/trunk/debian/control	2015-04-15 15:54:06 UTC (rev 32366)
+++ packages/python-cliff/trunk/debian/control	2015-04-15 15:54:10 UTC (rev 32367)
@@ -29,7 +29,7 @@
                      python3-pyparsing (>= 2.0.1),
                      python3-six (>= 1.9.0),
                      python3-stevedore (>= 1.1.0),
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://github.com/dreamhost/cliff
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-cliff/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-cliff/trunk

Modified: packages/python-cliff/trunk/debian/rules
===================================================================
--- packages/python-cliff/trunk/debian/rules	2015-04-15 15:54:06 UTC (rev 32366)
+++ packages/python-cliff/trunk/debian/rules	2015-04-15 15:54:10 UTC (rev 32367)
@@ -7,9 +7,6 @@
 	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
 	set -e && for pyvers in $(PYTHONS); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/python-cliff; \
@@ -20,27 +17,32 @@
 	done
 
 override_dh_installchangelogs:
-	dh_installchangelogs -O--buildsystem=python_distutils docs/source/history.rst
+	dh_installchangelogs -O--buildsystem=python_distutils doc/source/history.rst
 
 override_dh_clean:
 	dh_clean
-	rm -rf cliff.egg-info build pbr-*.egg
+	rm -rf cliff.egg-info build
 
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=$(CURDIR) sphinx-build -b html -a -c doc/source doc/source \
+	    $(CURDIR)/debian/python-cliff-doc/usr/share/doc/python-cliff-doc/html
+	dh_sphinxdoc -O--buildsystem=python_distutils -ppython-cliff-doc
+endif
+
 override_dh_python2:
 	dh_python2 -O--buildsystem=python_distutils -ppython-cliff
 
 override_dh_python3:
 	dh_python3 -O--buildsystem=python_distutils -ppython3-cliff
 
-override_dh_sphinxdoc:
-	dh_sphinxdoc -O--buildsystem=python_distutils -ppython-cliff-doc
-
 override_dh_compress:
 	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)))
 	set -e -x; \
-	PYTHONPATH=$(CURDIR)/build/lib.* python setup.py nosetests
+	PYTHONPATH=. nosetests
+	PYTHONPATH=. nosetests3
 endif