committing changes in /etc after apt run

Package changes:
+collaboraoffice6.4 6.4.10.6-6 amd64
+collaboraoffice6.4-ure 6.4.10.6-6 amd64
+collaboraofficebasis6.4-calc 6.4.10.6-6 amd64
+collaboraofficebasis6.4-core 6.4.10.6-6 amd64
+collaboraofficebasis6.4-draw 6.4.10.6-6 amd64
+collaboraofficebasis6.4-en-us 6.4.10.6-6 amd64
+collaboraofficebasis6.4-extension-pdf-import 6.4.10.6-6 amd64
+collaboraofficebasis6.4-graphicfilter 6.4.10.6-6 amd64
+collaboraofficebasis6.4-images 6.4.10.6-6 amd64
+collaboraofficebasis6.4-impress 6.4.10.6-6 amd64
+collaboraofficebasis6.4-ooofonts 6.4.10.6-6 amd64
+collaboraofficebasis6.4-ooolinguistic 6.4.10.6-6 amd64
+collaboraofficebasis6.4-writer 6.4.10.6-6 amd64
-loolwsd 4.2.6-2 amd64
+loolwsd 6.4.0-3 amd64

diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd
index d17ef9bb7fe373778d4c8cbda41cd65ef386a618..de34164e39d9d49c3213af7fc5e39067045c5d5b 100644 (file)
--- a/apt/apt.conf.d/25loolwsd
+++ b/apt/apt.conf.d/25loolwsd
@@ -1,2 +1,2 @@
 // Rebuild systemplate of Collabora Online Development Edition
-DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.2 >/dev/null 2>&1"; };
+DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.4 >/dev/null 2>&1"; };

diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu
index a2a71171144728cdcb40f484224598164a6ce19b..1e1fe79a823d05659b211a2aae75a45ba0a53364 100644 (file)
--- a/loolwsd/loolkitconfig.xcu
+++ b/loolwsd/loolkitconfig.xcu
@@ -34,4 +34,10 @@
 <!-- Disable GIO UCP we don't want -->
 <item oor:path="/org.openoffice.ucb.Configuration/ContentProviders/Local/SecondaryKeys/Office/ProviderData/Provider999"><prop oor:name="URLTemplate" oor:op="fuse"><value>NeverMatchAnyUrlSuffix</value></prop></item>
 
+<!-- Default font for new documents. Most of the languages use 'en' settings. For those that do not, it's better not to touch their settings, because it's unlikely that Calibri (or Carlito) is better than current default. -->
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_HEADING" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_PRESENTATION" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_SPREADSHEET" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_TEXT" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+
 </oor:items>