[SCM] kauth packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-5-gefe8210

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Fri Jul 10 18:12:50 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit efe8210081e5d6dbd732fdf97c767609842e4a4b
Merge: 69c98ec35f06d98ee7cc83cbe8a818f6bc5a2f51 75b22d898a1e7dd45cbfbf39b7faa405d34a0839
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 11:12:13 2015 -0700

    Fix merge.

 debian/changelog                  |  9 +++++
 debian/control                    | 25 ++++++++++--
 debian/copyright                  | 80 +++++++++++++++++++++------------------
 debian/libkf5auth-bin-dev.install |  1 +
 debian/libkf5auth-dev.install     |  1 -
 5 files changed, 74 insertions(+), 42 deletions(-)

diff --cc debian/changelog
index 2b933aa,20cb928..cd7b731
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,18 @@@
 -kauth (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kauth (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 -  * Vivid backport
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:05:02 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:56:36 -0700
  
+ kauth (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+   * Revert the -dev package to MA same.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 27 Jun 2015 12:58:58 +0200
+ 
  kauth (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index c36ff13,e9b40fd..5cdbdda
--- a/debian/control
+++ b/debian/control
@@@ -5,8 -5,8 +5,8 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                libkf5coreaddons-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
                 libpolkit-qt5-1-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
@@@ -22,8 -22,10 +22,10 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5auth-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5auth5 (= ${binary:Version}),
-          libkf5coreaddons-dev (>= 5.12.0),
+ Multi-Arch: same
+ Depends: libkf5auth-bin-dev ( = ${binary:Version}),
+          libkf5auth5 (= ${binary:Version}),
 -         libkf5coreaddons-dev (>= 5.11.0~),
++         libkf5coreaddons-dev (>= 5.12.0~),
           ${misc:Depends},
           ${shlibs:Depends}
  Description: Abstraction to system policy and authentication features

-- 
kauth packaging



More information about the pkg-kde-commits mailing list