[SCM] kbookmarks packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-11-g52acf0f

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


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

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

    Revert "new upstream release"
    
    This reverts commit 379de6a01fd2237089770b77be01bc2bef4a7984.
---
 debian/changelog |  6 +-----
 debian/control   | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94e4f48..27b5b35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,9 @@
 kbookmarks (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
-  [ Scarlett Clark ]
   * New upstream release
   * Fix merge, remove unused broken backport.
 
-  [ Jonathan Riddell ]
-  * new upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 14 Jul 2015 22:54:46 +0200
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:57:16 -0700
 
 kbookmarks (5.11.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index bf79510..943acc5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,14 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.12.0~),
-               libkf5codecs-dev (>= 5.12.0),
-               libkf5config-dev (>= 5.12.0),
-               libkf5configwidgets-dev (>= 5.12.0),
-               libkf5coreaddons-dev (>= 5.12.0),
-               libkf5iconthemes-dev (>= 5.12.0),
-               libkf5widgetsaddons-dev (>= 5.12.0),
-               libkf5windowsystem-dev (>= 5.12.0),
-               libkf5xmlgui-dev (>= 5.12.0),
+               libkf5codecs-dev (>= 5.12.0~),
+               libkf5config-dev (>= 5.12.0~),
+               libkf5configwidgets-dev (>= 5.12.0~),
+               libkf5coreaddons-dev (>= 5.12.0~),
+               libkf5iconthemes-dev (>= 5.12.0~),
+               libkf5widgetsaddons-dev (>= 5.12.0~),
+               libkf5windowsystem-dev (>= 5.12.0~),
+               libkf5xmlgui-dev (>= 5.12.0~),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.4),
                qttools5-dev (>= 5.4),
@@ -30,9 +30,9 @@ Package: libkf5bookmarks-dev
 Section: libdevel
 Architecture: any
 Depends: libkf5bookmarks5 (= ${binary:Version}),
-         libkf5configwidgets-dev (>= 5.12.0),
-         libkf5iconthemes-dev (>= 5.12.0),
-         libkf5xmlgui-dev (>= 5.12.0),
+         libkf5configwidgets-dev (>= 5.12.0~),
+         libkf5iconthemes-dev (>= 5.12.0~),
+         libkf5xmlgui-dev (>= 5.12.0~),
          qtbase5-dev (>= 5.4),
          ${misc:Depends}
 Description: Qt library with support for bookmarks and the XBEL format.

-- 
kbookmarks packaging



More information about the pkg-kde-commits mailing list