From 06499567907cbd43afb8af4cac6583740cf55fa3 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 3 May 2012 21:08:27 -0400 Subject: [PATCH] PKG: Move any handing of docs under if_nodoc, no need for custom mv if there is .docs --- debian/python-skimage-doc.docs | 1 + debian/rules | 20 ++++++-------------- 2 files changed, 7 insertions(+), 14 deletions(-) create mode 100644 debian/python-skimage-doc.docs diff --git a/debian/python-skimage-doc.docs b/debian/python-skimage-doc.docs new file mode 100644 index 00000000..8137b041 --- /dev/null +++ b/debian/python-skimage-doc.docs @@ -0,0 +1 @@ +doc/build/html diff --git a/debian/rules b/debian/rules index 1a445c00..90bd3c87 100755 --- a/debian/rules +++ b/debian/rules @@ -29,6 +29,12 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) export PYTHONPATH=$(PACKAGE_ROOT_DIR)/usr/lib/python$*/dist-packages MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \ cd doc; test -d build/html || $(MAKE) html python$* setup.py install --install-layout=deb --root=$(PACKAGE_ROOT_DIR) + : # Use jquery and underscore from Debian package, so prune shipped one + -rm -f doc/build/html/_static/jquery.js + # Actually due to the problems with underscore pkg across releases just ship one for now + #-rm -f doc/build/html/_static/underscore.js + -rm -rf doc/build/html/_sources + -rm -f doc/build/html/.buildinfo endif ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -49,20 +55,6 @@ endif mv $$lib $$tdir ; \ done - : # Use jquery and underscore from Debian package, so prune shipped one - -rm -f doc/build/html/_static/jquery.js - # Actually due to the problems with underscore pkg across releases just ship one for now - #-rm -f doc/build/html/_static/underscore.js - -rm -rf doc/build/html/_sources - -rm -f doc/build/html/.buildinfo - - : # Move documentation to -doc - sdir=$(CURDIR)/doc/build/html ; \ - tdir=$(PACKAGE_ROOT_DIR)-doc/usr/share/doc/$(PACKAGE_NAME)-doc ; \ - mkdir -p $$tdir ; \ - echo "DOCS: Moving '$$sdir' into '$$tdir'." ; \ - test -d $$tdir/html || mv $$sdir $$tdir - if [ -x /usr/bin/dh_numpy ]; then dh_numpy; fi ## immediately useable documentation and exemplar scripts/data