[libdap] 31/48: conditional jquery

[Alastair McKinstry]

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

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit 8b251001c1d1ff9acf0f7f83f2b0d4015d86cc33
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 9 05:01:52 2013 +0100

    conditional jquery
---
 debian/changelog | 6 ++++++
 debian/rules     | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9386876..e925cef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdap (3.11.1-14) unstable; urgency=low
+
+  * Make use of libjs-jquery conditional; not always present. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 09 Jul 2013 05:01:07 +0100
+
 libdap (3.11.1-13) unstable; urgency=low
 
   * Now use debhelper >=9 versioned depends.
diff --git a/debian/rules b/debian/rules
index b9c17de..f2e7dc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@ DEB_BUILD_MAINT_OPTIONS:= hardening=+allx
 DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic
 export DEB_BUILD_MAINT_OPTIONS
 export DEB_CFLAGS_MAINT_APPEND
-#export DH_VERBOSE=1
+# Always do verbose.
+export DH_VERBOSE=1
 
 
 # The magic debhelper rule:
@@ -43,8 +44,9 @@ override_dh_auto_install:
 
 override_dh_installdocs:
 	dh_installdocs
-	rm debian/libdap-doc/usr/share/doc/libdap-doc/html/jquery.js
-	ln -sf /usr/share/javascript/jquery/jquery.js debian/libdap-doc/usr/share/doc/libdap-doc/html/jquery.js
+	[ -f debian/libdap-doc/usr/share/doc/libdap-doc/html/jquery.js ] && ( \
+		rm debian/libdap-doc/usr/share/doc/libdap-doc/html/jquery.js ; \
+ 		ln -sf /usr/share/javascript/jquery/jquery.js debian/libdap-doc/usr/share/doc/libdap-doc/html/jquery.js )
 
 clean:
 	dh clean

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