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

[morph at users.alioth.debian.org]

    Date: Thursday, September 23, 2010 @ 21:36:04
  Author: morph
Revision: 14478

use 'dist' to build doc; add missing b-d to build documentation

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

Modified: packages/python-networkx/trunk/debian/control
===================================================================
--- packages/python-networkx/trunk/debian/control	2010-09-23 20:18:43 UTC (rev 14477)
+++ packages/python-networkx/trunk/debian/control	2010-09-23 21:36:04 UTC (rev 14478)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: python (>= 2.3.5-11), python-support (>= 1), python-setuptools (>= 0.6a9), python-nose (>= 0.10.1), python-sphinx (>= 1.0.0)
+Build-Depends-Indep: python (>= 2.3.5-11), python-support (>= 1), python-setuptools (>= 0.6a9), python-nose (>= 0.10.1), python-sphinx (>= 1.0.0), zip, texlive-latex-base, texlive-binaries, python-matplotlib, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended
 Standards-Version: 3.9.1
 XS-Python-Version: >= 2.6
 Homepage: http://networkx.lanl.gov/

Modified: packages/python-networkx/trunk/debian/python-networkx-doc.install
===================================================================
--- packages/python-networkx/trunk/debian/python-networkx-doc.install	2010-09-23 20:18:43 UTC (rev 14477)
+++ packages/python-networkx/trunk/debian/python-networkx-doc.install	2010-09-23 21:36:04 UTC (rev 14478)
@@ -1 +1 @@
-doc/build/html /usr/share/doc/python-networkx-doc/
+doc/build/dist /usr/share/doc/python-networkx-doc/

Modified: packages/python-networkx/trunk/debian/rules
===================================================================
--- packages/python-networkx/trunk/debian/rules	2010-09-23 20:18:43 UTC (rev 14477)
+++ packages/python-networkx/trunk/debian/rules	2010-09-23 21:36:04 UTC (rev 14478)
@@ -29,7 +29,7 @@
 
 build-indep:
 	# build doc
-	make -C doc html PYTHONPATH=../$(PYLIBPATH)
+	make -C doc dist PYTHONPATH=../$(PYLIBPATH)
 
 override_dh_install:
 	# Install w/o compiling *.pyc files
@@ -48,6 +48,11 @@
 	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
+
 	rm -rf debian/python-networkx-doc/usr/share/doc/python-networkx-doc/html/_static/jquery.js
 	dh_link -ppython-networkx-doc /usr/share/javascript/jquery/jquery.js /usr/share/doc/python-networkx-doc/html/_static/jquery.js
 
@@ -56,4 +61,4 @@
 	wget http://docs.scipy.org/doc/numpy/objects.inv -O debian/scipy.org_numpy_objects.inv
 
 override_dh_compress:
-	dh_compress -Xexamples/ -X.js
+	dh_compress -Xexamples/ -X.js -X.pdf