[SCM] kaccounts-integration packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-60-g625c1e4
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Thu Jan 28 21:46:15 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaccounts-integration.git;a=commitdiff;h=625c1e4
The following commit has been merged in the kubuntu_xenial_archive branch:
commit 625c1e4f5404db8a74c45b615bdcc7af2d220989
Merge: 1da4bce4e7a5ed1a278584952cd3d49772daf5e4 465cddbef40057ca3907ffa91ca93fc2132482b4
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Thu Jan 28 13:45:46 2016 -0800
* New upstream release. * Add libkf5declarative-dev to Build-Depends.
-- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:16:41 +0100 * New upstream release. * Change my email address back * Update symbols file with new symbols.
-- Diane Trout <diane at ghic.org> Fri, 04 Dec 2015 10:55:04 -0800 * New upstream release (15.04.0). * New upstream release (15.04.1). * New upstream release (15.04.2). * New upstream release (15.04.3). * Add support for running unit tests. - add xauth and xvfb to Build-Depends. - override_dh_auto_test to manually run ctest because the test kaccounts-testnetattachjobs configures kwallet which opens up a GUI for configuring, and unlocking the wallet. The "cd obj-*" to change to the build directory should be fixed. * Update libkaccounts1.install for new library filename * Add KDE's unstable release url. * New upstream release (15.08.0). * New upstream release (15.08.1). * Add qtdeclarative5-dev to build-dependes * Add myself to uploaders * Add qml-module-org-kde-kaccounts package. * Add libaccounts-qt5-dev, libkf5coreaddons-dev, libsignonq-qt5-dev dependencies to libkaccounts-dev. * Add signon-plugin-password and signon-ui-x11 dependencies to kaccounts-integration. (To match kubuntu) * Add --list-missing to dh_install to make sure everything installed.
-- Diane Trout <diane at debian.org> Sun, 20 Sep 2015 22:21:04 -0700
* New upstream release.
* Add libkf5declarative-dev to Build-Depends.
-- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:16:41 +0100
* New upstream release.
* Change my email address back
* Update symbols file with new symbols.
-- Diane Trout <diane at ghic.org> Fri, 04 Dec 2015 10:55:04 -0800
* New upstream release (15.04.0).
* New upstream release (15.04.1).
* New upstream release (15.04.2).
* New upstream release (15.04.3).
* Add support for running unit tests.
- add xauth and xvfb to Build-Depends.
- override_dh_auto_test to manually run ctest
because the test kaccounts-testnetattachjobs
configures kwallet which opens up a GUI for
configuring, and unlocking the wallet.
The "cd obj-*" to change to the build directory
should be fixed.
* Update libkaccounts1.install for new library filename
* Add KDE's unstable release url.
* New upstream release (15.08.0).
* New upstream release (15.08.1).
* Add qtdeclarative5-dev to build-dependes
* Add myself to uploaders
* Add qml-module-org-kde-kaccounts package.
* Add libaccounts-qt5-dev, libkf5coreaddons-dev, libsignonq-qt5-dev
dependencies to libkaccounts-dev.
* Add signon-plugin-password and signon-ui-x11 dependencies to
kaccounts-integration. (To match kubuntu)
* Add --list-missing to dh_install to make sure everything installed.
-- Diane Trout <diane at debian.org> Sun, 20 Sep 2015 22:21:04 -0700
debian/changelog | 53 ++++++++++++++++++
debian/control | 84 +++++++++++++++--------------
debian/copyright | 10 ++--
debian/libkaccounts-dev.acc.in | 20 +++++++
debian/libkaccounts1.symbols | 9 ++--
debian/qml-module-org-kde-kaccounts.install | 5 ++
debian/rules | 6 ++-
debian/tests/acc | 11 ++++
debian/tests/control | 8 ++-
debian/tests/testsuite.xsession | 12 +++--
10 files changed, 165 insertions(+), 53 deletions(-)
diff --cc debian/changelog
index 10114ca,3628589..e135434
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,60 -1,49 +1,113 @@@
++kaccounts-integration (4:15.12.0-0ubuntu1.1) UNRELEASED; urgency=medium
++
++ * New upstream release.
++ * Debian merge: No remaining changes.
++
++ -- Scarlett Clark <sgclark at kubuntu.org> Thu, 28 Jan 2016 13:44:50 -0800
++
+kaccounts-integration (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Clive Johnston <clivejo at aol.com> Sat, 02 Jan 2016 13:32:35 +0000
+
+ kaccounts-integration (15.12.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Add libkf5declarative-dev to Build-Depends.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:16:41 +0100
+
+ kaccounts-integration (15.08.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Change my email address back
+ * Update symbols file with new symbols.
+
+ -- Diane Trout <diane at ghic.org> Fri, 04 Dec 2015 10:55:04 -0800
+
-kaccounts-integration (15.08.1-1) unstable; urgency=medium
+kaccounts-integration (4:15.08.2-0ubuntu1) wily; urgency=medium
- [ Harald Sitter ]
- * Initial release.
+ * New upstream release
+ * Fix install file.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Wed, 14 Oct 2015 11:53:28 +0100
+
+kaccounts-integration (4:15.08.1-0ubuntu1) wily; urgency=medium
+
+ * New upstream release (15.08.1)
+ -- Clive Johnston <clivejo at aol.com> Tue, 22 Sep 2015 16:13:27 +0100
+
++kaccounts-integration (15.08.1-1) unstable; urgency=medium
+ [ Maximiliano Curia ]
+ * New upstream release (15.04.0).
+ * New upstream release (15.04.1).
+ * New upstream release (15.04.2).
+
+ [ Diane Trout ]
+ * New upstream release (15.04.3).
+ * Add support for running unit tests.
+ - add xauth and xvfb to Build-Depends.
+ - override_dh_auto_test to manually run ctest
+ because the test kaccounts-testnetattachjobs
+ configures kwallet which opens up a GUI for
+ configuring, and unlocking the wallet.
+ The "cd obj-*" to change to the build directory
+ should be fixed.
+ * Update libkaccounts1.install for new library filename
+ * Add KDE's unstable release url.
+ * New upstream release (15.08.0).
+ * New upstream release (15.08.1).
+ * Add qtdeclarative5-dev to build-dependes
+ * Add myself to uploaders
+ * Add qml-module-org-kde-kaccounts package.
+ * Add libaccounts-qt5-dev, libkf5coreaddons-dev, libsignonq-qt5-dev
+ dependencies to libkaccounts-dev.
+ * Add signon-plugin-password and signon-ui-x11 dependencies to
+ kaccounts-integration. (To match kubuntu)
+ * Add --list-missing to dh_install to make sure everything installed.
+
+ -- Diane Trout <diane at debian.org> Sun, 20 Sep 2015 22:21:04 -0700
++
+kaccounts-integration (4:15.08.0-0ubuntu2) wily; urgency=medium
+
+ * Remove akonadi build-dep on advise of upstream author
+ <mck182> the
+ code is so outdated that I don't even believe it works these days
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 10 Sep 2015 14:49:01 +0100
+
+kaccounts-integration (4:15.08.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Clive Johnston <clivejo at aol.com> Wed, 26 Aug 2015 16:59:47 +0100
+
+kaccounts-integration (4:15.07.90-0ubuntu1) wily; urgency=medium
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ [ José Manuel Santamaría Lema ]
+ * Update symbols: mark as optional symbols gone after building with
+ GCC 5
+
+ [ Jonathan Riddell ]
+ * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 18 Aug 2015 09:30:34 +0100
+
+kaccounts-integration (4:15.04.2-0ubuntu1) wily; urgency=medium
+
+ [ Harald Sitter ]
+ * Initial release.
+
+ [ Scarlett Clark ]
+ * New upstream release
+ * Vivid backport
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 10 Jun 2015 19:00:27 +0200
diff --cc debian/qml-module-org-kde-kaccounts.install
index 847becd,4849c4d..5a17a98
--- a/debian/qml-module-org-kde-kaccounts.install
+++ b/debian/qml-module-org-kde-kaccounts.install
@@@ -1,1 -1,2 +1,6 @@@
++<<<<<<< HEAD
+usr/lib/*/qt5/qml/org/kde/kaccounts/*
++=======
+ usr/lib/*/qt5/qml/org/kde/kaccounts/libkaccountsdeclarativeplugin.so
+ usr/lib/*/qt5/qml/org/kde/kaccounts/qmldir
++>>>>>>> master
--
kaccounts-integration packaging
More information about the pkg-kde-commits
mailing list