[SCM] plasma-volume-control packaging branch, kubuntu_stable, updated. ubuntu/4%5.4.2-0ubuntu1-6-gdbd0bbc

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_stable branch:
commit dbd0bbcdafe4b8356aa8175af46540c0ca9fd2ce
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Oct 21 17:05:08 2015 +0100

    remove patch now upstream
---
 debian/patches/kubuntu_install-kconf-update.diff | 28 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 29 deletions(-)

diff --git a/debian/patches/kubuntu_install-kconf-update.diff b/debian/patches/kubuntu_install-kconf-update.diff
deleted file mode 100644
index 3ec3f1d..0000000
--- a/debian/patches/kubuntu_install-kconf-update.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 84175e1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_install-kconf-update.diff

-- 
plasma-volume-control packaging