Merge version 7.0.3~ds0-1+rpi1 and 7.0.4+ds-2 to produce 7.0.4+ds-2+rpi1

diff --cc debian/changelog
index 01e06dfb631b8f34cfd66e95bdf93854ba0499c1,f313f882a2c08265a17734fa0af3535800cb8133..6c74ddc658953541ada574d7f3caa0f5a1691ed6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- juce (7.0.3~ds0-1+rpi1) bookworm-staging; urgency=medium
++juce (7.0.4+ds-2+rpi1) bookworm-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, 09 Dec 2022 03:59:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Jan 2023 04:07:46 +0000
++
+ juce (7.0.4+ds-2) unstable; urgency=medium
+ 
+   * Prevent building on 'armel' altogether
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Thu, 12 Jan 2023 09:20:17 +0100
+ 
+ juce (7.0.4+ds-1) unstable; urgency=medium
+ 
+   * New upstream version 7.0.4+ds
+     + Drop patches applied upstream
+   * Switch repack-suffix to '+ds'
+   * Update dates in d/copyright
+     + Re-generate d/copyright_hints
+     + Ensure that 'licensecheck' is run with the C.UTF-8 locale
+     + Drop duplicate 'licensecheck' target
+   * Bump standards version to 4.6.2
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Wed, 11 Jan 2023 16:38:55 +0100
  
  juce (7.0.3~ds0-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge