[SCM] kdeclarative packaging branch, kubuntu_wily_archive, updated. ubuntu/5.13.0-0ubuntu1-1-g8a7d45b

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdeclarative.git;a=commitdiff;h=8a7d45b

The following commit has been merged in the kubuntu_wily_archive branch:
commit 8a7d45b78ad4a7c391b29f912ea4ac092c7db795
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Aug 14 00:08:05 2015 +0100

     Add qml-module-qtquick2 to test-deps as one of our tests requires QtQuick.
    
    * Add qml-module-qtquick2 to test-deps as one of our tests requires QtQuick.
    * Oh noes, I typoed "c++11", sorry.
    * acc test: Pass -std=c++11 to avoid failure relating to std::unique_ptr.
---
 debian/.gitattributes               |  1 -
 debian/changelog                    | 18 ++++++++++++++++++
 debian/libkf5declarative-dev.acc.in |  2 +-
 debian/tests/control                |  3 ++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 33ad6b0..b951695 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+kdeclarative (5.13.0-0ubuntu4) wily; urgency=medium
+
+  * Add qml-module-qtquick2 to test-deps as one of our tests requires QtQuick.
+
+ -- Iain Lane <iain at orangesquash.org.uk>  Thu, 13 Aug 2015 17:19:04 +0100
+
+kdeclarative (5.13.0-0ubuntu3) wily; urgency=medium
+
+  * Oh noes, I typoed "c++11", sorry.
+
+ -- Iain Lane <iain at orangesquash.org.uk>  Thu, 13 Aug 2015 14:58:05 +0100
+
+kdeclarative (5.13.0-0ubuntu2) wily; urgency=medium
+
+  * acc test: Pass -std=c++11 to avoid failure relating to std::unique_ptr.
+
+ -- Iain Lane <iain at orangesquash.org.uk>  Thu, 13 Aug 2015 13:10:06 +0100
+
 kdeclarative (5.13.0-0ubuntu1) wily; urgency=medium
 
   * new upstream release
diff --git a/debian/libkf5declarative-dev.acc.in b/debian/libkf5declarative-dev.acc.in
index 92c9d92..e8faef3 100644
--- a/debian/libkf5declarative-dev.acc.in
+++ b/debian/libkf5declarative-dev.acc.in
@@ -15,7 +15,7 @@
 </libs>
 
 <gcc_options>
-    -fPIC
+    -fPIC -std=c++11
 </gcc_options>
 
 </descriptor>
diff --git a/debian/tests/control b/debian/tests/control
index ef8828a..d5c09e3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,7 @@
 Tests: testsuite
 Depends: @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, openbox
+         xvfb, xauth, dbus-x11, openbox,
+         qml-module-qtquick2
 Restrictions: rw-build-tree
 
 Tests: acc

-- 
kdeclarative packaging