[SCM] KDE Development Platform Libraries module packaging branch, wheezy, updated. debian/4.8.4-4-8-g22b154a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=22b154a

The following commit has been merged in the wheezy branch:
commit 22b154a165d19f0eba8c9e231415f10c6309bdbe
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 4 18:39:57 2012 +0100

    fix installation path of kmailservice/ktelnetservice (#693413)
    
    backport upstream commit b74fb653e50a7ad3772a16162d2a01d2961d4fb7
    adjust kdelibs5-plugins.install
---
 debian/changelog                                   |    4 ++
 debian/kdelibs5-plugins.install                    |    4 +-
 debian/patches/series                              |    1 +
 ...kmailservice-ktelnetservice-in-the-bindir.patch |   38 ++++++++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 499b8ac..454fd8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ kde4libs (4:4.8.4-5) UNRELEASED; urgency=low
     file watching in some occasions; patch
     upstream_Fix-KDirLister-forgetting-to-watch-a-directory-after.patch.
     (Closes: #551910)
+  * Backport upstream commit b74fb653e50a7ad3772a16162d2a01d2961d4fb7 to fix
+    the installation path of kmailservice and ktelnetservice; patch
+    upstream_install-kmailservice-ktelnetservice-in-the-bindir.patch.
+    (Closes: #693413). Adjust debian/kdelibs5-plugins.install accordingly.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Oct 2012 17:04:46 -0300
 
diff --git a/debian/kdelibs5-plugins.install b/debian/kdelibs5-plugins.install
index 7743432..073b718 100644
--- a/debian/kdelibs5-plugins.install
+++ b/debian/kdelibs5-plugins.install
@@ -1,3 +1,5 @@
+usr/bin/kmailservice
+usr/bin/ktelnetservice
 usr/lib/kconf_update_bin/migrate_from_kde3_icon_theme
 usr/lib/kde4/emoticonstheme_adium.so
 usr/lib/kde4/emoticonstheme_kde.so
@@ -29,10 +31,8 @@ usr/lib/kde4/libexec/kconf_update
 usr/lib/kde4/libexec/kio_http_cache_cleaner
 usr/lib/kde4/libexec/kioslave
 usr/lib/kde4/libexec/klauncher
-usr/lib/kde4/libexec/kmailservice
 usr/lib/kde4/libexec/kpac_dhcp_helper
 usr/lib/kde4/libexec/ksendbugmail
-usr/lib/kde4/libexec/ktelnetservice
 usr/lib/kde4/libexec/start_kdeinit
 usr/lib/kde4/libexec/start_kdeinit_wrapper
 usr/lib/kde4/libkhtmlpart.so
diff --git a/debian/patches/series b/debian/patches/series
index 98535f8..4a45fc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ fix-copying-of-files-with-extended-ACLs.patch
 upstream_Fix-parsing-of-the-Keywords-key-in-.desktop-files-no.patch
 upstream_Temp-services-don-t-have-details-so-assume-they-supp.patch
 upstream_Fix-KDirLister-forgetting-to-watch-a-directory-after.patch
+upstream_install-kmailservice-ktelnetservice-in-the-bindir.patch
diff --git a/debian/patches/upstream_install-kmailservice-ktelnetservice-in-the-bindir.patch b/debian/patches/upstream_install-kmailservice-ktelnetservice-in-the-bindir.patch
new file mode 100644
index 0000000..d7be9f2
--- /dev/null
+++ b/debian/patches/upstream_install-kmailservice-ktelnetservice-in-the-bindir.patch
@@ -0,0 +1,38 @@
+From b74fb653e50a7ad3772a16162d2a01d2961d4fb7 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 4 Dec 2012 18:24:40 +0100
+Subject: [PATCH] install kmailservice/ktelnetservice in the bindir
+
+they are invoked by the resp. kmailservice.desktop/ktelnetservice.desktop, which are installed as XDG application files,
+so having them in the kdelibs-specific libexec means that non-KDE applications would fail to invoke them.
+
+ACKed by David Faure
+---
+ kio/misc/CMakeLists.txt |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt
+index b81208e..1489216 100644
+--- a/kio/misc/CMakeLists.txt
++++ b/kio/misc/CMakeLists.txt
+@@ -18,7 +18,7 @@ kde4_add_executable(kmailservice NOGUI ${kmailservice_SRCS})
+ 
+ target_link_libraries(kmailservice  ${KDE4_KDEUI_LIBS})
+ 
+-install(TARGETS kmailservice DESTINATION ${LIBEXEC_INSTALL_DIR})
++install(TARGETS kmailservice ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(PROGRAMS kmailservice.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ 
+ ########### next target ###############
+@@ -30,7 +30,7 @@ kde4_add_executable(ktelnetservice NOGUI ${ktelnetservice_SRCS})
+ 
+ target_link_libraries(ktelnetservice  ${KDE4_KDEUI_LIBS} )
+ 
+-install(TARGETS ktelnetservice DESTINATION ${LIBEXEC_INSTALL_DIR} )
++install(TARGETS ktelnetservice ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(PROGRAMS ktelnetservice.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ 
+ ########### install files ###############
+-- 
+1.7.10.4
+

-- 
KDE Development Platform Libraries module packaging