[SCM] kmix packaging branch, master, updated. debian/15.04.3-1-2-gbb21983

[Jeremy Lainé]

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

The following commit has been merged in the master branch:
commit bb219837b511933947f21ef909b79738c3ea7073
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Thu Sep 3 20:10:33 2015 +0200

    New upstream release (15.08.0)
---
 debian/changelog                                   |  8 +++++++
 debian/control                                     |  2 +-
 debian/patches/series                              |  1 +
 .../upstream_fix-kmixui.rc-install-location.diff   | 25 ++++++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ba32979..376b8ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kmix (4:15.08.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release (15.08.0).
+  * Add upstream_fix-kmixui.rc-install-location.diff (from Ubuntu).
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 04 Sep 2015 00:52:39 +0200
+
 kmix (4:15.04.3-1) unstable; urgency=medium
 
   [ Maximiliano Curia ]
diff --git a/debian/control b/debian/control
index bfd8c27..577d7d6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Pino Toscano <pino at debian.org>,
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
+               kdelibs5-dev (>= 4:4.14),
                libasound2-dev [linux-any],
                libcanberra-dev,
                libglib2.0-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 2f3c3f9..a2e2551 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kmix_showeverywhere.diff
+upstream_fix-kmixui.rc-install-location.diff
diff --git a/debian/patches/upstream_fix-kmixui.rc-install-location.diff b/debian/patches/upstream_fix-kmixui.rc-install-location.diff
new file mode 100644
index 0000000..b2c0a30
--- /dev/null
+++ b/debian/patches/upstream_fix-kmixui.rc-install-location.diff
@@ -0,0 +1,25 @@
+commit 30054aabbf94f526a3162e12bee0bcd9dc41d204
+Author: Michael Pyne <mpyne at kde.org>
+Date:   Sat Aug 8 23:17:00 2015 -0400
+
+    Refix the kmixui_rc install path.
+    
+    I suppose this might break KF5 but it looks like that's still broken
+    anyways.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 128d2ac..01afa4a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -387,9 +387,9 @@ install( PROGRAMS apps/kmixremote DESTINATION ${BIN_INSTALL_DIR} )
+ install( FILES restore_kmix_volumes.desktop  DESTINATION ${AUTOSTART_INSTALL_DIR})
+ install( FILES kmix_autostart.desktop  DESTINATION ${AUTOSTART_INSTALL_DIR})
+ if (KMIX_KF5_BUILD)
+-   install( FILES kmixui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kmix )
+-else()
+    install( FILES kmixui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/kmix)
++else()
++   install( FILES kmixui.rc  DESTINATION  ${DATA_INSTALL_DIR}/kmix )
+ endif()
+ install( FILES kmixctrl_restore.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+ install( FILES dbus/org.kde.kmix.control.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )

-- 
kmix packaging