From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 10 Sep 2017 10:11:20 +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=921a5391ad5df6b7e4f1739c1456edca3a57d270;p=kdeclarative.git

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

921a5391ad5df6b7e4f1739c1456edca3a57d270
diff --cc debian/changelog
index bbf3335,39ad812..db37834
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,55 +1,62 @@@
- kdeclarative (5.28.0-1+rpi1) stretch-staging; urgency=medium
++kdeclarative (5.37.0-2+rpi1) buster-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 23 Jan 2017 12:55:57 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 10 Sep 2017 05:10:57 +0000
++
+ kdeclarative (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:52 +0200
+ 
+ kdeclarative (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)
+   * Bump Standards-Version to 4.0.1.
+   * wrap-and-sort
+   * Set Priority to optional
+   * Set section for the doc package
+   * Release to experimental
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Wed, 16 Aug 2017 10:43:33 +0200
+ 
+ kdeclarative (5.36.0-2) experimental; urgency=medium
+ 
+   * New revision
+   * Build the qch files
+   * Add libkf5declarative-doc package for the qch files
+   * Release to experimental
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Wed, 02 Aug 2017 23:14:55 +0200
+ 
+ kdeclarative (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
+ 
+   [ Jonathan Riddell ]
+   * add qml-module-org-kde-kconfig package
+   * add .install file
+ 
+   [ Raymond Wooninck ]
+   * Add signing key
+   * also include signing-key
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Sun, 09 Jul 2017 23:42:25 +0200
  
  kdeclarative (5.28.0-1) unstable; urgency=medium
  
diff --cc debian/rules
index c87a2b0,5dee141..a719381
--- a/debian/rules
+++ b/debian/rules
@@@ -3,14 -3,9 +3,17 @@@
  
  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/libkf5declarative5.symbols
 +	$(overridden_command)
 +
 +override_dh_auto_clean:
 +	$(overridden_command)
 +	sed -i s/optional=meh/arch=!armel/ debian/libkf5declarative5.symbols
 +
+ override_dh_auto_configure:
+ 	$(overridden_command) -- -DBUILD_QCH=ON
+ 
  override_dh_strip:
  	$(overridden_command) --dbgsym-migration='libkf5declarative5-dbg (<= 5.19.0-1~~)'