[SCM] kmix packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.08.0-0ubuntu1-1-g5e409d9

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 5e409d9064e29ceb1ff2e3d8b9d46c4694490574
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Aug 26 21:06:24 2015 +0100

    Add upstream_fix-kmixui.rc-install-location.diff
---
 debian/changelog                                   |  6 ++++++
 debian/patches/series                              |  1 +
 .../upstream_fix-kmixui.rc-install-location.diff   | 25 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9ad7283..729613c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kmix (4:15.08.0-0ubuntu2) wily; urgency=medium
+
+  * Add upstream_fix-kmixui.rc-install-location.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 26 Aug 2015 21:06:13 +0100
+
 kmix (4:15.08.0-0ubuntu1) wily; urgency=medium
 
   * new upstream release
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