From c624a676f65be3ab559b82f606e2ed0cc46b3a50 Mon Sep 17 00:00:00 2001 From: Jussi Lind Date: Mon, 22 Nov 2010 15:46:44 +0200 Subject: [PATCH] Changes: Install /usr/bin/applauncherd.launcher to /usr/lib/libapplauncherd.so due to dh_strip problems and because it's not -pie. RevBy: Alexey Shilov --- debian/applauncherd-launcher.install | 2 +- debian/changelog | 7 +++++++ src/launcher/CMakeLists.txt | 2 +- src/launcherlib/CMakeLists.txt | 5 +++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/applauncherd-launcher.install b/debian/applauncherd-launcher.install index 303c2be..e06d25f 100644 --- a/debian/applauncherd-launcher.install +++ b/debian/applauncherd-launcher.install @@ -1,4 +1,4 @@ usr/bin/applauncherd.bin -usr/bin/applauncherd.launch +usr/lib/libapplauncherd.so usr/bin/applauncherd diff --git a/debian/changelog b/debian/changelog index d9b8a80..ae3c357 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +applauncherd (0.15.2) unstable; urgency=low + + * Changes: Install /usr/bin/applauncherd.launcher to /usr/lib/libapplauncherd.so + due to dh_strip problems and because it's not -pie. + + -- Jussi Lind Mon, 22 Nov 2010 15:32:17 +0200 + applauncherd (0.15.1) stable; urgency=low * Changes: Added the "startup time from application grid" test diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt index 8bfc1a4..b08d8e6 100644 --- a/src/launcher/CMakeLists.txt +++ b/src/launcher/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wall -O2 -std=c99") # Set precompiler flags add_definitions(-DLIBRARIES_CONFIG_FILE="/etc/applauncherd.conf") -add_definitions(-DLAUNCHER_LIBRARY="/usr/bin/applauncherd.launch") +add_definitions(-DLAUNCHER_LIBRARY="/usr/lib/libapplauncherd.so") link_libraries(${LIBDL}) diff --git a/src/launcherlib/CMakeLists.txt b/src/launcherlib/CMakeLists.txt index 805118e..ea5f03c 100644 --- a/src/launcherlib/CMakeLists.txt +++ b/src/launcherlib/CMakeLists.txt @@ -22,8 +22,9 @@ endif(WRT_FOUND) link_libraries(${MEEGOTOUCH_LIBRARIES} ${LIBDL} ${QT_QTCORE_LIBRARY} ${WRT_LIBRARIES}) # Set executable -add_library(launcher MODULE ${SRC} ${MOC_SRC}) +add_library(applauncherd MODULE ${SRC} ${MOC_SRC}) # Add install rule -install(FILES liblauncher.so DESTINATION /usr/bin/ RENAME applauncherd.launch) +#install(FILES liblauncher.so DESTINATION /usr/bin/ RENAME applauncherd.launch) +install(FILES libapplauncherd.so DESTINATION /usr/lib)