diff --git a/debian/control b/debian/control index 2ed43b2..46e607f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: applauncherd Section: admin Priority: important Maintainer: Jussi Lind -Build-Depends: cmake (>= 2.6.0), debhelper (>= 7), libqt4-dev (>= 4.5.0), libmeegotouch-dev, libcreds2-dev [arm armel], aegis-builder (>= 1.4) [arm armel], libxtst-dev, libxext-dev, libxi-dev, doxygen, python(>= 2.6), libsaveas, libmeegocontrol0, libduicontrolpanel, libxcomposite-dev, libresource0, libqt4-dev, liblocationextras, libmessagingif0, libsignon-qt0, libcontactswidgets-dev, sensord, libc6, libiphb0, libsignon-ui0, libdatepicker2, libxrandr-dev, liblocationpicker +Build-Depends: cmake (>= 2.6.0), debhelper (>= 7), libqt4-dev (>= 4.5.0), libmeegotouch-dev, libcreds2-dev [arm armel], aegis-builder (>= 1.4) [arm armel], libxtst-dev, libxext-dev, libxi-dev, doxygen, python (>= 2.6), python (<< 2.7), libsaveas, libmeegocontrol0, libduicontrolpanel, libxcomposite-dev, libresource0, libqt4-dev, liblocationextras, libmessagingif0, libsignon-qt0, libcontactswidgets-dev, sensord, libc6, libiphb0, libsignon-ui0, libdatepicker2, libxrandr-dev, liblocationpicker Standards-Version: 3.8.0 Package: applauncherd diff --git a/scripts/library-helper.py b/scripts/library-helper.py index 466e87f..d5a5855 100755 --- a/scripts/library-helper.py +++ b/scripts/library-helper.py @@ -15,7 +15,8 @@ real_build_deps = set(['cmake (>= 2.6.0)', 'libxext-dev', 'libxi-dev', 'doxygen', - 'python']) + 'python (>= 2.6)', + 'python (<< 2.7)']) # Real runtime dependencies for applauncherd-launcher, you may need to update these as well real_runtime_deps = set(['${shlibs:Depends}', diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt index 8ed60a8..bfe7541 100644 --- a/src/launcher/CMakeLists.txt +++ b/src/launcher/CMakeLists.txt @@ -1,14 +1,14 @@ # Generate list of libraries for preload.h add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/preload-h-libraries.h - COMMAND python ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py --preload-h-libraries + COMMAND python2.6 ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py --preload-h-libraries DEPENDS ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py ) # Generate linker command line fragment add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/additional-linked-libraries.ld - COMMAND python ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py --linker-flags + COMMAND python2.6 ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py --linker-flags DEPENDS ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py )