Manual merge of version 5.4.7~ds0-2+rpi1 and 6.1.5~ds0-1 to produce 6.1.5~ds0-1+rpi1

diff --cc debian/changelog
index 979e2f93f9962c48094240e50d09a99b6f6abd96,b4e65605b65862d319a9a804a0fb26842b8831af..06d7bf7e7ba10829bf1941cd5fd676e7b849eb2e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,109 +1,116 @@@
- juce (5.4.7~ds0-2+rpi1) bullseye-staging; urgency=medium
++juce (6.1.5~ds0-1+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>  Wed, 18 Mar 2020 12:23:22 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 10 Feb 2022 16:40:06 +0000
++
+ juce (6.1.5~ds0-1) unstable; urgency=medium
+ 
+   * New upstream version 6.1.5~ds0
+     + Refresh patches
+   * Update dates in d/copyright
+     + Regenerate d/copyright_hints
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Mon, 31 Jan 2022 11:55:24 +0100
+ 
+ juce (6.1.4~ds0-1) unstable; urgency=medium
+ 
+   * New upstream version 6.1.4~ds0
+     - Refresh patches
+   * Regenerated d/copyright_hints
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Mon, 10 Jan 2022 09:12:48 +0100
+ 
+ juce (6.1.3~ds0-1) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+   * Remove JUCE from arch:armel
+     - Drop hack to make JUCE compile on armel
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Thu, 23 Dec 2021 10:05:10 +0100
+ 
+ juce (6.1.3~ds0-1~exp3) experimental; urgency=medium
+ 
+   * Fix typo in fix for MIPS build failure
+   * Drop some unnecessary Build-Dependencies
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Wed, 22 Dec 2021 15:11:56 +0100
+ 
+ juce (6.1.3~ds0-1~exp2) experimental; urgency=medium
+ 
+   * Fix FTBFS on MIPS architectures
+   * Fix FTBFS on armel
+   * Fix quoting when defining DEBIAN_JUCEPROJECT_LIBS
+   * Mark 'juce-tools' as Multi-Arch foreign
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Wed, 22 Dec 2021 12:02:02 +0100
+ 
+ juce (6.1.3~ds0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream version 6.1.3~ds0
+ 
+   * Refresh patches
+   * Use CMake to build
+   * Fix paths in installed cmake snippets
+   * Install ChangeList.txt to keep Projucer happy
+   * Update LV2-wrapper
+   * Move B-D on python3:any from B-D-Indep to B-D
+   * Use DEB_*_MAIN_APPEND rather than passing build flags manually
+   * Properly call dh_doxygen
+   * Provide a static manpage
+   * Make documentation reproducible
+   * Apply 'wrap-and-sort -ast'
+   * Drop no longer used variables TARGET_ARCH and DEB_SRCDIR
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Thu, 16 Dec 2021 13:12:40 +0100
+ 
+ juce (6.1.0~ds0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream version 6.1.0~ds0
+     * Refresh patches
+   * Update d/copyright
+     * Regenerate d/copyright_hints
+   * debian_vst:
+     * Drop compat-defines
+     * Add typedef for Vst2::AudioMasterOpcodesX
+   * Bump standards version to 4.6.0
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Mon, 30 Aug 2021 14:58:56 +0200
+ 
+ juce (6.0.7~ds0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream version 6.0.7~ds0
+     * Refresh patches
+   * Fix spelling error in patch
+   * d/watch: use repacksuffix rather than oversionmangle
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Tue, 26 Jan 2021 23:41:40 +0100
+ 
+ juce (6.0.5~ds0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream version 6.0.5~ds0 (Closes: #977307)
+     * Drop useless patches
+     * Refresh patches
+     * Patch to allow building of build-helpers
+   * Set CPPFLAGS to build GPL-variant of Projucer
+   * Split juce-modules-source into an arch:any and an arch:all package.
+     Thanks to Helmut Grohne <helmut@subdivi.de> (Closes: #979169)
+   * Install CMake snippets in 'juce-modules-source'
+   * B-D on cmake
+   * Use "make install" to collect files for the packages
+   * Update d/copyright
+     * d/copyright: update "Source" field to new github project
+     * Exclude .pc/ from licensecheck
+     * Regenerate d/copyright_hints
+   * Update d/watch to version 4
+     * Update d/watch to new upstream github project
+   * Refresh patches with 'gbp pq'
+   * Bump dh-compat to 13
+   * Bump standards version to 4.5.1
+ 
+  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Wed, 13 Jan 2021 14:12:19 +0100
  
  juce (5.4.7~ds0-2) unstable; urgency=medium
  

diff --cc debian/rules
index 983cac45ec7f987cfa696fbf7730f8b68c92edd3,d2eb29f4f775de224fbbcea454d6b43437b7176d..a478656bcee13c2590ec2834ff052dc063ca39e1
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -28,13 -30,21 +30,21 @@@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = 
  # - https://gcc.gnu.org/wiki/Atomic
  # - https://gcc.gnu.org/wiki/Atomic/GCCMM/LIbrary
  # - the 'clasp' packaging
- noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|armhf|powerpc|powerpcspe|m68k|mips|mipsel|sh4|riscv64)")
  # link with libatomic on architectures without built-in atomic
- ifeq ($(if $(noatomicarch),atomic), atomic)
-       LDFLAGS += -latomic
-       CPPFLAGS += -DDEBIAN_JUCERPROJECT_LIBS='\"atomic\"'
 -ifneq ($(strip $(filter $(DEB_HOST_ARCH), armel powerpc powerpcspe m68k mips mipsel sh4 riscv64)),)
++ifneq ($(strip $(filter $(DEB_HOST_ARCH), armel armhf powerpc powerpcspe m68k mips mipsel sh4 riscv64)),)
+       DEB_CPPFLAGS_MAINT_APPEND += -DDEBIAN_JUCERPROJECT_LIBS='"atomic"'
+       DEB_LDFLAGS_MAINT_APPEND += -latomic
  endif
  
+ # we got too many symbols for MIPS, so we need to enablea workaround...
+ ifneq ($(strip $(filter $(DEB_HOST_ARCH), mipsel mips64el)),)
+       DEB_CXXFLAGS_MAINT_APPEND += -mxgot
+ endif
+ 
+ 
+ # Debian's Projucer is GPL
+ DEB_CPPFLAGS_MAINT_APPEND += -DJUCER_ENABLE_GPL_MODE=1
+ 
  %:
        dh $@