[fityk] 01/03: Use dh_sphinxdoc to get js symlinks right

[Stuart Prescott]

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

stuart pushed a commit to branch master
in repository fityk.

commit 57eb3542628e5f947c4265d050a1b615ecc3149f
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Sep 25 11:51:38 2017 +1000

    Use dh_sphinxdoc to get js symlinks right
    
    Clsoes: 857816
---
 debian/control | 2 +-
 debian/links   | 5 -----
 debian/rules   | 8 +++++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 2129ef1..a3ceb7c 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Depends:
 Recommends:
  gnuplot
 Suggests:
- libjs-sphinxdoc
+ ${sphinxdoc:Depends}
 Description: general-purpose nonlinear curve fitting and data analysis
  Fityk is a flexible and portable program for nonlinear fitting of analytical
  functions (especially peak-shaped) to data (usually experimental data). In
diff --git a/debian/links b/debian/links
index c26be1b..57b8d23 100644
--- a/debian/links
+++ b/debian/links
@@ -1,8 +1,3 @@
 usr/share/fityk/html                               usr/share/doc/fityk/html
 usr/share/fityk/samples                            usr/share/doc/fityk/examples
-usr/share/javascript/sphinxdoc/1.0/doctools.js     usr/share/fityk/html/_static/doctools.js
-usr/share/javascript/sphinxdoc/1.0/jquery.js       usr/share/fityk/html/_static/jquery.js
-usr/share/javascript/sphinxdoc/1.0/searchtools.js  usr/share/fityk/html/_static/searchtools.js
-usr/share/javascript/sphinxdoc/1.0/underscore.js   usr/share/fityk/html/_static/underscore.js
-usr/share/javascript/sphinxdoc/1.0/websupport.js   usr/share/fityk/html/_static/websupport.js
 usr/share/man/man1/fityk.1.gz	                   usr/share/man/man1/cfityk.1.gz
diff --git a/debian/rules b/debian/rules
index 1055e8d..73e3b97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --buildsystem=autoconf --parallel
+	dh $@ --buildsystem=autoconf --parallel --with sphinxdoc
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-shared --enable-static
@@ -15,11 +15,13 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 	$(RM) -r $(CURDIR)/debian/fityk/usr/lib \
-	         $(CURDIR)/debian/fityk/usr/include \
-	         $(CURDIR)/debian/fityk/usr/share/fityk/html/_static/*.js
+	         $(CURDIR)/debian/fityk/usr/include
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
 override_dh_compress:
 	dh_compress --exclude=.dat --exclude=.fit
+
+override_dh_sphinxdoc:
+	dh_sphinxdoc usr/share/fityk/html

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