Merge changes from apertis/v2020-updates into apertis/v2020

debian/changelog

+xorg-server (2:1.20.4-1+deb10u2+apertis1) UNRELEASED; urgency=medium
+
+  * PLEASE SUMMARIZE remaining Apertis changes
+
+ -- Apertis CI <devel@lists.apertis.org>  Tue, 13 Jul 2021 15:34:23 +0000
+
+xorg-server (2:1.20.4-1+deb10u2) buster-security; urgency=medium
+
+  * CVE-2020-14360 CVE-2020-25712
+
+ -- Moritz Mühlenhoff <jmm@debian.org>  Tue, 01 Dec 2020 18:59:57 +0100
+
 xorg-server (2:1.20.4-1+deb10u1co1) apertis; urgency=medium
 
   * Merge from Debian buster-security. Remaining changes: