From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 7 Jun 2020 20:03:55 +0000 (+0100)
Subject: Merge version 5.62.0-1+rpi1 and 5.70.0-1 to produce 5.70.0-1+rpi1
X-Git-Tag: archive/raspbian/5.70.0-1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=94f3ce566090ceb08cb4a18d7470e93fca091e7d;p=kdeclarative.git

Merge version 5.62.0-1+rpi1 and 5.70.0-1 to produce 5.70.0-1+rpi1
---

94f3ce566090ceb08cb4a18d7470e93fca091e7d
diff --cc debian/changelog
index d317b6f,91d4c68..2c4b326
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,40 +1,50 @@@
- kdeclarative (5.62.0-1+rpi1) bullseye-staging; urgency=medium
++kdeclarative (5.70.0-1+rpi1) bullseye-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>  Sat, 05 Oct 2019 23:29:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jun 2020 20:03:55 +0000
++
+ kdeclarative (5.70.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Bump compat level to 13.
+   * New upstream release (5.70.0).
+   * Update build-deps and deps with the info from cmake.
+   * Wrap long lines in changelog entries: 5.22.0-1.
+   * Set field Upstream-Contact in debian/copyright.
+   * Remove obsolete fields Contact, Name from debian/upstream/metadata
+     (already present in machine-readable debian/copyright).
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 26 May 2020 23:57:57 +0200
+ 
+ kdeclarative (5.69.0-1) experimental; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Bump compat level to 12.
+   * Bump Standards-Version to 4.5.0 (No changes needed).
+   * Get rid of debug-symbol-migration package.
+   * Add Rules-Requires-Root field to control.
+   * New upstream release (5.69.0).
+   * Update build-deps and deps with the info from cmake.
+   * Update symbols from buildds for 5.62.0
+   * Update symbols from build for 5.69.0.
+   * Cleanup Build-Depends.
+   * Enable hardening all.
+   * Update copyright file.
+   * Remove not needed injection of linker flags.
+   * Cleanup copyright file.
+   * Add symbols file for libkf5calendarevents5.
+   * Add Build-Depends-Package to symbols file.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Thu, 30 Apr 2020 17:56:53 +0200
  
  kdeclarative (5.62.0-1) unstable; urgency=medium
  
diff --cc debian/rules
index f21bf6b,c55b5dc..578c2e4
--- a/debian/rules
+++ b/debian/rules
@@@ -17,10 -9,7 +17,7 @@@ override_dh_auto_clean
  override_dh_auto_configure:
  	dh_auto_configure -- -DBUILD_QCH=ON
  
- override_dh_strip:
- 	dh_strip --dbgsym-migration='libkf5declarative5-dbg (<= 5.19.0-1~~)'
- 
  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