Manual merge of version 5.70.0-1+rpi1 and 5.74.0-2 to produce 5.74.0-2+rpi1

diff --cc debian/changelog
index 68c9b7b32fe17685ba278ad3c34346d78d957551,fec22abc36490f67e1eba3ac46de58775ece8cf7..eadd098453430d6b634a20e8680c80150ab65555
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,29 +1,36 @@@
- ksyntax-highlighting (5.70.0-1+rpi1) bullseye-staging; urgency=medium
++ksyntax-highlighting (5.74.0-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.62.0-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 25 Feb 2020 04:12:28 +0000]
 +  * Add symbols file hack for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jun 2020 20:47:30 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 28 Oct 2020 01:12:28 +0000
++
+ ksyntax-highlighting (5.74.0-2) unstable; urgency=medium
+ 
+   * Team upload to unstable.
+ 
+   [ Helmut Grohne ]
+   * Fix FTCBFS: Pass a native qt to the build. (Closes: #951750)
+ 
+  -- Sandro Knauß <hefee@debian.org>  Mon, 19 Oct 2020 23:14:54 +0200
+ 
+ ksyntax-highlighting (5.74.0-1) experimental; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * New upstream release (5.74.0).
+   * Update build-deps and deps with the info from cmake.
+   * Update libkf5syntaxhighlighting-tools.install.
+   * Update symbols from build for 5.74.0 no ABI bump needed (only tempinst and
+     private symbols got removed).
+   * Update Homepage link to point to new invent.kde.org
+   * Update repository related entries to metadata file.
+   * Update field Source in debian/copyright to invent.kde.org move.
+   * Add Bug-* entries to metadata file.
+   * Update copyright for 5.74.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Sun, 27 Sep 2020 17:44:36 +0200
  
  ksyntax-highlighting (5.70.0-1) unstable; urgency=medium
  

diff --cc debian/rules
index 269a0d03ed3b28ace9e983726bc22ac71c9dfff6,a559493548b3c6d147faa8ecc62d3ba002bfa234..8ecf935d003fa7e1e2d98f4115a0a73407bfd7b8
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -7,9 -7,4 +7,9 @@@ export DEB_BUILD_MAINT_OPTIONS = harden
        dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
  
  override_dh_auto_configure:
-       dh_auto_configure -- -DBUILD_QCH=ON
 +      sed -i 's/(arch=!armel !riscv64)/(optional=notarmelandprobabllynotraspbian)/' debian/libkf5syntaxhighlighting5.symbols
+       dh_auto_configure -- -DBUILD_QCH=ON -DKF5_HOST_TOOLING=/usr/lib
 +
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      sed -i 's/(optional=notarmelandprobabllynotraspbian)/(arch=!armel !riscv64)/' debian/libkf5syntaxhighlighting5.symbols