[SCM] kmix packaging branch, master, updated. debian/14.12.2-1-5-gcb2d180

[Jeremy Lainé]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kmix.git;a=commitdiff;h=cb2d180

The following commit has been merged in the master branch:
commit cb2d180c19257b5fc3d446f082d9911ee712a859
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Tue Jul 14 09:51:47 2015 +0200

    explicitly build against KDE4
---
 debian/changelog | 3 +--
 debian/control   | 7 +------
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49d4e8d..1e86ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,7 @@ kmix (4:15.04.3-1~) UNRELEASED; urgency=medium
 
   [ Jeremy Lainé ]
   * New upstream release (15.04.3).
-  * Build against KF5.
-  * Remove kdelibs5-dev from build dependencies.
+  * Explicitly build against KDE4.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:16:27 +0200
 
diff --git a/debian/control b/debian/control
index 6e28be9..62c7998 100644
--- a/debian/control
+++ b/debian/control
@@ -7,15 +7,10 @@ Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                extra-cmake-modules (>= 0.0.11~),
                kde-sc-dev-latest (>= 4:4.12),
+               kdelibs5-dev,
                libasound2-dev [linux-any],
                libcanberra-dev,
                libglib2.0-dev,
-               libkf5dbusaddons-dev,
-               libkf5globalaccel-dev,
-               libkf5i18n-dev,
-               libkf5kcmutils-dev,
-               libkf5kdelibs4support-dev,
-               libkf5xmlgui-dev,
                libpulse-dev (>= 0.9.16),
                pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.6
diff --git a/debian/rules b/debian/rules
index 0e2ac34..e1cbcf1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,4 +3,4 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DKMIX_KF5_BUILD=1
+	$(overridden_command) -- -DKMIX_KF5_BUILD=0

-- 
kmix packaging