[libdap] 35/48: Fix conditional.

Alastair McKinstry mckinstry at moszumanska.debian.org
Sun Jul 5 10:17:12 UTC 2015


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 875c62ec55be09d2f3c5d67375feee19220bfe26
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 10 09:25:14 2013 +0100

    Fix conditional.
---
 debian/changelog | 6 ++++++
 debian/rules     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e925cef..b0d8e1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdap (3.11.1-15) unstable; urgency=low
+
+  * Avoid exit 1 in conditional in ./rules by adding echo. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 10 Jul 2013 09:24:27 +0100
+
 libdap (3.11.1-14) unstable; urgency=low
 
   * Make use of libjs-jquery conditional; not always present. 
diff --git a/debian/rules b/debian/rules
index f2e7dc4..3c672cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,8 @@ override_dh_installdocs:
 	dh_installdocs
 	[ -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 )
+ 		ln -sf /usr/share/javascript/jquery/jquery.js debian/libdap-doc/usr/share/doc/libdap-doc/html/jquery.js ) \
+		|| echo "Skipped; no jquery"
 
 clean:
 	dh clean

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



More information about the debian-science-commits mailing list