diff --git a/debian/applauncherd-launcher.install b/debian/applauncherd-launcher.install index e06d25f..d1d7276 100644 --- a/debian/applauncherd-launcher.install +++ b/debian/applauncherd-launcher.install @@ -1,4 +1,4 @@ usr/bin/applauncherd.bin -usr/lib/libapplauncherd.so +usr/lib/applauncherd/libapplauncherd.so usr/bin/applauncherd diff --git a/debian/changelog b/debian/changelog index 0740c04..457e695 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +applauncherd (0.15.7) unstable; urgency=low + + * Changes: Install libapplauncherd.so to /usr/lib/applauncherd/libapplauncherd.so + + -- Jussi Lind Fri, 03 Dec 2010 11:21:06 +0200 + applauncherd (0.15.6) stable; urgency=low * Changes: Added the windowid binary to be used in startup tests diff --git a/meego/0.15.7/create-tarball.sh b/meego/0.15.7/create-tarball.sh new file mode 100644 index 0000000..69cbb18 --- /dev/null +++ b/meego/0.15.7/create-tarball.sh @@ -0,0 +1,9 @@ +#!/bin/sh +if test -n "$1" +then + git archive --format tar --remote=$1 --output=meegotouch-applauncherd-0.15.7.tar --prefix meegotouch-applauncherd-0.15.7/ released/0.15.7 + bzip2 meegotouch-applauncherd-0.15.7.tar +else + echo "Usage: create-tarball.sh " + echo " where is suitable for git archive --remote=" +fi diff --git a/meego/0.15.7/meegotouch-applauncherd.changes b/meego/0.15.7/meegotouch-applauncherd.changes new file mode 100644 index 0000000..815737b --- /dev/null +++ b/meego/0.15.7/meegotouch-applauncherd.changes @@ -0,0 +1,34 @@ +* Fri Dec 3 2010 Jussi Lind - 0.15.7 +- Changes: Install libapplauncherd.so to /usr/lib/applauncherd/libapplauncherd.so + +* Fri Nov 30 2010 Nimika Keshri - 0.15.5 +- BCM#10591 - meegotouch-applauncherd outdated in MeeGo +- Changes: A bit confusing Booster::readCommand() renamed to + Booster::receiveDataFromInvoker(). +- Changes: Access Booster::m_connection and Booster::m_appData through setter + /getter in derived classes. +- Changes: License plates added to some test apps. +- Changes: Default C-flags added to top-level CMakeLists. +- Changes: Launcher library exports only main() +- Changes: Install /usr/bin/applauncherd.launcher to /usr/lib/libapplauncherd.so + due to dh_strip problems and because it's not -pie. +- Changes: Basic implementation of library-based launcher +- Changes: no-wait option for invoker is added +- Changes: invoker - launcher protocol simplification +- Changes: use at() instead of [] operator to read-only access to vector elements +- Changes: use RTLD_LOCAL flag instead of RTLD_GLOBAL in dlopen() to load application binary +- Changes: remove -rdynamic linker parameter +- Changes: acceptConn() => accept(), closeConn() => close(), socket pool is cleared on closeAllSockets() +- Changes: Preloaded libraries are loaded with dlopen() (preload.h) + +* Thu Sep 2 2010 Pertti Kellomäki - 0.12.1 +- Updated to version 0.12.1. +- Packaged tests and test scripts as subpackages, reorganized testing + stuff to satisfy rpmlint. +- Included a .desktop file which kicks off applauncherd in a UI session. + +* Wed Aug 25 2010 Pertti Kellomäki - 0.10.3 +- Updated to version 0.10.3. + +* Wed Jul 14 2010 Pertti Kellomäki - 0.8.0 +- Initial packaging. diff --git a/meego/0.15.7/meegotouch-applauncherd.spec b/meego/0.15.7/meegotouch-applauncherd.spec new file mode 100644 index 0000000..7e09097 --- /dev/null +++ b/meego/0.15.7/meegotouch-applauncherd.spec @@ -0,0 +1,207 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.21 +# +# >> macros +# << macros + +Name: meegotouch-applauncherd +Summary: Application launcher for fast startup +Version: 0.15.7 +Release: 1 +Group: System/Daemons +License: LGPLv2+ +URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd +Source0: %{name}-%{version}.tar.bz2 +Source100: meegotouch-applauncherd.yaml +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(meegotouch) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(xextproto) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xext) +BuildRequires: cmake + + +%description +Application invoker and launcher daemon that speed up +application startup time. + + + +%package devel +Summary: Development files for launchable applications +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description devel +Development files for creating applications that can be launched +using meegotouch-applauncherd. + + +%package testapps +Summary: Test applications for launchable applications +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description testapps +Test applications used for testing meegotouch-applauncherd. + + +%package tests +Summary: Test scripts for launchable applications +Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Requires: %{name}-testapps = %{version}-%{release} +BuildRequires: desktop-file-utils + +%description tests +Test scripts used for testing meegotouch-applauncherd. + + + +%prep +%setup -q -n %{name}-%{version} + +# >> setup +# << setup + +%build +# >> build pre +export BUILD_TESTS=1 +export MEEGO=1 +unset LD_AS_NEEDED +# << build pre + +%configure --disable-static +make %{?jobs:-j%jobs} + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install + +# >> install post +# rpmlint complains about installing binaries in /usr/share, so +# move them elsewhere and leave a symlink in place. +mv %{buildroot}/usr/share/applauncherd-tests %{buildroot}/usr/lib +(cd %{buildroot}/usr/share; ln -s ../lib/applauncherd-tests) +# << install post + + + + + + + + + + + + + + + +%files +%defattr(-,root,root,-) +%{_bindir}/invoker +%{_libdir}/libapplauncherd/libapplauncherd.so +%{_bindir}/applauncherd.bin +%{_bindir}/applauncherd +%config %{_sysconfdir}/xdg/autostart/applauncherd.desktop +# >> files +# << files + + +%files devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/meegotouch-boostable.pc +%{_libdir}/pkgconfig/qt-boostable.pc +%doc %{_docdir}/applauncherd/README +%{_datadir}/qt4/mkspecs/features/meegotouch-boostable.prf +%{_datadir}/qt4/mkspecs/features/qt-boostable.prf +# >> files devel +# << files devel + +%files testapps +%defattr(-,root,root,-) +%{_bindir}/fala_ft_hello +%{_bindir}/fala_gettime_ms +%{_bindir}/fala_pixelchanged +%{_bindir}/fala_wl +%{_bindir}/fala_wl.launch +%{_bindir}/fala_wol +%{_bindir}/fala_wol.sh +%{_bindir}/fala_gettime +%{_bindir}/fala_status.launch +%{_bindir}/fala_ft_hello1 +%{_bindir}/fala_ft_hello2 +%{_bindir}/fala_ft_hello.launch +%{_bindir}/fala_ft_hello1.launch +%{_bindir}/fala_ft_hello2.launch +%{_bindir}/fala_testapp +%{_bindir}/fala_ft_themetest.launch +%{_bindir}/fala_ft_themetest +%{_bindir}/fala_windowid +%{_datadir}/themes/base/meegotouch/fala_ft_themetest/svg/baa.svg +%{_datadir}/dbus-1/services/com.nokia.fala_testapp.service +# >> files testapps +# << files testapps + +%files tests +%defattr(-,root,root,-) +%{_datadir}/applauncherd-M-art-tests/tests.xml +%{_datadir}/applauncherd-M-bug-tests/tests.xml +%{_datadir}/applauncherd-M-functional-tests/tests.xml +%{_datadir}/applauncherd-M-performance-tests/tests.xml +%{_datadir}/applauncherd-tests +%{_libdir}/applauncherd-tests/tests.xml +%{_libdir}/applauncherd-tests/ut_booster +%{_libdir}/applauncherd-tests/ut_connection +%{_libdir}/applauncherd-tests/ut_daemon +%{_libdir}/applauncherd-tests/ut_mbooster +%{_libdir}/applauncherd-tests/ut_qtbooster +%{_libdir}/applauncherd-tests/ut_boosterfactory +%{_libdir}/applauncherd-tests/ut_wrtbooster +%{_datadir}/applauncherd-M-testscripts/check_pipes.py +%exclude %{_datadir}/applauncherd-M-testscripts/check_pipes.pyc +%exclude %{_datadir}/applauncherd-M-testscripts/check_pipes.pyo +%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.py +%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.pyc +%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.pyo +%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.sh +%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.py +%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.pyc +%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.pyo +%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.sh +%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.py +%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.pyc +%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.pyo +%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.sh +%{_datadir}/applauncherd-M-testscripts/tc_theming.rb +%{_datadir}/applauncherd-M-testscripts/test-func-launcher.py +%exclude %{_datadir}/applauncherd-M-testscripts/test-func-launcher.pyc +%exclude %{_datadir}/applauncherd-M-testscripts/test-func-launcher.pyo +%{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.py +%exclude %{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.pyc +%exclude %{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.pyo +%{_datadir}/applauncherd-M-testscripts/ts_prestartapp.rb +%{_datadir}/applauncherd-M-testscripts/fala_wid +%{_datadir}/applauncherd-M-testscripts/fala_xres_wl +%{_datadir}/applauncherd-M-testscripts/fala_xres_wol +%{_datadir}/applauncherd-M-testscripts/test-perf.rb +%{_datadir}/applauncherd-M-testscripts/utils.py +%exclude %{_datadir}/applauncherd-M-testscripts/utils.pyc +%exclude %{_datadir}/applauncherd-M-testscripts/utils.pyo +%{_datadir}/themes/base/meegotouch/fala_ft_themetest/style/fala_ft_themetest.css +%{_datadir}/applications/fala_wl.desktop +%{_datadir}/applications/fala_wol.desktop +%{_datadir}/dbus-1/services/com.nokia.fala_wl.service +%{_datadir}/dbus-1/services/com.nokia.fala_wol.service +# >> files tests +# << files tests + diff --git a/meego/0.15.7/meegotouch-applauncherd.yaml b/meego/0.15.7/meegotouch-applauncherd.yaml new file mode 100644 index 0000000..d92d4a9 --- /dev/null +++ b/meego/0.15.7/meegotouch-applauncherd.yaml @@ -0,0 +1,127 @@ +Name: meegotouch-applauncherd +Summary: Application launcher for fast startup +Version: 0.15.7 +Release: 1 +Group: System/Daemons +License: LGPLv2+ +URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd +Sources: + - "%{name}-%{version}.tar.bz2" +Patches: +Description: | + Application invoker and launcher daemon that speed up + application startup time. +PkgConfigBR: + - QtCore + - meegotouch + - x11 + - xtst + - xextproto + - xi + - xext +PkgBR: + - cmake +Builder: make +SubPackages: + - Name: devel + Group: Development/Tools + Summary: Development files for launchable applications + Description: | + Development files for creating applications that can be launched + using meegotouch-applauncherd. + Files: + - "%{_libdir}/pkgconfig/meegotouch-boostable.pc" + - "%{_libdir}/pkgconfig/qt-boostable.pc" + - "%doc %{_docdir}/applauncherd/README" + - "%{_datadir}/qt4/mkspecs/features/meegotouch-boostable.prf" + - "%{_datadir}/qt4/mkspecs/features/qt-boostable.prf" + + - Name: testapps + Group: Development/Tools + Summary: Test applications for launchable applications + Description: | + Test applications used for testing meegotouch-applauncherd. + Files: + - "%{_bindir}/fala_ft_hello" + - "%{_bindir}/fala_gettime_ms" + - "%{_bindir}/fala_pixelchanged" + - "%{_bindir}/fala_wl" + - "%{_bindir}/fala_wl.launch" + - "%{_bindir}/fala_wol" + - "%{_bindir}/fala_wol.sh" + - "%{_bindir}/fala_gettime" + - "%{_bindir}/fala_status.launch" + - "%{_bindir}/fala_ft_hello1" + - "%{_bindir}/fala_ft_hello2" + - "%{_bindir}/fala_ft_hello.launch" + - "%{_bindir}/fala_ft_hello1.launch" + - "%{_bindir}/fala_ft_hello2.launch" + - "%{_bindir}/fala_testapp" + - "%{_bindir}/fala_ft_themetest.launch" + - "%{_bindir}/fala_ft_themetest" + - "%{_bindir}/fala_windowid" + - "%{_datadir}/themes/base/meegotouch/fala_ft_themetest/svg/baa.svg" + - "%{_datadir}/dbus-1/services/com.nokia.fala_testapp.service" + + - Name: tests + Group: Development/Tools + Summary: Test scripts for launchable applications + Description: | + Test scripts used for testing meegotouch-applauncherd. + Requires: "%{name}-testapps = %{version}-%{release}" + Files: + - "%{_datadir}/applauncherd-M-art-tests/tests.xml" + - "%{_datadir}/applauncherd-M-bug-tests/tests.xml" + - "%{_datadir}/applauncherd-M-functional-tests/tests.xml" + - "%{_datadir}/applauncherd-M-performance-tests/tests.xml" + - "%{_datadir}/applauncherd-tests" + - "%{_libdir}/applauncherd-tests/tests.xml" + - "%{_libdir}/applauncherd-tests/ut_booster" + - "%{_libdir}/applauncherd-tests/ut_connection" + - "%{_libdir}/applauncherd-tests/ut_daemon" + - "%{_libdir}/applauncherd-tests/ut_mbooster" + - "%{_libdir}/applauncherd-tests/ut_qtbooster" + - "%{_libdir}/applauncherd-tests/ut_boosterfactory" + - "%{_libdir}/applauncherd-tests/ut_wrtbooster" + - "%{_datadir}/applauncherd-M-testscripts/check_pipes.py" + - "%exclude %{_datadir}/applauncherd-M-testscripts/check_pipes.pyc" + - "%exclude %{_datadir}/applauncherd-M-testscripts/check_pipes.pyo" + - "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.py" + - "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.pyc" + - "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.pyo" + - "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.sh" + - "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.py" + - "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.pyc" + - "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.pyo" + - "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.sh" + - "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.py" + - "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.pyc" + - "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.pyo" + - "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.sh" + - "%{_datadir}/applauncherd-M-testscripts/tc_theming.rb" + - "%{_datadir}/applauncherd-M-testscripts/test-func-launcher.py" + - "%exclude %{_datadir}/applauncherd-M-testscripts/test-func-launcher.pyc" + - "%exclude %{_datadir}/applauncherd-M-testscripts/test-func-launcher.pyo" + - "%{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.py" + - "%exclude %{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.pyc" + - "%exclude %{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.pyo" + - "%{_datadir}/applauncherd-M-testscripts/ts_prestartapp.rb" + - "%{_datadir}/applauncherd-M-testscripts/fala_wid" + - "%{_datadir}/applauncherd-M-testscripts/fala_xres_wl" + - "%{_datadir}/applauncherd-M-testscripts/fala_xres_wol" + - "%{_datadir}/applauncherd-M-testscripts/test-perf.rb" + - "%{_datadir}/applauncherd-M-testscripts/utils.py" + - "%exclude %{_datadir}/applauncherd-M-testscripts/utils.pyc" + - "%exclude %{_datadir}/applauncherd-M-testscripts/utils.pyo" + - "%{_datadir}/themes/base/meegotouch/fala_ft_themetest/style/fala_ft_themetest.css" + - "%{_datadir}/applications/fala_wl.desktop" + - "%{_datadir}/applications/fala_wol.desktop" + - "%{_datadir}/dbus-1/services/com.nokia.fala_wl.service" + - "%{_datadir}/dbus-1/services/com.nokia.fala_wol.service" +Files: + - "%{_bindir}/invoker" + - "%{_libdir}/libapplauncherd/libapplauncherd.so" + - "%{_bindir}/applauncherd.bin" + - "%{_bindir}/applauncherd" + - "%config %{_sysconfdir}/xdg/autostart/applauncherd.desktop" + diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt index 14c9c6d..30f9f50 100644 --- a/src/launcher/CMakeLists.txt +++ b/src/launcher/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") # Set precompiler flags add_definitions(-DLIBRARIES_CONFIG_FILE="/etc/applauncherd.conf") -add_definitions(-DLAUNCHER_LIBRARY="/usr/lib/libapplauncherd.so") +add_definitions(-DLAUNCHER_LIBRARY="/usr/lib/applauncherd/libapplauncherd.so") link_libraries(${LIBDL}) diff --git a/src/launcherlib/CMakeLists.txt b/src/launcherlib/CMakeLists.txt index 6b75fa6..cd12baa 100644 --- a/src/launcherlib/CMakeLists.txt +++ b/src/launcherlib/CMakeLists.txt @@ -28,6 +28,5 @@ link_libraries(${MEEGOTOUCH_LIBRARIES} ${LIBDL} ${QT_QTCORE_LIBRARY} ${WRT_LIBRA add_library(applauncherd MODULE ${SRC} ${MOC_SRC}) # Add install rule -#install(FILES liblauncher.so DESTINATION /usr/bin/ RENAME applauncherd.launch) -install(FILES libapplauncherd.so DESTINATION /usr/lib) +install(FILES libapplauncherd.so DESTINATION /usr/lib/applauncherd/)