Merge version 6.0.10+dfsg-1+rpi1 and 6.0.10+dfsg-2 to produce 6.0.10+dfsg-2+rpi1

diff --cc debian/changelog
index b110e3815418eeda7a075b292d0359134f082b40,4a75debe35900300416f301f7d0faec14ea85d94..857d3f4f43d8c1e792d948d61ac6cdefa0089c3a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,21 @@@
- kicad (6.0.10+dfsg-1+rpi1) bookworm-staging; urgency=medium
++kicad (6.0.10+dfsg-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 6.0.0+dfsg1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 09 Jan 2022 17:43:33 +0000]
 +  * Link with libatomic.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Dec 2022 07:27:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 02 Jan 2023 16:21:05 +0000
++
+ kicad (6.0.10+dfsg-2) unstable; urgency=medium
+ 
+   * [5a3af46] Revert "d/rules: Turn option KICAD_USE_EGL on"
+     wxWidgets 3.2 in Debian has now no EGL canvas support compiled in any
+     more. More to the reasoning about the switch back can be found on
+     https://bugs.debian.org/1020640
+     https://bugs.debian.org/1024147
+     (Closes: #1027137)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 29 Dec 2022 18:43:50 +0100
  
  kicad (6.0.10+dfsg-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge