[SCM] kjsembed packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-5-g9cdb36f
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Fri Jul 10 23:48:48 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kjsembed.git;a=commitdiff;h=9cdb36f
The following commit has been merged in the kubuntu_wily_archive branch:
commit 9cdb36f41677d7ec4fe1387ebf2315a54f40caed
Merge: dcb6ee4ff16aeb96846875cd432b356dfb1c250b e1d16d9d1ce70a756542d6dedab23c75cb2a5a56
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Fri Jul 10 16:48:28 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 9 +++++++++
debian/control | 12 ++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --cc debian/changelog
index 8b4d73e,6a9b82c..d0cac5c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
+kjsembed (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
++ * Fix merge, remove unused broken backport.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:16:49 -0700
+
+ kjsembed (5.11.0-1) unstable; urgency=medium
+
+ * New upstream release (5.10.0).
+ * Update symbols files from buildds logs (5.9.0-1).
+ * New upstream release (5.11.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Sun, 28 Jun 2015 15:08:21 +0200
+
kjsembed (5.10.0-0ubuntu1) wily; urgency=medium
[ Maximiliano Curia ]
diff --cc debian/control
index a983bd8,c17042a..a21d019
--- a/debian/control
+++ b/debian/control
@@@ -5,10 -5,10 +5,10 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.11),
debhelper (>= 9),
- extra-cmake-modules (>= 5.10.0),
- kdoctools-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- libkf5kjs-dev (>= 5.12.0),
- extra-cmake-modules (>= 5.11.0~),
- kdoctools-dev (>= 5.11.0~),
- libkf5i18n-dev (>= 5.11.0~),
- libkf5kjs-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.12.0~),
++ kdoctools-dev (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
++ libkf5kjs-dev (>= 5.12.0~),
libqt5svg5-dev (>= 5.4),
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.4),
@@@ -22,9 -22,9 +22,9 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
Package: libkf5jsembed-dev
Section: libdevel
Architecture: any
- Depends: libkf5i18n-dev (>= 5.12.0),
-Depends: libkf5i18n-dev (>= 5.11.0~),
++Depends: libkf5i18n-dev (>= 5.12.0~),
libkf5jsembed5 (= ${binary:Version}),
- libkf5kjs-dev (>= 5.12.0),
- libkf5kjs-dev (>= 5.11.0~),
++ libkf5kjs-dev (>= 5.12.0~),
${misc:Depends},
${shlibs:Depends}
Description: Embedded JS library for Qt
--
kjsembed packaging
More information about the pkg-kde-commits
mailing list