# HG changeset patch
# User samer
# Date 1424484663 0
# Node ID 99afd4e6cba9766e207c4cc7e735e14020406262
# Parent  5b39cf7e3c9d5d91b75b53816b8e967b6b05fe41# Parent  69a653091bc68c2020cfe99a1a08c1e4c22d4219
Merge

diff -r 5b39cf7e3c9d -r 99afd4e6cba9 .hgignore
--- a/.hgignore	Sat Feb 21 02:07:16 2015 +0000
+++ b/.hgignore	Sat Feb 21 02:11:03 2015 +0000
@@ -30,9 +30,10 @@
 ^dml-home.*gz
 ^.mozilla
 ^.vboxclient
-^downloads/
+^[D,d]ownloads/
 ^lib/dml-results
 ^.vim/.netrwhist
 ^.mysql_history
 ^.fehbg
 ^.pki/
+^.profile.d
diff -r 5b39cf7e3c9d -r 99afd4e6cba9 .profile
--- a/.profile	Sat Feb 21 02:07:16 2015 +0000
+++ b/.profile	Sat Feb 21 02:11:03 2015 +0000
@@ -31,6 +31,6 @@
     PATH="$HOME/bin:$PATH"
 fi
 
-# export use_proxy=yes
-# export http_proxy=http://DMLUser:Mus1c0l0gy\@loncache.bl.uk:8080
-
+if [ -d "$HOME/.profile.d" ]; then
+	for f in $HOME/.profile.d/*.sh; do source $f; done
+fi
diff -r 5b39cf7e3c9d -r 99afd4e6cba9 etc/as_root.d/init_matlab.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/as_root.d/init_matlab.sh	Sat Feb 21 02:11:03 2015 +0000
@@ -0,0 +1,32 @@
+
+echo "Checking for MATLAB..." 1>&2
+MATLAB_ROOT=$(matlab -e | grep '^MATLAB=' | sed -e 's/MATLAB=//')
+echo "MATLAB installed in $MATLAB_ROOT" 1>&2
+$DO apt-get install csh libtritonus-java libvorbisspi-java libmp3spi-java
+$DO ln -sf /lib/x86_64-linux-gnu/libc.so.6 /lib64
+$DO ln -sf $MATLAB_ROOT/bin/matlab /usr/local/bin 
+
+# MATLAB (R2012a at least) looks for Java extension jars in this directory
+$DO mkdir -p /usr/java/packages/lib/ext
+# NB - there may be some duplication of service providers here - I'm not sure
+# which of them works best.
+$DO ln -sf /usr/shara/java/{vorbisspi,mp3spi}.jar /usr/java/packages/lib/ext
+$DO ln -sf /usr/shara/java/tritonus_{aos,core,jorbis,mp3,remaining,share}.jar /usr/java/packages/lib/ext
+
+# need to add native library paths to this file
+if grep '/usr/lib/jni' $MATLAB_ROOT/toolbox/local/librarypath.txt; then
+	echo "MATLAB Library path already set." 1>&2
+else
+	if [ $DRY_RUN == yes ]; then
+		echo "echo '/usr/lib/jni' >> $MATLAB_ROOT/toolbox/local/librarypath.txt"
+	else
+		echo '/usr/lib/jni' >> $MATLAB_ROOT/toolbox/local/librarypath.txt
+	fi
+fi
+if [ -h $MATLAB_ROOT/bin/lcdata.xml ]; then
+	echo "MATLAB character set already set up" 1>&2
+else
+	echo "Adjusting MATLAB character set" 1>&2
+	mv $MATLAB_ROOT/bin/lcdata.xml $MATLAB_ROOT/bin/lcdata_orig.xml
+	ln -s lcdata_utf8.xml $MATLAB_ROOT/bin/lcdata.xml
+fi
diff -r 5b39cf7e3c9d -r 99afd4e6cba9 etc/setup_as_dml.sh
--- a/etc/setup_as_dml.sh	Sat Feb 21 02:07:16 2015 +0000
+++ b/etc/setup_as_dml.sh	Sat Feb 21 02:11:03 2015 +0000
@@ -19,8 +19,8 @@
 	# wget http://www.swi-prolog.org/download/devel/src/pl-7.1.29.tar.gz
 	# cd ~/src
 	# tar xzf pl-7.1.29.tar.gz
-	unpack_into ~/src http://www.swi-prolog.org/download/devel/src/pl-7.1.29.tar.gz
-	cd ~/src/pl-7.1.29
+	unpack_into ~/src http://www.swi-prolog.org/download/devel/src/pl-7.1.30.tar.gz
+	cd ~/src/pl-7.1.30
 	cp build.templ build
 	patch build ~/etc/swipl-build.patch
 	./build
diff -r 5b39cf7e3c9d -r 99afd4e6cba9 etc/setup_as_root.sh
--- a/etc/setup_as_root.sh	Sat Feb 21 02:07:16 2015 +0000
+++ b/etc/setup_as_root.sh	Sat Feb 21 02:11:03 2015 +0000
@@ -53,30 +53,7 @@
 
 # If you have MATLAB
 if [ $HAVE_MATLAB == yes ]; then
-	echo "Checking for MATLAB..." 1>&2
-	MATLAB_ROOT=$(matlab -e | grep '^MATLAB=' | sed -e 's/MATLAB=//')
-	echo "MATLAB installed in $MATLAB_ROOT" 1>&2
-	$DO apt-get csh libtritonus-java libvorbisspi-java libmp3spi-java
-	$DO ln -sf /lib/x86_64-linux-gnu/libc.so.6 /lib64
-	$DO ln -sf $MATLAB_ROOT/bin/matlab /usr/local/bin 
-
-	# MATLAB (R2012a at least) looks for Java extension jars in this directory
-	$DO mkdir -p /usr/java/packages/lib/ext
-	# NB - there may be some duplication of service providers here - I'm not sure
-	# which of them works best.
-	$DO ln -sf /usr/shara/java/{vorbisspi,mp3spi}.jar /usr/java/packages/lib/ext
-	$DO ln -sf /usr/shara/java/tritonus_{aos,core,jorbis,mp3,remaining,share}.jar /usr/java/packages/lib/ext
-
-	# need to add native library paths to this file
-	if grep '/usr/lib/jni' $MATLAB_ROOT/toolbox/local/librarypath.txt; then
-		echo "MATLAB Library path already set." 1>&2
-	else
-		if [ $DRY_RUN == yes ]; then
-			echo "echo '/usr/lib/jni' >> $MATLAB_ROOT/toolbox/local/librarypath.txt"
-		else
-			echo '/usr/lib/jni' >> $MATLAB_ROOT/toolbox/local/librarypath.txt
-		fi
-	fi
+	DO=$DO DRY_RUN=$DRY_RUN as_root.d/init_matlab.sh
 fi
 
 $DO install -bC rc.local /etc
diff -r 5b39cf7e3c9d -r 99afd4e6cba9 var/dml/config-enabled/cache.pl
--- a/var/dml/config-enabled/cache.pl	Sat Feb 21 02:07:16 2015 +0000
+++ b/var/dml/config-enabled/cache.pl	Sat Feb 21 02:11:03 2015 +0000
@@ -1,1 +1,22 @@
-../../../src/github/ClioPatria/config-available/cache.pl
\ No newline at end of file
+:- module(conf_cache, []).
+:- use_module(library(semweb/rdf_cache)).
+
+/** <module> Configure caching of RDF inputs
+
+Configure caching of RDF inputs. If enabled, RDF input graphs are stored
+in fast-load format in the given cache   directory. This provides a huge
+speedup for loading RDF into the database.   Note that if persistency is
+enabled (default), RDF data is  stored   efficiently  in  the files that
+realise the persistent RDF database  and   enabling  caching  only makes
+sense if the persistent database is  frequently wiped and re-filled with
+(partially) the same data.
+
+Unloading this plugin  does  _not_   disable  caching.  Instead,  change
+*enabled* to =false=.
+*/
+
+:- rdf_set_cache_options([ enabled(true),
+			   global_directory('cache/rdf'),
+			   create_global_directory(true)
+			 ]).
+
diff -r 5b39cf7e3c9d -r 99afd4e6cba9 var/dml/run.pl
--- a/var/dml/run.pl	Sat Feb 21 02:07:16 2015 +0000
+++ b/var/dml/run.pl	Sat Feb 21 02:11:03 2015 +0000
@@ -39,9 +39,9 @@
 
 % Make loading files silent. Comment if you want verbose loading.
 
-:- current_prolog_flag(verbose, Verbose),
-   asserta(saved_verbose(Verbose)),
-   set_prolog_flag(verbose, silent).
+%:- current_prolog_flag(verbose, Verbose),
+%   asserta(saved_verbose(Verbose)),
+%   set_prolog_flag(verbose, silent).
 
 
 		 /*******************************
diff -r 5b39cf7e3c9d -r 99afd4e6cba9 var/dml/settings.db
--- a/var/dml/settings.db	Sat Feb 21 02:07:16 2015 +0000
+++ b/var/dml/settings.db	Sat Feb 21 02:11:03 2015 +0000
@@ -1,5 +1,5 @@
 /*  Saved settings
-    Date: Thu Feb 12 01:52:40 2015
+    Date: Mon Feb 16 12:46:19 2015
 */
 
 
@@ -25,10 +25,7 @@
 setting(musicbrainz:min_wait, 0.91).
 
 %	IP addresses from which remotes are allowed to connect
-setting(pengines:allow_from, ['127.0.0.1','192.168.1.68','192.168.1.76']).
-
-%	Pixels per inch for in browser figures
-setting(matlab:pixels_per_inch, 300).
+setting(pengines:allow_from, [*]).
 
 %	Decoration for AudioFile URIs
 setting(audio_ui:audiofile_decoration, player).
@@ -38,3 +35,9 @@
 
 %	Soundfont directory
 setting(score_ui:soundfont_dir, "~/lib/sounds/sf2").
+
+%	Fluidsynth initialisation file
+setting(score_ui:fluidsynth_rc, piano).
+
+%	Pixels per inch for in browser figures
+setting(matlab:pixels_per_inch, 300).