Merge version 8.0.5-1+rpi1 and 8.0.6+ds1-2 to produce 8.0.6+ds1-2+rpi1

diff --cc debian/changelog
index 03e6af195e4987d24b42e8a78a5aeb10ee27590a,2c5b48b813d09f3f6242a89b6e3dc2576e47d23d..a73abdda23715908dca3ed7e5307a2d268cbfcd6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- seafile-client (8.0.5-1+rpi1) bookworm-staging; urgency=medium
++seafile-client (8.0.6+ds1-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 6.2.7-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 01 Dec 2018 05:02:42 +0000]
 +  * Switch armhf from qtwebengine to qtwebkit.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 30 Nov 2021 20:48:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Apr 2022 16:03:25 +0000
++
+ seafile-client (8.0.6+ds1-2) unstable; urgency=medium
+ 
+   * Set source-Upstream-Version to the *actual* upstream version
+     without repack suffix (Closes: #1008826)
+ 
+  -- Moritz Schlarb <schlarbm@uni-mainz.de>  Mon, 04 Apr 2022 11:42:59 +0200
+ 
+ seafile-client (8.0.6+ds1-1) unstable; urgency=medium
+ 
+   * Prepare watch file with repack suffix for next time
+   * New upstream version 8.0.6+ds1
+ 
+  -- Moritz Schlarb <schlarbm@uni-mainz.de>  Thu, 31 Mar 2022 08:46:45 +0200
  
  seafile-client (8.0.5-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
index 3b68d408b023877813111fc4c40bf42c8bb7a407,be9c6894ebac344d9efc4b412e2889bda532d1bd..415a58b16693651936b617dfe4ac8c380649b259
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -17,12 -20,8 +20,10 @@@ export QT_SELECT=
  
  CMAKE_FLAGS = -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DBUILD_SHIBBOLETH_SUPPORT=ON -DAUTOMOC_MOC_OPTIONS=-p./
  
- include /usr/share/dpkg/architecture.mk
- 
  ifeq ($(DEB_HOST_ARCH),armel)
   CMAKE_FLAGS += -DUSE_QT_WEBKIT=ON
 +else ifeq ($(DEB_HOST_ARCH),armhf)
 + CMAKE_FLAGS += -DUSE_QT_WEBKIT=ON
  else ifeq ($(DEB_HOST_ARCH),mips)
   CMAKE_FLAGS += -DUSE_QT_WEBKIT=ON
  else ifeq ($(DEB_HOST_ARCH),mips64el)