[Python-modules-commits] r30463 - in packages/python-xmp-toolkit/trunk/debian (3 files)

[danstender-guest at users.alioth.debian.org]

    Date: Tuesday, September 2, 2014 @ 12:44:22
  Author: danstender-guest
Revision: 30463

deb/rules: improved sphinxdoc build (dropped deb/python-libxmp-doc.docs).

Modified:
  packages/python-xmp-toolkit/trunk/debian/changelog
  packages/python-xmp-toolkit/trunk/debian/rules
Deleted:
  packages/python-xmp-toolkit/trunk/debian/python-libxmp-doc.docs

Modified: packages/python-xmp-toolkit/trunk/debian/changelog
===================================================================
--- packages/python-xmp-toolkit/trunk/debian/changelog	2014-09-02 11:17:17 UTC (rev 30462)
+++ packages/python-xmp-toolkit/trunk/debian/changelog	2014-09-02 12:44:22 UTC (rev 30463)
@@ -1,3 +1,9 @@
+python-xmp-toolkit (2.0.1~git20140309.5437b0a-2) UNRELEASED; urgency=medium
+
+  * deb/rules: improved sphinxdoc build (dropped deb/python-libxmp-doc.docs).
+
+ -- Daniel Stender <debian at danielstender.com>  Tue, 02 Sep 2014 14:41:27 +0200
+
 python-xmp-toolkit (2.0.1~git20140309.5437b0a-1) unstable; urgency=low
 
   * Uploaded to unstable.

Deleted: packages/python-xmp-toolkit/trunk/debian/python-libxmp-doc.docs
===================================================================
--- packages/python-xmp-toolkit/trunk/debian/python-libxmp-doc.docs	2014-09-02 11:17:17 UTC (rev 30462)
+++ packages/python-xmp-toolkit/trunk/debian/python-libxmp-doc.docs	2014-09-02 12:44:22 UTC (rev 30463)
@@ -1 +0,0 @@
-docs/_build/html
\ No newline at end of file

Modified: packages/python-xmp-toolkit/trunk/debian/rules
===================================================================
--- packages/python-xmp-toolkit/trunk/debian/rules	2014-09-02 11:17:17 UTC (rev 30462)
+++ packages/python-xmp-toolkit/trunk/debian/rules	2014-09-02 12:44:22 UTC (rev 30463)
@@ -5,18 +5,10 @@
 export PYBUILD_NAME=libxmp
 
 %:
-	dh $@  --with python2,python3 --buildsystem=pybuild
+	dh $@  --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_clean:
-	rm -rf docs/_build
-	dh_auto_clean
-
-override_dh_auto_build:
-	dh_auto_build
-	python setup.py build_sphinx
-
-override_dh_installdocs:
-	dh_installdocs
-	dh_sphinxdoc
-
-# vim:ts=4 sw=4 noet
+override_dh_auto_install:
+	dh_auto_install
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N docs/ debian/python-libxmp-doc/usr/share/doc/python-libxmp-doc/html/
+endif