From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 10 Sep 2017 10:00:18 +0000 (+0000)
Subject: Manual merge of version 5.28.0-1+rpi1 and 5.37.0-2 to produce 5.37.0-2+rpi1
X-Git-Tag: archive/raspbian/5.37.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0b97d73372b59c41b2098fdb236a98b8c092c614;p=kactivities-kf5.git

Manual merge of version 5.28.0-1+rpi1 and 5.37.0-2 to produce 5.37.0-2+rpi1
---

0b97d73372b59c41b2098fdb236a98b8c092c614
diff --cc debian/changelog
index 3113836,b46f397..3e8458f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,45 +1,52 @@@
- kactivities-kf5 (5.28.0-1+rpi1) stretch-staging; urgency=medium
++kactivities-kf5 (5.37.0-2+rpi1) buster-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>  Thu, 26 Jan 2017 06:24:01 +0000
++ -- Peter Michael Green <plugwasht@raspbian.org>  Sun, 10 Sep 2017 05:10:54 +0000
++
+ kactivities-kf5 (5.37.0-2) sid; urgency=medium
+ 
+   * New revision
+   * Bump Standards-Version to 4.1.0.
+   * Update upstream metadata
+   * Release to sid
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Sun, 03 Sep 2017 09:57:30 +0200
+ 
+ kactivities-kf5 (5.37.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.37.0).
+   * Update build-deps and deps with the info from cmake
+   * Bump group breaks (5.37)
+   * Add a libkf5activities-doc package for the qch files
+   * Bump Standards-Version to 4.0.1.
+   * Set Priority to optional
+   * Set section for the doc package
+   * Release to experimental
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Wed, 16 Aug 2017 10:43:54 +0200
+ 
+ kactivities-kf5 (5.36.0-1) experimental; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.35.0).
+   * Bump Standards-Version to 4.0.0.
+   * Update build-deps and deps with the info from cmake
+   * Bump group breaks (5.35)
+   * watch: Use https uris
+   * New upstream release (5.36.0).
+   * Bump group breaks (5.36)
+   * Update build-deps and deps with the info from cmake
+ 
+   [ Raymond Wooninck ]
+   * Add signing key
+   * also include signing-key
+ 
+   [ Harald Sitter ]
+   * acc c++11. now used more liberally
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Sun, 09 Jul 2017 23:42:42 +0200
  
  kactivities-kf5 (5.28.0-1) unstable; urgency=medium
  
diff --cc debian/rules
index 027dfc9,56e4443..d5ca6d4
--- a/debian/rules
+++ b/debian/rules
@@@ -3,13 -3,8 +3,16 @@@
  
  include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  
 +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:
+ 	$(overridden_command) -- -DBUILD_QCH=ON
+ 
  override_dh_strip:
  	$(overridden_command) --dbgsym-migration='libkf5activities5-dbg (<= 5.19.0-1~~)'