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

diff --cc debian/changelog
index 712781dc0e5a40569bc7ebfee276d206eb68168f,6c38391ee6e26ac861de8f24841687b17217d83c..510258efa22e3eabd2b6db070679de7b2e174d52
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- kicad (6.0.2+dfsg-1+rpi1) bookworm-staging; urgency=medium
++kicad (6.0.4+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>  Fri, 18 Feb 2022 17:35:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 27 Mar 2022 10:29:07 +0000
++
+ kicad (6.0.4+dfsg-1) unstable; urgency=medium
+ 
+   * [5ca14e6] New upstream version 6.0.4+dfsg
+   * [370446a] d/copyright: Update due updated upstream modifications
+   * [e7c121e] d/k-packages-relations.dia: Remove transitional package
+   * [1418856] Rebuild patch queue from patch-queue branch
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 20 Mar 2022 07:53:12 +0100
  
  kicad (6.0.2+dfsg-1) unstable; urgency=medium
  

diff --cc eeschema/CMakeLists.txt
Simple merge