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

[zigo at users.alioth.debian.org]

    Date: Wednesday, June 25, 2014 @ 17:23:11
  Author: zigo
Revision: 29501

Move all the doc generation stuff into the override_dh_sphinxdoc.

Modified:
  packages/python-networkx/trunk/debian/changelog
  packages/python-networkx/trunk/debian/rules
Deleted:
  packages/python-networkx/trunk/debian/python-networkx-doc.install

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2014-06-25 17:23:07 UTC (rev 29500)
+++ packages/python-networkx/trunk/debian/changelog	2014-06-25 17:23:11 UTC (rev 29501)
@@ -20,6 +20,7 @@
   * Added do-not-use-sphinx_rtd_theme.patch.
   * debian/rules: do not use setup_egg.py, it's gone from upstream source.
   * Do not manage the jquery.js symlink: dh_sphinxdoc does it for us.
+  * Move all the doc generation stuff into the override_dh_sphinxdoc.
 
  -- Thomas Goirand <zigo at debian.org>  Sun, 22 Jun 2014 07:11:42 +0000
 

Deleted: packages/python-networkx/trunk/debian/python-networkx-doc.install
===================================================================
--- packages/python-networkx/trunk/debian/python-networkx-doc.install	2014-06-25 17:23:07 UTC (rev 29500)
+++ packages/python-networkx/trunk/debian/python-networkx-doc.install	2014-06-25 17:23:11 UTC (rev 29501)
@@ -1 +0,0 @@
-doc/build/dist /usr/share/doc/python-networkx-doc/

Modified: packages/python-networkx/trunk/debian/rules
===================================================================
--- packages/python-networkx/trunk/debian/rules	2014-06-25 17:23:07 UTC (rev 29500)
+++ packages/python-networkx/trunk/debian/rules	2014-06-25 17:23:11 UTC (rev 29501)
@@ -21,12 +21,6 @@
 	# Make sure that there's no .pyc left
 	find . -name '*.pyc' -exec rm {} ';'
 
-override_dh_auto_build:
-	dh_auto_build
-
-	# build doc, run in a separate shell, so we can export MPLCONFIGDIR
-	(export MPLCONFIGDIR=. ; make -C doc dist PYTHONPATH=../$(LIB2))
-
 override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	set -e ; \
@@ -63,17 +57,20 @@
 	# don't ship python 2 code for _decorator because it can't be byte-compiled
 	rm -f debian/python3-networkx/usr/lib/python3/dist-packages/networkx/external/decorator/_decorator.py
 
+	dh_install
+
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	(export MPLCONFIGDIR=. ; make -C doc dist PYTHONPATH=../$(LIB2))
 	# Do some cleanup: delete unneeded files:
 	rm $(DEBIANDOC_DIR)/INSTALL.txt $(DEBIANDOC_DIR)/LICENSE.txt
 
 	# Rename the README file.
 	mv $(DEBIANDOC_DIR)/README.txt $(DEBIANDOC_DIR)/README
 
-	dh_install
-
 	# install doc from dir 'dist', but rename it to 'html', better name
-	mv debian/python-networkx-doc/usr/share/doc/python-networkx-doc/dist \
-		debian/python-networkx-doc/usr/share/doc/python-networkx-doc/html
+	cp -auxf doc/build/dist debian/python-networkx-doc/usr/share/doc/python-networkx-doc/html
 
 	# link the pdf files also at the top level dir
 	dh_link -ppython-networkx-doc /usr/share/doc/python-networkx-doc/html/_downloads/networkx_reference.pdf /usr/share/doc/python-networkx-doc/networkx_reference.pdf
@@ -82,6 +79,9 @@
 	# remove full doc zip file
 	rm -f debian/python-networkx-doc/usr/share/doc/python-networkx-doc/html/_downloads/networkx-documentation.zip
 
+	dh_sphinxdoc
+endif
+
 update_intersphinx_mapping:
 	wget http://docs.python.org/dev/objects.inv -O debian/python.org_objects.inv
 	wget http://docs.scipy.org/doc/numpy/objects.inv -O debian/scipy.org_numpy_objects.inv