From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 5 Jun 2020 22:57:27 +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=28702d54a2e51cba41a98229043a30b727d62a02;p=kactivities-kf5.git

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

28702d54a2e51cba41a98229043a30b727d62a02
diff --cc debian/changelog
index 8a1c46f,1f80ff1..899612a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,39 +1,46 @@@
- kactivities-kf5 (5.62.0-1+rpi1) bullseye-staging; urgency=medium
++kactivities-kf5 (5.70.0-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.12.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 19 Jul 2015 21:22:27 +0000]
 +  * Add symbols file hack for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Sep 2019 13:58:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Jun 2020 22:57:26 +0000
++
+ kactivities-kf5 (5.70.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Pino Toscano ]
+   * Update symbols file from the logs of buildds.
+ 
+   [ 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:56:37 +0200
+ 
+ kactivities-kf5 (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.
+   * Cleanup Build-Depends.
+   * Delete not needed Breaks/Confilcts.
+   * Enable hardening all.
+   * Update copyright file.
+   * Remove not needed injection of linker flags.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Thu, 30 Apr 2020 01:02:09 +0200
  
  kactivities-kf5 (5.62.0-1) unstable; urgency=medium
  
diff --cc debian/rules
index 6722c24,0f8a628..625b281
--- a/debian/rules
+++ b/debian/rules
@@@ -6,16 -6,5 +6,13 @@@ export DEB_BUILD_MAINT_OPTIONS = harden
  %:
  	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
  
 +override_dh_auto_build:
 +	sed -i s/arch=!armel/optional=meh/ debian/libkf5activities5.symbols 
 +	$(overridden_command)
 +
 +override_dh_auto_clean:
 +	$(overridden_command)
 +	sed -i s/optional=meh/arch=!armel/ debian/libkf5activities5.symbols 
 +
  override_dh_auto_configure:
  	dh_auto_configure -- -DBUILD_QCH=ON
- 
- override_dh_strip:
- 	dh_strip --dbgsym-migration='libkf5activities5-dbg (<= 5.19.0-1~~)'