[Python-modules-commits] r30789 - in packages/jsonpickle/trunk/debian (changelog rules)

[jandd at users.alioth.debian.org]

    Date: Sunday, September 28, 2014 @ 16:55:56
  Author: jandd
Revision: 30789

simplify debian/rules and build documentation in
override_dh_sphinxdoc

Modified:
  packages/jsonpickle/trunk/debian/changelog
  packages/jsonpickle/trunk/debian/rules

Modified: packages/jsonpickle/trunk/debian/changelog
===================================================================
--- packages/jsonpickle/trunk/debian/changelog	2014-09-28 16:40:22 UTC (rev 30788)
+++ packages/jsonpickle/trunk/debian/changelog	2014-09-28 16:55:56 UTC (rev 30789)
@@ -2,6 +2,8 @@
 
   * New upstream version
   * change debian/copyright to machine readable format, update copyright years
+  * simplify debian/rules and build documentation in
+    override_dh_sphinxdoc
 
  -- Jan Dittberner <jandd at debian.org>  Sun, 28 Sep 2014 18:17:05 +0200
 

Modified: packages/jsonpickle/trunk/debian/rules
===================================================================
--- packages/jsonpickle/trunk/debian/rules	2014-09-28 16:40:22 UTC (rev 30788)
+++ packages/jsonpickle/trunk/debian/rules	2014-09-28 16:55:56 UTC (rev 30789)
@@ -6,19 +6,13 @@
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build:
-	dh_auto_build
-	sphinx-build -N -q -E -b html docs/source docs/build
-
-override_dh_auto_install:
-	dh_auto_install
-	mkdir -p $(CURDIR)/debian/python-jsonpickle-doc/usr/share/doc/python-jsonpickle-doc
-	mv docs/build $(CURDIR)/debian/python-jsonpickle-doc/usr/share/doc/python-jsonpickle-doc/html
-
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="tests/runtests.py" dh_auto_test
 
 override_dh_sphinxdoc:
-	dh_sphinxdoc -p python-jsonpickle-doc
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	sphinx-build -b html docs/source $(CURDIR)/debian/python-jsonpickle-doc/usr/share/doc/python-jsonpickle-doc/html
+	dh_sphinxdoc -O--buildsystem=pybuild
+endif