[SCM] frameworkintegration packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-13-ga037151

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Tue Jul 14 21:31:27 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/frameworkintegration.git;a=commitdiff;h=a037151

The following commit has been merged in the kubuntu_wily_archive branch:
commit a03715109b90d9cbfe3fe30c2aacce3f68afe15f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Jul 14 23:30:48 2015 +0200

     Revert "new upstream release"
    
    This reverts commit d7c14f9176c516c79b810313e076eabc788379aa.
---
 debian/changelog |  6 +-----
 debian/control   | 14 +++++++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5d8291..29e2abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,9 @@
 frameworkintegration (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
-  [ Scarlett Clark ]
   * New upstream release
   * Fix merge, remove broken backport.
 
-  [ Jonathan Riddell ]
-  * new upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 14 Jul 2015 22:53:27 +0200
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:53:54 -0700
 
 frameworkintegration (5.11.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index cc12d6c..e920717 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,13 @@ Build-Depends: cmake (>= 2.8.12),
                dbus-x11,
                debhelper (>= 9),
                extra-cmake-modules (>= 5.12.0~),
-               kio-dev (>= 5.12.0),
-               libkf5config-dev (>= 5.12.0),
-               libkf5configwidgets-dev (>= 5.12.0),
-               libkf5i18n-dev (>= 5.12.0),
-               libkf5iconthemes-dev (>= 5.12.0),
-               libkf5notifications-dev (>= 5.12.0),
-               libkf5widgetsaddons-dev (>= 5.12.0),
+               kio-dev (>= 5.12.0~),
+               libkf5config-dev (>= 5.12.0~),
+               libkf5configwidgets-dev (>= 5.12.0~),
+               libkf5i18n-dev (>= 5.12.0~),
+               libkf5iconthemes-dev (>= 5.12.0~),
+               libkf5notifications-dev (>= 5.12.0~),
+               libkf5widgetsaddons-dev (>= 5.12.0~),
                libqt5widgets5,
                libqt5x11extras5-dev (>= 5.4),
                libxcursor-dev,

-- 
frameworkintegration packaging



More information about the pkg-kde-commits mailing list