[SCM] kdeclarative packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu2-34-g2827fc0
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Tue Dec 1 15:46:19 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdeclarative.git;a=commitdiff;h=2827fc0
The following commit has been merged in the kubuntu_unstable branch:
commit 2827fc07aafd38a94ec55f2a878af428f32a2e5f
Merge: c5e0a77214947111b23ec8fcea85d257fce12c2a d4037d25bc62bc50ae2224be1566018e99d156e4
Author: Rohan Garg <rohan at garg.io>
Date: Tue Dec 1 16:45:45 2015 +0100
Merge branch 'master' into kubuntu_unstable
debian/changelog | 43 ++++++++++++++++++++
debian/control | 29 ++++++++------
debian/libkf5declarative-dev.acc.in | 3 +-
debian/libkf5declarative5.symbols | 50 ++++++++++++++++--------
debian/libkf5quickaddons5.symbols | 2 +-
debian/qml-module-org-kde-kquickcontrols.install | 7 +---
debian/tests/control | 6 +++
debian/tests/testsuite | 6 ---
8 files changed, 104 insertions(+), 42 deletions(-)
diff --cc debian/changelog
index b4933f9,102850a..833a1e6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,76 -1,46 +1,119 @@@
+ kdeclarative (5.16.0-1) unstable; urgency=medium
+
+ * New upstream release (5.16.0).
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 30 Nov 2015 12:12:48 +0100
+
+ kdeclarative (5.15.0-1) unstable; urgency=medium
+
+ * New upstream release (5.15.0).
+ * Update symbols files from buildds logs (5.14.0-1).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 09 Oct 2015 19:16:04 +0200
+
+kdeclarative (5.15.0-0ubuntu3) UNRELEASED; urgency=medium
+
+ [ Clive Johnston ]
+ * New upstream release
+
+ [ Jonathan Riddell ]
+ * Add libkf5calendarevents5
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 20 Nov 2015 15:43:36 +0000
+
+kdeclarative (5.15.0-0ubuntu2) xenial; urgency=medium
+
+ * Fix autopackagetests by adding allow-stderr to the requirements.
+
+ -- Philip Muškovac <yofel at kubuntu.org> Tue, 03 Nov 2015 15:34:35 +0100
+
+kdeclarative (5.15.0-0ubuntu1) wily; urgency=medium
+
+ [ Scarlett Clark ]
+ * Vivid backport
+
+ [ Jonathan Riddell ]
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 07 Oct 2015 13:45:49 +0100
+
+ kdeclarative (5.14.0-1) unstable; urgency=medium
+
+ * New upstream release (5.14.0).
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 15 Sep 2015 13:48:17 +0200
+
+kdeclarative (5.14.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Clive Johnston <clivejo at aol.com> Thu, 17 Sep 2015 13:12:28 +0100
+
+ kdeclarative (5.13.0-1) unstable; urgency=medium
+
+ * New upstream release (5.13.0).
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 01 Sep 2015 00:17:24 +0200
+
+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
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 10 Aug 2015 12:55:27 +0200
+
+ kdeclarative (5.12.0-2) unstable; urgency=medium
+
+ * Team upload.
+ * Update symbols files for armel differences
+
+ -- Scott Kitterman <scott at kitterman.com> Thu, 16 Jul 2015 22:54:39 -0400
+
+ kdeclarative (5.12.0-1) unstable; urgency=medium
+
+ * New upstream release (5.12.0).
+ * Update install files.
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 09 Jul 2015 12:43:09 +0200
+
+kdeclarative (5.12.0-0ubuntu1) wily; urgency=medium
+
+ [ Scarlett Clark ]
+ * New upstream release
+ * Fix merge, remove unused broken backport.
+
+ [ José Manuel Santamaría Lema ]
+ * Update symbols file:
+ - Mark as optional the symbols gone after building with GCC 5
+ - Add new symbols, mark as optional those sho doesn't show up
+ after rebuilding with GCC 4
+
+ [ Scarlett Clark ]
+ * Vivid backport
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 03 Aug 2015 14:27:13 +0200
+
kdeclarative (5.11.0-1) unstable; urgency=medium
* New upstream release (5.10.0).
diff --cc debian/control
index 9f4a469,17e7b6f..50e1d0c
--- a/debian/control
+++ b/debian/control
@@@ -37,10 -36,9 +36,16 @@@ Description: commandline tool for launc
Package: libkf5declarative-dev
Section: libdevel
Architecture: any
++<<<<<<< HEAD
+Depends: kio-dev (>= 5.15.0~),
+ libkf5calendarevents5 (= ${binary:Version}),
+ libkf5declarative5 (= ${binary:Version}),
+ libkf5package-dev (>= 5.15.0~),
++=======
+ Depends: kio-dev (>= 5.16.0~),
+ libkf5declarative5 (= ${binary:Version}),
+ libkf5package-dev (>= 5.16.0~),
++>>>>>>> master
libkf5quickaddons5 (= ${binary:Version}),
qtbase5-dev (>= 5.4),
qtdeclarative5-dev (>= 5.4),
diff --cc debian/tests/control
index 6a2e41a,b9cb811..67cb7c9
--- a/debian/tests/control
+++ b/debian/tests/control
@@@ -1,8 -1,7 +1,14 @@@
Tests: testsuite
++<<<<<<< HEAD
+Depends: @builddeps@, build-essential,
+ xvfb, xauth, dbus-x11, openbox,
+ qml-module-qtquick2
+Restrictions: rw-build-tree
++=======
+ Depends: @, @builddeps@, build-essential,
+ xvfb, xauth, dbus-x11, openbox
+ Restrictions: build-needed
++>>>>>>> master
Tests: acc
Depends: @, dh-acc, exuberant-ctags
--
kdeclarative packaging
More information about the pkg-kde-commits
mailing list