[SCM] kconfigwidgets packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-14-g51d82cc

[Jonathan Riddell]

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

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

    Revert "new upstream release"
    
    This reverts commit da12484b268663e430a46e21323588410879c948.
---
 debian/changelog |  6 +-----
 debian/control   | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11dea4d..6a9e3ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,9 @@
 kconfigwidgets (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:56:34 +0200
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:00:19 -0700
 
 kconfigwidgets (5.11.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index c2b847b..576a55b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,14 @@ Build-Depends: cmake (>= 2.8.12),
                docbook-xml,
                docbook-xsl,
                extra-cmake-modules (>= 5.12.0~),
-               kdoctools-dev (>= 5.12.0),
-               libkf5auth-dev (>= 5.12.0),
-               libkf5codecs-dev (>= 5.12.0),
-               libkf5config-dev (>= 5.12.0),
-               libkf5coreaddons-dev (>= 5.12.0),
-               libkf5guiaddons-dev (>= 5.12.0),
-               libkf5i18n-dev (>= 5.12.0),
-               libkf5widgetsaddons-dev (>= 5.12.0),
+               kdoctools-dev (>= 5.12.0~),
+               libkf5auth-dev (>= 5.12.0~),
+               libkf5codecs-dev (>= 5.12.0~),
+               libkf5config-dev (>= 5.12.0~),
+               libkf5coreaddons-dev (>= 5.12.0~),
+               libkf5guiaddons-dev (>= 5.12.0~),
+               libkf5i18n-dev (>= 5.12.0~),
+               libkf5widgetsaddons-dev (>= 5.12.0~),
                libxml2-utils,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.4),
@@ -30,13 +30,13 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kconfigwidgets.git
 Package: libkf5configwidgets-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5auth-dev (>= 5.12.0),
-         libkf5codecs-dev (>= 5.12.0),
-         libkf5config-dev (>= 5.12.0),
+Depends: libkf5auth-dev (>= 5.12.0~),
+         libkf5codecs-dev (>= 5.12.0~),
+         libkf5config-dev (>= 5.12.0~),
          libkf5configwidgets5 (= ${binary:Version}),
-         libkf5guiaddons-dev (>= 5.12.0),
-         libkf5i18n-dev (>= 5.12.0),
-         libkf5widgetsaddons-dev (>= 5.12.0),
+         libkf5guiaddons-dev (>= 5.12.0~),
+         libkf5i18n-dev (>= 5.12.0~),
+         libkf5widgetsaddons-dev (>= 5.12.0~),
          ${misc:Depends}
 Description: development files for kconfigwidgets
  KConfigWidgets provides easy-to-use classes to create

-- 
kconfigwidgets packaging