[Pkg-mediawiki-commits] [SCM] Debian packaging of math extension for Mediawiki branch, master, updated. debian/2%1.0+git20120528-2-3-g7906871

[Jonathan Wiltshire]

The following commit has been merged in the master branch:
commit b74fefba9de231a0653627fed32a0ca8897c25dd
Author: Jonathan Wiltshire <jmw at debian.org>
Date:   Sat Jun 2 22:16:26 2012 +0100

    Ensure ocaml-base-nox dependency present on relevant architectures

diff --git a/debian/rules b/debian/rules
index 159bd41..d0346c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@ override_dh_auto_build:
 	else\
 		make -C math texvc.bc;\
 		mv math/texvc.bc math/texvc;\
-		echo "interpreter:Depends=ocaml-base-nox" >> debian/mediawiki-math.substvars;\
 	fi
 	cd debian && xsltproc -nonet -o texvc.1 /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl texvc.xml
 
@@ -29,5 +28,13 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
 
+override_dh_shlibdeps:
+	# This is merely the most sensible place to do this
+	# otherwise dh_prep nobbles it
+	dh_shlibdeps
+	if [ ! -x /usr/bin/ocamlopt ]; then \
+		echo "interpreter:Depends=ocaml-base-nox" >> debian/mediawiki-math.substvars;\
+	fi
+
 %:
 	dh $@ 

-- 
Debian packaging of math extension for Mediawiki