Merge version 1:3.11.2+repack-1+rpi1 and 1:3.12.2+repack-1 to produce 1:3.12.2+repack...

diff --cc debian/changelog
index d5e18df28ca2373b4123859a2a0cfa97c1a990b6,7696765781d16ea1c8bf168d86ef7abe921a7a03..fa4230560701425456bce6fbfffe5d477d988058
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,39 +1,47 @@@
- supercollider (1:3.11.2+repack-1+rpi1) bullseye-staging; urgency=medium
++supercollider (1:3.12.2+repack-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 23 Dec 2020 14:40:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Nov 2022 22:41:27 +0000
++
+ supercollider (1:3.12.2+repack-1) unstable; urgency=medium
+ 
+   * New upstream version 3.12.2+repack
+ 
+   [ Olivier Humbert ]
+   * d/control: remove an unneeded empty line
+ 
+   [ Felipe Sateler ]
+   * Remove myself from uploaders
+ 
+   [ Debian Janitor ]
+   * Remove constraints unnecessary since stretch
+ 
+   [ IOhannes m zmölnig (Debian/GNU) ]
+   * Apply 'wrap-and-sort -ast'
+   * Add salsa-ci configuration
+   * Drop unused B-D on emacs|emacsen
+ 
+   [ Debian Janitor ]
+   * Remove constraints unnecessary since buster
+ 
+   [ Sebastian Ramacher ]
+   * Remove shared library from Build-Depends
+ 
+   [ Dennis Braun ]
+   * Refresh patchset, drop patches applied by upstream
+     + Use macro instead of redefining struct (Closes: #1019995)
+   * Bump Standards-Version to 4.6.1
+   * Use libjack-jackd2-dev as preferable B-D and libjack-dev as optional
+   * Update lintian-overrides
+   * Update icon installation
+ 
+   [ Georges Khaznadar ]
+   * updated the file debian/watch to use the new API from Github
+ 
+  -- Georges Khaznadar <georgesk@debian.org>  Wed, 02 Nov 2022 18:36:06 +0100
  
  supercollider (1:3.11.2+repack-1) unstable; urgency=medium
  

diff --cc debian/control
index 45ecd755daba2b690b4119a460bdb7ef3be88a0b,49df6cd174afc1acdc4564f40fb3c45eb984a8a8..5bb04ec37f96c8ceab8de81fe025e507f27b68f5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,48 -4,47 +4,46 @@@ Priority: optiona
  Vcs-Git: https://salsa.debian.org/multimedia-team/supercollider.git
  Vcs-Browser: https://salsa.debian.org/multimedia-team/supercollider
  Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
- Uploaders: Alexandre Quessy <alexandre@quessy.net>,
+ Uploaders:
+  Alexandre Quessy <alexandre@quessy.net>,
   Dan Stowell <danstowell@users.sourceforge.net>,
-  Felipe Sateler <fsateler@debian.org>,
   Georges Khaznadar <georgesk@debian.org>,
-  Dennis Braun <d_braun@kabelmail.de>
+  Dennis Braun <d_braun@kabelmail.de>,
  Build-Depends:
-  cmake (>= 2.8.12),
+  cmake,
   debhelper-compat (= 13),
-  ninja-build,
-  emacs | emacsen,
   libasound2-dev [linux-any],
   libavahi-client-dev,
+  libboost-date-time-dev,
+  libboost-dev,
+  libboost-filesystem-dev,
+  libboost-math-dev,
+  libboost-program-options-dev,
+  libboost-regex-dev,
+  libboost-system-dev,
+  libboost-test-dev,
+  libboost-thread-dev,
   libfftw3-dev,
   libicu-dev,
-  libjack-dev,
+  libjack-dev | libjack-jackd2-dev,
   libncurses-dev,
-  libqt5core5a (>= 5.3),
+  libqt5opengl5-dev,
+  libqt5sensors5-dev,
+  libqt5svg5-dev,
+  libqt5webkit5-dev,
+  libqt5websockets5-dev,
   libreadline-dev,
-  libsndfile1-dev (>= 1.0.16),
+  libsndfile1-dev,
   libudev-dev,
   libxt-dev,
-  qtbase5-dev,
+  ninja-build,
   qt5-qmake,
-  qttools5-dev,
-  qttools5-dev-tools,
+  qtbase5-dev,
   qtdeclarative5-dev,
-  libqt5opengl5-dev,
-  libqt5webkit5-dev,
-  libqt5websockets5-dev,
-  libqt5svg5-dev,
   qtpositioning5-dev,
-  libqt5sensors5-dev,
-  libboost-dev (>= 1.57),
-  libboost-date-time-dev (>= 1.57),
-  libboost-filesystem-dev (>= 1.57),
-  libboost-math-dev (>= 1.57),
-  libboost-program-options-dev (>= 1.57),
-  libboost-regex-dev (>= 1.57),
-  libboost-system-dev (>= 1.57),
-  libboost-test-dev (>= 1.57),
-  libboost-thread-dev (>= 1.57)
- Standards-Version: 4.5.1
+  qttools5-dev,
+  qttools5-dev-tools,
 - qtwebengine5-dev,
+ Standards-Version: 4.6.1
  Homepage: https://supercollider.github.io
  Rules-Requires-Root: no