Manual merge of version 1:3.10.0+repack-1+rpi2 and 1:3.10.4+repack-1 to produce 1...

diff --cc debian/changelog
index 33ccf15295e4c0ea3fdc8ea1d0ab05f4a2d6de1a,8e4710f1b216db45e012badfb7b41ed01b83f059..bd15fb473bd3621c0d4d81efa3afec70a080158b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,38 +1,46 @@@
- supercollider (1:3.10.0+repack-1+rpi2) bullseye-staging; urgency=medium
++supercollider (1:3.10.4+repack-1+rpi1) bullseye-staging; urgency=medium
 +
-   * Apply upstream patches for new boost ( Closes: 959439 ).
++  [changes brought forward from 1:3.10.0+repack-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 29 Jun 2019 01:02:25 +0000]
++  * Make debian/rules disable qtwebengine.
++  * Remove build-depends on qtwebengine.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 08 Jun 2020 07:17:12 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 25 Jun 2020 09:01:31 +0000
 +
- supercollider (1:3.10.0+repack-1+rpi1) buster-staging; urgency=medium
+ supercollider (1:3.10.4+repack-1) unstable; urgency=medium
  
-   * Apply patches from https://github.com/supercollider/supercollider/pull/4328
-     to make QTWebengine optional.
-   * Make debian/rules disable qtwebengine.
-   * Remove build-depends on qtwebengine.
+   [ Ondřej Nový ]
+   * Use debhelper-compat instead of debian/compat
+   * d/changelog: Remove trailing whitespaces
+ 
+   [ Felipe Sateler ]
+   * Use ninja for building
+   * Drop python build-dependency, as it is unused (Closes: #938601)
+   * Add missing Depends on codemirror and jquery (Closes: #919838)
+   * Drop unused patch file supernova-i686-march-flag.patch
+   * Add full CC-BY-SA text
+ 
+   [ Dennis Braun ]
+   * New upstream version 3.10.4+repack
+     - Fix build with boost 1.71 (Closes: #959436)
+   * d/control:
+     + Bump debhelper compat to 12
+     + Bump Standards-Version to 4.5.0
+     + Drop cwiid support. See #942981
+     + Add the libs section to libscsynth1
+     + Add me as uploader
+     + http > https
+     + Set RRR: no
+   * d/copyright:
+     + Update Files-Excluded
+     + Fix spelling errors
+     + Update file entries
+     + http > https
+   * Update patchset
+   * supercollider-common.install: Add the dirs examples and HID_Support
+   * Use d/source/lintian-overrides and not d/source.lintian-overrides
+   * Add d/upstream/metadata
  
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 29 Jun 2019 01:02:25 +0000
+  -- Dennis Braun <d_braun@kabelmail.de>  Mon, 08 Jun 2020 23:59:00 +0200
  
  supercollider (1:3.10.0+repack-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge