From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 7 Aug 2022 03:14:23 +0000 (+0000)
Subject: Manual merge of version 5.94.0-1+rpi1 and 5.94.0-3 to produce 5.94.0-3+rpi1
X-Git-Tag: archive/raspbian/5.94.0-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=59e72398e08e0607b6b62888a7649122bff3a527;p=kdeclarative.git

Manual merge of version 5.94.0-1+rpi1 and 5.94.0-3 to produce 5.94.0-3+rpi1
---

59e72398e08e0607b6b62888a7649122bff3a527
diff --cc debian/changelog
index d3f6ae7,963441d..593c730
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,28 +1,38 @@@
- kdeclarative (5.94.0-1+rpi1) bookworm-staging; urgency=medium
++kdeclarative (5.94.0-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 5.12.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 19 Jul 2015 02:00:18 +0000]
 +  * Add symbols file hack for raspbian.
 +
 +  [changes introduced in version 5.27.0-1+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 29 May 2022 17:22:37 +0000
++ -- Peter Michael Green <plugwash@debian.org>  Sun, 07 Aug 2022 03:13:30 +0000
++
+ kdeclarative (5.94.0-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols file from the logs of buildds.
+ 
+  -- Pino Toscano <pino@debian.org>  Tue, 26 Jul 2022 19:12:01 +0200
+ 
+ kdeclarative (5.94.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Bump Standards-Version to 4.6.1, no changes required.
+   * Remove inactive Uploaders.
+   * Modernize building:
+     - add the dh-sequence-kf5 build dependency to use the kf5 addon
+       automatically
+     - drop all the manually specified addons and buildsystem for dh
+   * CI: enable again the blhc job.
+   * Fix field name case in debian/control (Multi-arch => Multi-Arch).
+   * Remove the manual check for nocheck in DEB_BUILD_OPTIONS, as debhelper does
+     it already in compat 13+.
+   * Mark the xauth, and xvfb build dependencies as nocheck, as they are needed
+     only by dh_auto_test.
+   * Update symbols files. (Closes: #1012959)
+ 
+  -- Pino Toscano <pino@debian.org>  Mon, 25 Jul 2022 19:51:51 +0200
  
  kdeclarative (5.94.0-1) unstable; urgency=medium
  
diff --cc debian/rules
index fd1f7e3,263092f..02514c0
--- a/debian/rules
+++ b/debian/rules
@@@ -4,20 -4,10 +4,18 @@@
  export DEB_BUILD_MAINT_OPTIONS = hardening=+all reproducible=-fixfilepath
  
  %:
- 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+ 	dh $@ --with pkgkde_symbolshelper
  
 +override_dh_auto_build:
 +	sed -i s/arch=!armel/optional=meh/ debian/libkf5declarative5.symbols
 +	dh_auto_build
 +
 +override_dh_auto_clean:
 +	dh_auto_clean
 +	sed -i s/optional=meh/arch=!armel/ debian/libkf5declarative5.symbols
 +
  override_dh_auto_configure:
  	dh_auto_configure -- -DBUILD_QCH=ON
  
  override_dh_auto_test:
- ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 -	xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test --no-parallel
 +	#xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test --no-parallel
- endif