From: Raspbian forward pporter <root@raspbian.org>
Date: Wed, 21 Feb 2018 05:55:56 +0000 (+0000)
Subject: Merge version 5.37.0-2+rpi1 and 5.42.0-2 to produce 5.42.0-2+rpi1
X-Git-Tag: archive/raspbian/5.42.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b1e0fe9e622bfbcde278272f5693eb9021330b6a;p=kdeclarative.git

Merge version 5.37.0-2+rpi1 and 5.42.0-2 to produce 5.42.0-2+rpi1
---

b1e0fe9e622bfbcde278272f5693eb9021330b6a
diff --cc debian/changelog
index db37834,58d7d2b..28b4197
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,36 +1,43 @@@
- kdeclarative (5.37.0-2+rpi1) buster-staging; urgency=medium
++kdeclarative (5.42.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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 10 Sep 2017 05:10:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Feb 2018 05:55:56 +0000
++
+ kdeclarative (5.42.0-2) sid; urgency=medium
+ 
+   * New revision
+   * Release to sid
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Sat, 10 Feb 2018 11:28:41 +0100
+ 
+ kdeclarative (5.42.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.42.0).
+   * Add link options as-needed
+   * Bump debhelper build-dep and compat to 11.
+   * Build without build_stamp
+   * Update build-deps and deps with the info from cmake
+   * Add new qml package qml-module-org-kde-kcm
+   * Bump group breaks (5.42)
+   * Bump Standards-Version to 4.1.3.
+   * Release to experimental
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Fri, 02 Feb 2018 12:04:55 +0100
+ 
+ kdeclarative (5.41.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.38.0).
+   * Update build-deps and deps with the info from cmake
+   * New upstream release (5.41.0).
+   * Bump Standards-Version to 4.1.2.
+   * Update build-deps and deps with the info from cmake
+   * Update symbols files.
+   * Bump group breaks (5.41)
+   * Release to experimental
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Fri, 15 Dec 2017 10:42:22 -0300
  
  kdeclarative (5.37.0-2) sid; urgency=medium
  
diff --cc debian/rules
index a719381,e7978e4..4f9a896
--- a/debian/rules
+++ b/debian/rules
@@@ -1,21 -1,16 +1,24 @@@
  #!/usr/bin/make -f
  # -*- makefile -*-
  
- include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+ 
+ %:
+ 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
  
 +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
+ 	dh_auto_configure -- -DBUILD_QCH=ON
  
  override_dh_strip:
- 	$(overridden_command) --dbgsym-migration='libkf5declarative5-dbg (<= 5.19.0-1~~)'
+ 	dh_strip --dbgsym-migration='libkf5declarative5-dbg (<= 5.19.0-1~~)'
  
  override_dh_auto_test:
  	# Disable dh_auto_test at build time