committing changes in /etc made by "apt-get upgrade"

Package changes:
-code-brand 6.4-15 all
-collaboraoffice6.4 6.4.10.38-38 amd64
-collaboraoffice6.4-ure 6.4.10.38-38 amd64
+code-brand 6.4-16 all
+collaboraoffice6.4 6.4.10.39-39 amd64
+collaboraoffice6.4-ure 6.4.10.39-39 amd64
-collaboraofficebasis6.4-calc 6.4.10.38-38 amd64
-collaboraofficebasis6.4-core 6.4.10.38-38 amd64
-collaboraofficebasis6.4-draw 6.4.10.38-38 amd64
-collaboraofficebasis6.4-en-us 6.4.10.38-38 amd64
-collaboraofficebasis6.4-extension-pdf-import 6.4.10.38-38 amd64
-collaboraofficebasis6.4-graphicfilter 6.4.10.38-38 amd64
-collaboraofficebasis6.4-images 6.4.10.38-38 amd64
-collaboraofficebasis6.4-impress 6.4.10.38-38 amd64
-collaboraofficebasis6.4-ooofonts 6.4.10.38-38 amd64
-collaboraofficebasis6.4-ooolinguistic 6.4.10.38-38 amd64
-collaboraofficebasis6.4-writer 6.4.10.38-38 amd64
+collaboraofficebasis6.4-calc 6.4.10.39-39 amd64
+collaboraofficebasis6.4-core 6.4.10.39-39 amd64
+collaboraofficebasis6.4-draw 6.4.10.39-39 amd64
+collaboraofficebasis6.4-en-us 6.4.10.39-39 amd64
+collaboraofficebasis6.4-extension-pdf-import 6.4.10.39-39 amd64
+collaboraofficebasis6.4-graphicfilter 6.4.10.39-39 amd64
+collaboraofficebasis6.4-images 6.4.10.39-39 amd64
+collaboraofficebasis6.4-impress 6.4.10.39-39 amd64
+collaboraofficebasis6.4-ooofonts 6.4.10.39-39 amd64
+collaboraofficebasis6.4-ooolinguistic 6.4.10.39-39 amd64
+collaboraofficebasis6.4-writer 6.4.10.39-39 amd64
-icinga2 2.12.3-1.focal amd64
-icinga2-bin 2.12.3-1.focal amd64
-icinga2-common 2.12.3-1.focal all
-icinga2-doc 2.12.3-1.focal all
-icinga2-ido-mysql 2.12.3-1.focal amd64
+icinga2 2.12.4-1.focal amd64
+icinga2-bin 2.12.4-1.focal amd64
+icinga2-common 2.12.4-1.focal all
+icinga2-doc 2.12.4-1.focal all
+icinga2-ido-mysql 2.12.4-1.focal amd64
-isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.1 amd64
-isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.1 amd64
+isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.2 amd64
+isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.2 amd64
-loolwsd 6.4.8-6 amd64
+loolwsd 6.4.9-1 amd64
-python3-distutils 3.8.5-1~20.04.1 all
+python3-distutils 3.8.10-0ubuntu1~20.04 all
-python3-gdbm 3.8.5-1~20.04.1 amd64
+python3-gdbm 3.8.10-0ubuntu1~20.04 amd64
-python3-lib2to3 3.8.5-1~20.04.1 all
+python3-lib2to3 3.8.10-0ubuntu1~20.04 all
-vim-icinga2 2.12.3-1.focal all
+vim-icinga2 2.12.4-1.focal all

diff --git a/.etckeeper b/.etckeeper
index 98531938422264bdf88f7efe5c4c25568d294fd3..37a8e9c4a54777e092ffea2e74bb5b4ca0825fcc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1308,7 +1308,7 @@ maybe chgrp 'nagios' 'icinga2/conf.d/users.conf'
 maybe chmod 0644 'icinga2/conf.d/users.conf'
 maybe chown 'nagios' 'icinga2/constants.conf'
 maybe chgrp 'nagios' 'icinga2/constants.conf'
-maybe chmod 0644 'icinga2/constants.conf'
+maybe chmod 0640 'icinga2/constants.conf'
 maybe chown 'nagios' 'icinga2/constants.conf.orig'
 maybe chgrp 'nagios' 'icinga2/constants.conf.orig'
 maybe chmod 0640 'icinga2/constants.conf.orig'
@@ -1395,7 +1395,7 @@ maybe chmod 0755 'icinga2/scripts/mail-host-notification.sh'
 maybe chmod 0755 'icinga2/scripts/mail-service-notification.sh'
 maybe chown 'nagios' 'icinga2/zones.conf'
 maybe chgrp 'nagios' 'icinga2/zones.conf'
-maybe chmod 0644 'icinga2/zones.conf'
+maybe chmod 0640 'icinga2/zones.conf'
 maybe chown 'nagios' 'icinga2/zones.conf.orig'
 maybe chgrp 'nagios' 'icinga2/zones.conf.orig'
 maybe chmod 0640 'icinga2/zones.conf.orig'

diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd
index de34164e39d9d49c3213af7fc5e39067045c5d5b..48a1276352c1eabe58532c8669d9f3ad1b7c9bdc 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.4 >/dev/null 2>&1"; };
+DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.4 >/dev/null 2>&1 || true"; };

diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu
index 86696a8864e34df84c7d0dfc47359b05d0abf3db..bb9ed68f19d83412b05554ba8e15037c442d887c 100644 (file)
--- a/loolwsd/loolkitconfig.xcu
+++ b/loolwsd/loolkitconfig.xcu
@@ -25,10 +25,8 @@
 <!-- Enable thumbnail generation by default (disabling saves CPU time) -->
 <item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="GenerateThumbnail" oor:op="fuse"><value>true</value></prop></item>
 
-<!-- Use the collabora_svg theme for the sidebar -->
+<!-- Set the theme and icon size for the sidebar -->
 <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>collabora_svg</value></prop></item>
-
-<!-- Use the large icons in the sidebar -->
 <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SidebarIconSize" oor:op="fuse"><value>2</value></prop></item>
 
 <!-- To show Hidden Characters and Hiddent Text/Paragraph fields -->