Merge version 6.0.4+dfsg-1+rpi1 and 6.0.5+dfsg-1 to produce 6.0.5+dfsg-1+rpi1

diff --cc debian/changelog
index 510258efa22e3eabd2b6db070679de7b2e174d52,818644fe0c041ef8ba33fce6586289f86890841c..0ada0b63de8ef5e7cbda64f1bd2e5781bec9e480
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- kicad (6.0.4+dfsg-1+rpi1) bookworm-staging; urgency=medium
++kicad (6.0.5+dfsg-1+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>  Sun, 27 Mar 2022 10:29:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 29 May 2022 20:38:38 +0000
++
+ kicad (6.0.5+dfsg-1) unstable; urgency=medium
+ 
+   * [5517201] New upstream version 6.0.5+dfsg
+   * [883c6f9] d/control: increase Standards-Version to 4.6.1
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 19 May 2022 17:05:13 +0200
  
  kicad (6.0.4+dfsg-1) unstable; urgency=medium
  

diff --cc qa/eeschema/CMakeLists.txt
Simple merge