[SCM] plasma-volume-control packaging branch, kubuntu_wily_archive, updated. ubuntu/4%5.4.2-0ubuntu1-1-ga86f9f2

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-pa.git;a=commitdiff;h=a86f9f2

The following commit has been merged in the kubuntu_wily_archive branch:
commit a86f9f2e5d6366f5425c379a46f117bffa923567
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Oct 19 23:04:18 2015 +0100

    Add kubuntu_install-kconf-update.diff
---
 debian/changelog                                 |  6 +++++
 debian/patches/kubuntu_install-kconf-update.diff | 28 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 800b9ab..cb021da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plasma-pa (4:5.4.2-0ubuntu2) wily; urgency=medium
+
+  * Add kubuntu_install-kconf-update.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Oct 2015 23:01:33 +0100
+
 plasma-pa (4:5.4.2-0ubuntu1) wily; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_install-kconf-update.diff b/debian/patches/kubuntu_install-kconf-update.diff
new file mode 100644
index 0000000..3ec3f1d
--- /dev/null
+++ b/debian/patches/kubuntu_install-kconf-update.diff
@@ -0,0 +1,28 @@
+Description: install kconf_update scripts
+ install the kconf update scripts in the right location for kmix which
+ is kdelibs 4 
+Author: Jonathan Riddell <jr at jriddell.org>
+Origin: vendor
+Forwarded: https://git.reviewboard.kde.org/r/125706/
+Last-Update: 2015-10-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index b652a0f..b7b13e7 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -1,2 +1,14 @@
++# installed twice for kmix builds on kdelibs4 and kf5
++execute_process(COMMAND kde4-config --install data
++                OUTPUT_VARIABLE KDE4_DATA_DIR
++	        OUTPUT_STRIP_TRAILING_WHITESPACE
++	        RESULT_VARIABLE kde4config_failed)
++
++if (kde4config_failed)
++    message(FAILED "Couldn't find kde4-config from kde4libs for kconf_update files")
++else()
++    install(FILES disable_kmix.upd DESTINATION ${KDE4_DATA_DIR}/kconf_update)
++    install(PROGRAMS plasmaVolumeDisableKMixAutostart.pl DESTINATION ${KDE4_DATA_DIR}/kconf_update)
++endif()
+ install(FILES disable_kmix.upd DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kconf_update)
+ install(PROGRAMS plasmaVolumeDisableKMixAutostart.pl DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kconf_update)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..84175e1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_install-kconf-update.diff

-- 
plasma-volume-control packaging