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

[Clive Johnston]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit e5fe876d059d6a4090b30ba56651b5e51b90b52a
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Sep 17 19:59:52 2015 +0100

    Removing patch which is applied upstream
    
    * Removed patches/upstream_fix-kmixui.rc-install-location.diff
    * Removed entry in series file
    * Fixed version typo in changelog
---
 debian/changelog                                   |  3 ++-
 debian/patches/series                              |  1 -
 .../upstream_fix-kmixui.rc-install-location.diff   | 25 ----------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ecad684..ed39463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kmix (4:15.08.1-0ubuntu1) UNRELEASED; urgency=medium
 
-  * New upstream release (15.18.1)
+  * New upstream release (15.08.1)
+  * Removed upstream_fix-kmixui.rc-install-location.diff as applied upstream
 
  -- Clive Johnston <clivejo at aol.com>  Wed, 16 Sep 2015 23:51:32 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 63dba25..061ef34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 kmix_showeverywhere.diff
-upstream_fix-kmixui.rc-install-location.diff
 kubuntu_cmake-policy.diff
diff --git a/debian/patches/upstream_fix-kmixui.rc-install-location.diff b/debian/patches/upstream_fix-kmixui.rc-install-location.diff
deleted file mode 100644
index b2c0a30..0000000
--- a/debian/patches/upstream_fix-kmixui.rc-install-location.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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