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

Package changes:
-cpp-9 9.3.0-10ubuntu2 amd64
+cpp-9 9.3.0-17ubuntu1~20.04 amd64
-g++-9 9.3.0-10ubuntu2 amd64
+g++-9 9.3.0-17ubuntu1~20.04 amd64
-gcc-10-base 10-20200411-0ubuntu1 amd64
+gcc-10-base 10.2.0-5ubuntu1~20.04 amd64
-gcc-9 9.3.0-10ubuntu2 amd64
-gcc-9-base 9.3.0-10ubuntu2 amd64
+gcc-9 9.3.0-17ubuntu1~20.04 amd64
+gcc-9-base 9.3.0-17ubuntu1~20.04 amd64
-language-selector-common 0.204.1 all
+language-selector-common 0.204.2 all
-libasan5 9.3.0-10ubuntu2 amd64
+libasan5 9.3.0-17ubuntu1~20.04 amd64
-libatomic1 10-20200411-0ubuntu1 amd64
+libatomic1 10.2.0-5ubuntu1~20.04 amd64
-libbrotli1 1.0.7-6build1 amd64
+libbrotli1 1.0.7-6ubuntu0.1 amd64
-libcc1-0 10-20200411-0ubuntu1 amd64
+libcc1-0 10.2.0-5ubuntu1~20.04 amd64
-libgcc-9-dev 9.3.0-10ubuntu2 amd64
-libgcc-s1 10-20200411-0ubuntu1 amd64
-libgcc1 1:10-20200411-0ubuntu1 amd64
+libgcc-9-dev 9.3.0-17ubuntu1~20.04 amd64
+libgcc-s1 10.2.0-5ubuntu1~20.04 amd64
+libgcc1 1:10.2.0-5ubuntu1~20.04 amd64
-libgomp1 10-20200411-0ubuntu1 amd64
+libgomp1 10.2.0-5ubuntu1~20.04 amd64
-libitm1 10-20200411-0ubuntu1 amd64
+libitm1 10.2.0-5ubuntu1~20.04 amd64
-liblsan0 10-20200411-0ubuntu1 amd64
+liblsan0 10.2.0-5ubuntu1~20.04 amd64
-libpython2.7 2.7.18~rc1-2 amd64
-libpython2.7-minimal 2.7.18~rc1-2 amd64
-libpython2.7-stdlib 2.7.18~rc1-2 amd64
+libpython2.7 2.7.18-1~20.04 amd64
+libpython2.7-minimal 2.7.18-1~20.04 amd64
+libpython2.7-stdlib 2.7.18-1~20.04 amd64
-libpython3.8 3.8.2-1ubuntu1.2 amd64
-libpython3.8-dev 3.8.2-1ubuntu1.2 amd64
-libpython3.8-minimal 3.8.2-1ubuntu1.2 amd64
-libpython3.8-stdlib 3.8.2-1ubuntu1.2 amd64
-libquadmath0 10-20200411-0ubuntu1 amd64
+libpython3.8 3.8.5-1~20.04 amd64
+libpython3.8-dev 3.8.5-1~20.04 amd64
+libpython3.8-minimal 3.8.5-1~20.04 amd64
+libpython3.8-stdlib 3.8.5-1~20.04 amd64
+libquadmath0 10.2.0-5ubuntu1~20.04 amd64
-libstdc++-9-dev 9.3.0-10ubuntu2 amd64
-libstdc++6 10-20200411-0ubuntu1 amd64
+libstdc++-9-dev 9.3.0-17ubuntu1~20.04 amd64
+libstdc++6 10.2.0-5ubuntu1~20.04 amd64
-libtsan0 10-20200411-0ubuntu1 amd64
+libtsan0 10.2.0-5ubuntu1~20.04 amd64
-libubsan1 10-20200411-0ubuntu1 amd64
+libubsan1 10.2.0-5ubuntu1~20.04 amd64
-loolwsd 6.4.0-6 amd64
+loolwsd 6.4.0-7 amd64
-python-pip-whl 20.0.2-5ubuntu1 all
+python-pip-whl 20.0.2-5ubuntu1.1 all
-python2.7 2.7.18~rc1-2 amd64
-python2.7-minimal 2.7.18~rc1-2 amd64
+python2.7 2.7.18-1~20.04 amd64
+python2.7-minimal 2.7.18-1~20.04 amd64
-python3-distutils 3.8.2-1ubuntu1 all
+python3-distutils 3.8.5-1~20.04.1 all
-python3-gdbm 3.8.2-1ubuntu1 amd64
+python3-gdbm 3.8.5-1~20.04.1 amd64
-python3-lib2to3 3.8.2-1ubuntu1 all
+python3-lib2to3 3.8.5-1~20.04.1 all
-python3-pip 20.0.2-5ubuntu1 all
+python3-pip 20.0.2-5ubuntu1.1 all
-python3-urllib3 1.25.8-2 all
+python3-urllib3 1.25.8-2ubuntu0.1 all
-python3.8 3.8.2-1ubuntu1.2 amd64
-python3.8-dev 3.8.2-1ubuntu1.2 amd64
-python3.8-minimal 3.8.2-1ubuntu1.2 amd64
+python3.8 3.8.5-1~20.04 amd64
+python3.8-dev 3.8.5-1~20.04 amd64
+python3.8-minimal 3.8.5-1~20.04 amd64
-zlib1g 1:1.2.11.dfsg-2ubuntu1 amd64
-zlib1g-dev 1:1.2.11.dfsg-2ubuntu1 amd64
+zlib1g 1:1.2.11.dfsg-2ubuntu1.1 amd64
+zlib1g-dev 1:1.2.11.dfsg-2ubuntu1.1 amd64

diff --git a/.etckeeper b/.etckeeper
index 906da20320683f2f94da704c7cc4aca774acf086..5a200815adb436df9374d504a372e9fc85120fd6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1182,6 +1182,7 @@ maybe chmod 0644 'fonts/conf.avail/49-sansserif.conf'
 maybe chmod 0644 'fonts/conf.avail/50-user.conf'
 maybe chmod 0644 'fonts/conf.avail/51-local.conf'
 maybe chmod 0644 'fonts/conf.avail/53-monospace-lcd-filter.conf'
+maybe chmod 0644 'fonts/conf.avail/56-language-selector-ar.conf'
 maybe chmod 0644 'fonts/conf.avail/57-dejavu-sans-mono.conf'
 maybe chmod 0644 'fonts/conf.avail/57-dejavu-sans.conf'
 maybe chmod 0644 'fonts/conf.avail/57-dejavu-serif.conf'
@@ -1195,7 +1196,6 @@ maybe chmod 0644 'fonts/conf.avail/65-droid-sans-fallback.conf'
 maybe chmod 0644 'fonts/conf.avail/65-fonts-persian.conf'
 maybe chmod 0644 'fonts/conf.avail/65-khmer.conf'
 maybe chmod 0644 'fonts/conf.avail/65-nonlatin.conf'
-maybe chmod 0644 'fonts/conf.avail/69-language-selector-ar.conf'
 maybe chmod 0644 'fonts/conf.avail/69-language-selector-ja.conf'
 maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-cn.conf'
 maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-hk.conf'

diff --git a/apache2/conf-available/loolwsd.conf b/apache2/conf-available/loolwsd.conf
index 7ccfe005147b46e1238cab5fdb74c21e5fe8bce7..9daa2493373bc876d857d5525cba6db7d8d81fd6 100644 (file)
--- a/apache2/conf-available/loolwsd.conf
+++ b/apache2/conf-available/loolwsd.conf
@@ -1,7 +1,7 @@
-# Apache2 reverse proxy configuration for Collabora Online / LibreOffice Online
+# Apache2 reverse proxy configuration for Collabora Online
 # Internet <-- SSL --> Reverse Proxy <-- No SSL --> loolwsd
 # Make sure that you enable the following Apache2 modules: proxy, proxy_wstunnel, and proxy_http.
-# Create a virtual host for Collabora Online / LibreOffice Online and include this configuration file.
+# Create a virtual host for Collabora Online and include this configuration file.
 
   Options -Indexes
 
@@ -12,7 +12,7 @@
   ProxyPreserveHost On
 
   # static html, js, images, etc. served from loolwsd
-  # loleaflet is the client part of LibreOffice Online
+  # loleaflet is the client part of Collabora Online
   ProxyPass           /loleaflet http://127.0.0.1:9980/loleaflet retry=0
   ProxyPassReverse    /loleaflet http://127.0.0.1:9980/loleaflet
 

diff --git a/fonts/conf.avail/56-language-selector-ar.conf b/fonts/conf.avail/56-language-selector-ar.conf
new file mode 100644 (file)
index 0000000..6a1f3e7
--- /dev/null
+++ b/fonts/conf.avail/56-language-selector-ar.conf
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <match target="pattern">
+        <test name="lang">
+            <string>ar</string>
+        </test>
+        <test qual="any" name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans</string>
+            <string>Noto Sans Arabic UI</string>
+        </edit>
+    </match>
+    <match target="pattern">
+        <test name="lang">
+            <string>ar</string>
+        </test>
+        <test qual="any" name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Serif</string>
+            <string>Noto Naskh Arabic</string>
+        </edit>
+    </match>
+</fontconfig>

diff --git a/fonts/conf.avail/69-language-selector-ar.conf b/fonts/conf.avail/69-language-selector-ar.conf
deleted file mode 100644 (file)
index 31bf554..0000000
--- a/fonts/conf.avail/69-language-selector-ar.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-    <match target="pattern">
-        <test name="lang">
-            <string>ar</string>
-        </test>
-        <test qual="any" name="family">
-            <string>sans-serif</string>
-        </test>
-        <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans</string>
-            <string>Noto Sans Arabic UI</string>
-        </edit>
-    </match>
-    <match target="pattern">
-        <test name="lang">
-            <string>ar</string>
-        </test>
-        <test qual="any" name="family">
-            <string>serif</string>
-        </test>
-        <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Serif</string>
-            <string>Noto Naskh Arabic</string>
-        </edit>
-    </match>
-    <match target="pattern">
-        <test name="lang">
-            <string>ar</string>
-        </test>
-        <test qual="any" name="family">
-            <string>monospace</string>
-        </test>
-        <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans Mono</string>
-            <string>Noto Naskh Arabic</string>
-        </edit>
-    </match>
-</fontconfig>

diff --git a/fonts/conf.d/56-language-selector-ar.conf b/fonts/conf.d/56-language-selector-ar.conf
new file mode 120000 (symlink)
index 0000000..c8a386b
--- /dev/null
+++ b/fonts/conf.d/56-language-selector-ar.conf
@@ -0,0 +1 @@
+../conf.avail/56-language-selector-ar.conf
\ No newline at end of file

diff --git a/fonts/conf.d/69-language-selector-ar.conf b/fonts/conf.d/69-language-selector-ar.conf
deleted file mode 120000 (symlink)
index 5f5c849..0000000
--- a/fonts/conf.d/69-language-selector-ar.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf.avail/69-language-selector-ar.conf
\ No newline at end of file