Merge version 5.4.7~ds0-1+rpi1 and 5.4.7~ds0-2 to produce 5.4.7~ds0-2+rpi1

diff --cc debian/changelog
index 16ef719281948b8798ddff36e8aa4d77d422b556,084679a6f7b6d99391d45470138680488ec2581b..979e2f93f9962c48094240e50d09a99b6f6abd96
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- juce (5.4.7~ds0-1+rpi1) bullseye-staging; urgency=medium
++juce (5.4.7~ds0-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.4.4~repack0-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 30 Nov 2019 15:26:20 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 21 Feb 2020 04:26:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Mar 2020 12:23:22 +0000
++
+ juce (5.4.7~ds0-2) unstable; urgency=medium
+ 
+   * Refresh patches using 'gbp pq'
+   * Add patch to not fail fatally without X-server
+   * Fix FTCBFS:
+     + Let dpkg's buildtools.mk supply pkg-config for debian/rules.
+     + cross.patch: Make pkg-config substitutable.
+     + Let dh_auto_build pass cross tools to make.
+     Thanks to Helmut Grohne <helmut@subdivi.de> (Closes: #951684)
+   * Add patch to allow overriding of pkg-config in generated Makefiles
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Mon, 16 Mar 2020 13:35:45 +0100
  
  juce (5.4.7~ds0-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge