[SCM] kcrash packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-7-gb7c32ed

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b7c32ed90f5fbc70d7ad0ece0a14bab209b12988
Merge: b3e38c4d0b22e4d1cd453a3d4da2496a1e334f32 c79cca391f54ea70f060c530e7113b3d6ca2f001
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 12:19:51 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog |  8 ++++++++
 debian/control   | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 960de1a,759f460..93fff2b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,17 @@@
 -kcrash (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kcrash (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:10:30 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:01:35 -0700
  
+ kcrash (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 27 Jun 2015 11:44:13 +0200
+ 
  kcrash (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index d5ad90a,fe00344..0dba383
--- a/debian/control
+++ b/debian/control
@@@ -5,9 -5,9 +5,9 @@@ 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),
-                libkf5windowsystem-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5windowsystem-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.10.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5windowsystem-dev (>= 5.12.0~),
                 libqt5x11extras5-dev (>= 5.4),
                 libx11-dev,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
@@@ -23,9 -23,9 +23,9 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5crash-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5coreaddons-dev (>= 5.12.0),
 -Depends: libkf5coreaddons-dev (>= 5.11.0~),
++Depends: libkf5coreaddons-dev (>= 5.12.0~),
           libkf5crash5 (= ${binary:Version}),
-          libkf5windowsystem-dev (>= 5.12.0),
 -         libkf5windowsystem-dev (>= 5.11.0~),
++         libkf5windowsystem-dev (>= 5.12.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: Support for application crash analysis and bug report from apps

-- 
kcrash packaging