[SCM] khtml packaging branch, kubuntu_unstable, updated. ubuntu/5.14.0-0ubuntu1-1-g64e5c22
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Tue Sep 29 23:51:27 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=64e5c22
The following commit has been merged in the kubuntu_unstable branch:
commit 64e5c22ba123aed45d0bd1edd1f591482f193072
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Tue Sep 29 16:50:47 2015 -0700
Vivid backport
---
debian/changelog | 6 ++++++
debian/control | 56 ++++++++++++++++++++++++++++----------------------------
2 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1dd17a3..7db96cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+khtml (5.14.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * Vivid backport
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 29 Sep 2015 16:50:47 -0700
+
khtml (5.14.0-0ubuntu1) wily; urgency=medium
* new upstream release
diff --git a/debian/control b/debian/control
index d302ab7..1b69457 100644
--- a/debian/control
+++ b/debian/control
@@ -5,24 +5,24 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
- extra-cmake-modules (>= 5.14.0~),
- kio-dev (>= 5.14.0~),
+ extra-cmake-modules (>= 5.14.0),
+ kio-dev (>= 5.14.0),
libgif-dev,
libjpeg-dev,
- libkf5archive-dev (>= 5.14.0~),
- libkf5codecs-dev (>= 5.14.0~),
- libkf5globalaccel-dev (>= 5.14.0~),
- libkf5i18n-dev (>= 5.14.0~),
- libkf5iconthemes-dev (>= 5.14.0~),
- libkf5kjs-dev (>= 5.14.0~),
- libkf5notifications-dev (>= 5.14.0~),
- libkf5parts-dev (>= 5.14.0~),
- libkf5sonnet-dev (>= 5.14.0~),
- libkf5textwidgets-dev (>= 5.14.0~),
- libkf5wallet-dev (>= 5.14.0~),
- libkf5widgetsaddons-dev (>= 5.14.0~),
- libkf5windowsystem-dev (>= 5.14.0~),
- libkf5xmlgui-dev (>= 5.14.0~),
+ libkf5archive-dev (>= 5.14.0),
+ libkf5codecs-dev (>= 5.14.0),
+ libkf5globalaccel-dev (>= 5.14.0),
+ libkf5i18n-dev (>= 5.14.0),
+ libkf5iconthemes-dev (>= 5.14.0),
+ libkf5kjs-dev (>= 5.14.0),
+ libkf5notifications-dev (>= 5.14.0),
+ libkf5parts-dev (>= 5.14.0),
+ libkf5sonnet-dev (>= 5.14.0),
+ libkf5textwidgets-dev (>= 5.14.0),
+ libkf5wallet-dev (>= 5.14.0),
+ libkf5widgetsaddons-dev (>= 5.14.0),
+ libkf5windowsystem-dev (>= 5.14.0),
+ libkf5xmlgui-dev (>= 5.14.0),
libphonon4qt5-dev (>= 4:4.6.0),
libphonon4qt5experimental-dev (>= 4:4.6.0),
libpng12-dev,
@@ -41,19 +41,19 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/khtml.git
Package: libkf5khtml-dev
Section: libdevel
Architecture: any
-Depends: kio-dev (>= 5.14.0~),
- libkf5archive-dev (>= 5.14.0~),
- libkf5globalaccel-dev (>= 5.14.0~),
- libkf5i18n-dev (>= 5.14.0~),
- libkf5iconthemes-dev (>= 5.14.0~),
+Depends: kio-dev (>= 5.14.0),
+ libkf5archive-dev (>= 5.14.0),
+ libkf5globalaccel-dev (>= 5.14.0),
+ libkf5i18n-dev (>= 5.14.0),
+ libkf5iconthemes-dev (>= 5.14.0),
libkf5khtml5 (= ${binary:Version}),
- libkf5kjs-dev (>= 5.14.0~),
- libkf5notifications-dev (>= 5.14.0~),
- libkf5parts-dev (>= 5.14.0~),
- libkf5sonnet-dev (>= 5.14.0~),
- libkf5wallet-dev (>= 5.14.0~),
- libkf5widgetsaddons-dev (>= 5.14.0~),
- libkf5windowsystem-dev (>= 5.14.0~),
+ libkf5kjs-dev (>= 5.14.0),
+ libkf5notifications-dev (>= 5.14.0),
+ libkf5parts-dev (>= 5.14.0),
+ libkf5sonnet-dev (>= 5.14.0),
+ libkf5wallet-dev (>= 5.14.0),
+ libkf5widgetsaddons-dev (>= 5.14.0),
+ libkf5windowsystem-dev (>= 5.14.0),
qtbase5-dev (>= 5.4),
${misc:Depends}
Description: HTML widget and component
--
khtml packaging
More information about the pkg-kde-commits
mailing list