[SCM] kxmlgui packaging branch, master, updated. debian/5.37.0-2-80-g7782462

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit bd46998cd197caccbafdc51a39ba5e1a8c8b2b96
Merge: 6c1d985ad5751cbcf975d1c2a4851000faaa742d 4674713fd05dca9f744aad81275671d70444b270
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Jul 11 06:52:12 2015 -0700

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

 debian/changelog |  8 +++++++-
 debian/control   | 38 +++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index f0c175c,f72efa4..e3b5f9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,11 @@@
 +kxmlgui (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:28:30 -0700
 +
- kxmlgui (5.10.0-0ubuntu1) wily; urgency=medium
+ kxmlgui (5.11.0-1) unstable; urgency=medium
  
    [ Maximiliano Curia ]
    * New upstream release (5.10.0).
diff --cc debian/control
index 76fa3e7,b9e6346..1e46edc
--- a/debian/control
+++ b/debian/control
@@@ -5,17 -5,17 +5,17 @@@ 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),
-                libkf5attica-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5configwidgets-dev (>= 5.12.0),
-                libkf5globalaccel-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5itemviews-dev (>= 5.12.0),
-                libkf5textwidgets-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
-                libkf5windowsystem-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5attica-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5configwidgets-dev (>= 5.11.0~),
 -               libkf5globalaccel-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5itemviews-dev (>= 5.11.0~),
 -               libkf5textwidgets-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
 -               libkf5windowsystem-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5attica-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5configwidgets-dev (>= 5.12.0~),
++               libkf5globalaccel-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5itemviews-dev (>= 5.12.0~),
++               libkf5textwidgets-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5windowsystem-dev (>= 5.12.0~),
                 libqt5x11extras5-dev (>= 5.4),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
@@@ -28,14 -28,14 +28,14 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5xmlgui-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5attica-dev (>= 5.12.0),
-          libkf5config-dev (>= 5.12.0),
-          libkf5configwidgets-dev (>= 5.12.0),
-          libkf5globalaccel-dev (>= 5.12.0),
-          libkf5iconthemes-dev (>= 5.12.0),
-          libkf5itemviews-dev (>= 5.12.0),
-          libkf5textwidgets-dev (>= 5.12.0),
-          libkf5windowsystem-dev (>= 5.12.0),
 -Depends: libkf5attica-dev (>= 5.11.0~),
 -         libkf5config-dev (>= 5.11.0~),
 -         libkf5configwidgets-dev (>= 5.11.0~),
 -         libkf5globalaccel-dev (>= 5.11.0~),
 -         libkf5iconthemes-dev (>= 5.11.0~),
 -         libkf5itemviews-dev (>= 5.11.0~),
 -         libkf5textwidgets-dev (>= 5.11.0~),
 -         libkf5windowsystem-dev (>= 5.11.0~),
++Depends: libkf5attica-dev (>= 5.12.0~),
++         libkf5config-dev (>= 5.12.0~),
++         libkf5configwidgets-dev (>= 5.12.0~),
++         libkf5globalaccel-dev (>= 5.12.0~),
++         libkf5iconthemes-dev (>= 5.12.0~),
++         libkf5itemviews-dev (>= 5.12.0~),
++         libkf5textwidgets-dev (>= 5.12.0~),
++         libkf5windowsystem-dev (>= 5.12.0~),
           libkf5xmlgui5 (= ${binary:Version}),
           qtbase5-dev (>= 5.4),
           ${misc:Depends},

-- 
kxmlgui packaging