[SCM] kcoreaddons packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-4-gda1a01d
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Wed May 20 00:00:39 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=d1a8197
The following commit has been merged in the kubuntu_unstable branch:
commit d1a8197f4492845faedf25eb15d70adfc0623c3d
Merge: b6642c23b3661e4b82b117eb9d40a33046c9011e 2f8b217ffbc61d378d91325ff2d6accdfed56b28
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Feb 27 23:49:00 2015 +0100
Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
Conflicts:
debian/control
debian/copyright
debian/libkf5coreaddons-dev.install
debian/libkf5coreaddons5.symbols
debian/changelog | 46 +++++++++++++++++++++++++++
debian/copyright | 2 +-
debian/libkf5coreaddons-dev.lintian-overrides | 1 +
debian/libkf5coreaddons5.symbols | 4 +++
debian/meta/cmake-ignore | 1 +
debian/patches/disable-failing-test.diff | 13 --------
debian/patches/series | 0
7 files changed, 53 insertions(+), 14 deletions(-)
diff --cc debian/changelog
index 61cb3b8,bf4deb5..bd75aed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,49 +1,74 @@@
+kcoreaddons (5.7.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.7.0).
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 24 Feb 2015 17:38:06 +0100
+
+ kcoreaddons (5.7.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Harald Sitter <sitter at kde.org> Tue, 10 Feb 2015 16:54:12 +0100
+
+kcoreaddons (5.6.0-1) experimental; urgency=medium
+
+ [ Harald Sitter ]
+ * Fix a typo in -data description.
+ * Do not build depend on qt5-default, we use qtbase5-dev instead.
+
+ [ Maximiliano Curia ]
+ * New upstream release (5.6.0).
+ * Update build dependencies to experimental versions.
+ * Bump Standards-Version to 3.9.6, no changes needed
+ * Update build dependencies to follow cmake.
+ * Fix dependencies.
+ * Update copyright information.
+ * Add basic autopkgtests support.
+ * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 21 Jan 2015 23:04:24 +0100
+
+ kcoreaddons (5.6.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 06 Jan 2015 20:14:40 +0100
+
+ kcoreaddons (5.5.0-0ubuntu1) vivid; urgency=medium
+
+ [ Jonathan Riddell ]
+ * Remove unused FAM build-dep, we use inotify
+ * Remove unused patch disable-failing-test.diff
+
+ [ Scarlett Clark ]
+ * Add -data as a depend to parent package.
+ * wrap-and-sort
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 15 Dec 2014 12:16:26 +0100
+
+ kcoreaddons (5.4.0-0ubuntu1) vivid; urgency=medium
+
+ [ Scarlett Clark ]
+ * Add new build dependency FAM
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 07 Nov 2014 15:15:54 +0100
+
+ kcoreaddons (5.3.0-0ubuntu1) utopic; urgency=medium
+
+ [ Harald Sitter ]
+ * Fix a typo in -data description.
+ * Do not build depend on qt5-default, we use qtbase5-dev instead.
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 07 Oct 2014 11:28:23 +0100
+
kcoreaddons (5.2.0-0ubuntu1) utopic; urgency=medium
* New upstream release
diff --cc debian/copyright
index 18df47f,0c77d0f..93db974
--- a/debian/copyright
+++ b/debian/copyright
@@@ -268,24 -147,30 +268,24 @@@ License: LGPL-2
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
.
- On Debian systems, the complete text of the
- GNU Lesser General Public License version 2.1 can be found in
- /usr/share/common-licenses/LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License version 2.1 as published
+ by the Free Software Foundation.
.
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
.
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library. If not, see <http://www.gnu.org/licenses/>
.
- On Debian systems, the complete text of the
- GNU Lesser General Public License version 2.1 can be found in
- /usr/share/common-licenses/LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General Public License
- version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1
++ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
--
kcoreaddons packaging
More information about the pkg-kde-commits
mailing list