[SCM] ktextwidgets packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-10-g1b616cd
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Sat Jul 11 12:57:24 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ktextwidgets.git;a=commitdiff;h=1b616cd
The following commit has been merged in the kubuntu_unstable branch:
commit 1b616cda4a578747fa4fe07a3e2c44f192412bef
Merge: afbeafc66685c21a48890ddbb109cf3f13a9ea54 762ea1aae1e84bd67b929166ffd264ee21df3b7a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Sat Jul 11 05:56:17 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 18 +++++++++++-------
debian/control | 34 +++++++++++++++++-----------------
debian/libkf5textwidgets5.symbols | 5 ++++-
debian/patches/series | 0
4 files changed, 32 insertions(+), 25 deletions(-)
diff --cc debian/changelog
index c9e62b2,47324c1..6ed4388
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,20 +1,21 @@@
-ktextwidgets (5.11.0-1) unstable; urgency=medium
+ktextwidgets (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
- [ Jonathan Riddell ]
-- * Remove old patch Add-missing-license-file-COPYING.LGPL-2.patch
-
- [ Scarlett Clark ]
+ * New upstream release
++ * Fix merge, Remove unused broken backport.
- -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 15 Jun 2015 06:36:01 +0200
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:25:01 -0700
--ktextwidgets (5.10.0-0ubuntu1) wily; urgency=medium
++ktextwidgets (5.11.0-1) unstable; urgency=medium
[ Maximiliano Curia ]
* New upstream release (5.10.0).
+ * New upstream release (5.11.0).
+ * Remove upstream patch: Add-missing-license-file-COPYING.LGPL-2.patch
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Sun, 28 Jun 2015 20:28:41 +0200
+
-ktextwidgets (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
++ktextwidgets (5.10.0-0ubuntu2) wily; urgency=medium
[ Jonathan Riddell ]
* New upstream release
diff --cc debian/control
index 19d93b7,37e9190..68f5c9c
--- a/debian/control
+++ b/debian/control
@@@ -5,17 -5,17 +5,17 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.10.20130309),
debhelper (>= 9),
- extra-cmake-modules (>= 5.10.0),
- libkf5completion-dev (>= 5.12.0),
- libkf5config-dev (>= 5.12.0),
- libkf5configwidgets-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- libkf5iconthemes-dev (>= 5.12.0),
- libkf5itemviews-dev (>= 5.12.0),
- libkf5service-dev (>= 5.12.0),
- libkf5sonnet-dev (>= 5.12.0),
- libkf5widgetsaddons-dev (>= 5.12.0),
- libkf5windowsystem-dev (>= 5.12.0),
- extra-cmake-modules (>= 5.11.0~),
- libkf5completion-dev (>= 5.11.0~),
- libkf5config-dev (>= 5.11.0~),
- libkf5configwidgets-dev (>= 5.11.0~),
- libkf5i18n-dev (>= 5.11.0~),
- libkf5iconthemes-dev (>= 5.11.0~),
- libkf5itemviews-dev (>= 5.7.0),
- libkf5service-dev (>= 5.11.0~),
- libkf5sonnet-dev (>= 5.11.0~),
- libkf5widgetsaddons-dev (>= 5.11.0~),
- libkf5windowsystem-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.10.0~),
++ libkf5completion-dev (>= 5.12.0~),
++ libkf5config-dev (>= 5.12.0~),
++ libkf5configwidgets-dev (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
++ libkf5iconthemes-dev (>= 5.12.0~),
++ libkf5itemviews-dev (>= 5.12.0~),
++ libkf5service-dev (>= 5.12.0~),
++ libkf5sonnet-dev (>= 5.12.0~),
++ libkf5widgetsaddons-dev (>= 5.12.0~),
++ libkf5windowsystem-dev (>= 5.12.0~),
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.4),
xauth,
@@@ -29,13 -29,13 +29,13 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
Package: libkf5textwidgets-dev
Section: libdevel
Architecture: any
- Depends: libkf5completion-dev (>= 5.12.0),
- libkf5configwidgets-dev (>= 5.12.0),
- libkf5iconthemes-dev (>= 5.12.0),
- libkf5service-dev (>= 5.12.0),
- libkf5sonnet-dev (>= 5.12.0),
-Depends: libkf5completion-dev (>= 5.11.0~),
- libkf5configwidgets-dev (>= 5.11.0~),
- libkf5iconthemes-dev (>= 5.11.0~),
- libkf5service-dev (>= 5.11.0~),
- libkf5sonnet-dev (>= 5.11.0~),
++Depends: libkf5completion-dev (>= 5.12.0~),
++ libkf5configwidgets-dev (>= 5.12.0~),
++ libkf5iconthemes-dev (>= 5.12.0~),
++ libkf5service-dev (>= 5.12.0~),
++ libkf5sonnet-dev (>= 5.12.0~),
libkf5textwidgets5 (= ${binary:Version}),
- libkf5windowsystem-dev (>= 5.12.0),
- libkf5windowsystem-dev (>= 5.11.0~),
++ libkf5windowsystem-dev (>= 5.12.0~),
qtbase5-dev (>= 5.4),
${misc:Depends}
Description: development files for ktextwidgets
--
ktextwidgets packaging
More information about the pkg-kde-commits
mailing list