[sasview] 03/07: Split binary-arch and binary-indep build paths

[Stuart Prescott]

This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository sasview.

commit 2fbcba4fa458e4f37b99d7d6523b353b75fd9fe2
Author: Stuart Prescott <stuart at debian.org>
Date:   Tue Jan 2 00:14:09 2018 +1100

    Split binary-arch and binary-indep build paths
    
    Ensure that both arch-only and arch-dep builds can be undertaken independently
    for both binNMUs and for buildd.
    
    (Closes: #885889)
---
 debian/control | 16 +++++++++++-----
 debian/rules   | 23 ++++++++++++++---------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index f97e86f..1fb2258 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,9 @@ Uploaders:
 Build-Depends:
  debhelper (>= 11),
  dh-python,
- libjs-jquery,
- libjs-mathjax,
  libpython-dev,
  python-all,
  python-bumps,
- python-bumps-doc,
  python-h5py,
  python-lxml,
  python-matplotlib,
@@ -23,13 +20,22 @@ Build-Depends:
  python-pyparsing,
  python-pytest,
  python-sasmodels,
- python-sasmodels-doc,
  python-scipy,
  python-setuptools,
  python-sphinx (>= 1.6~),
  python-wxgtk3.0,
+Build-Depends-Indep:
+ libjs-jquery,
+ libjs-mathjax,
+ python-bumps-doc (>> 0.7.6-3~),
+ python-sasmodels-doc (>> 0.97~git20171104-2~),
  rename,
- texinfo
+ texinfo,
+ texlive-fonts-recommended,
+ texlive-generic-extra,
+ texlive-latex-base,
+ texlive-latex-extra,
+ texlive-latex-recommended,
 Standards-Version: 4.1.2
 Homepage: http://www.sasview.org/
 X-Python-Version: >= 2.6
diff --git a/debian/rules b/debian/rules
index d7cb6ac..76605c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,21 +27,26 @@ override_dh_auto_clean:
 	find test -name logs -type d -exec rm -rf {} +
 	rm -rf test/tests.log .cache test/.cache test/__init__.py
 
-override_dh_install:
+override_dh_auto_build-indep:
+	# reassemble the docs from dependent packages to make the overall
+	./debian/fetchdocs
+	python ./docs/sphinx-docs/build_sphinx.py
+	ln -sf /usr/share/javascript/mathjax/ docs/sphinx-docs/build/html/_static/
+	touch test/__init__.py
+
+override_dh_install-arch:
 	dh_install
+	mkdir -p debian/sasview/usr/bin
 	mv debian/python-sasview/usr/bin/sasview debian/sasview/usr/bin/sasview
 	rm debian/python-sasview/usr/lib/python2.7/dist-packages/sas/sasgui/guiframe/images/Thumbs.db
 	dh_numpy
 
-override_dh_auto_build:
-	dh_auto_build
-	# reassemble the docs from dependent packages to make the overall
-	./debian/fetchdocs
-	python ./docs/sphinx-docs/build_sphinx.py
-	ln -sf /usr/share/javascript/mathjax/ docs/sphinx-docs/build/html/_static/mathjax
-	touch test/__init__.py
+override_dh_auto_install-indep:
+	# nothing to do
 
+override_dh_auto_test-indep:
+	# nothing to do
 
-override_dh_fixperms:
+override_dh_fixperms-arch:
 	dh_fixperms
 	chmod a-x debian/python-sasview/usr/lib/python2.7/dist-packages/sas/sasview/test/1d_data/saxess_example.pdh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sasview.git