Package: morse-simulator Severity: normal Version: 0.6~alpha-1~exp1 User: debian-pyt...@lists.debian.org Usertags: python3.3 Tags: patch
Morse-simulator does not build against the default python3 version. Also it will fail to build from source against python3.3, as in debian it has multiple include locations. There are many ways to fix this. One way is to apply the attached patch.
diff -Nru morse-simulator-0.6~alpha/debian/changelog morse-simulator-0.6~alpha/debian/changelog --- morse-simulator-0.6~alpha/debian/changelog 2012-09-10 14:50:55.000000000 +0000 +++ morse-simulator-0.6~alpha/debian/changelog 2012-10-25 17:01:04.000000000 +0000 @@ -1,3 +1,12 @@ +morse-simulator (0.6~alpha-1~exp1.1) UNRELEASED; urgency=low + + * Build against python3-dev instead of python3.2-dev. + * Call dh_python3. + * Use python3:Depends, instead of python:Depends. + * Use pkg-config to find python includes. + + -- Dmitrijs Ledkovs <dmitrij.led...@ubuntu.com> Thu, 25 Oct 2012 12:51:23 +0100 + morse-simulator (0.6~alpha-1~exp1) experimental; urgency=low * New upstream release (Fix problem with blender 2.65) diff -Nru morse-simulator-0.6~alpha/debian/control morse-simulator-0.6~alpha/debian/control --- morse-simulator-0.6~alpha/debian/control 2012-06-24 14:26:40.000000000 +0000 +++ morse-simulator-0.6~alpha/debian/control 2012-10-25 11:52:30.000000000 +0000 @@ -1,9 +1,9 @@ Maintainer: Debian Science Team <debian-science-maintain...@lists.alioth.debian.org> Uploaders: Sylvestre Ledru <sylves...@debian.org>, Séverin Lemaignan <seve...@guakamole.org> -Build-Depends: debhelper (>= 8.0.0), cmake, python3.2, python3.2-dev, +Build-Depends: debhelper (>= 8.0.0), cmake, python3-dev, python3-sphinx, pkg-config Standards-Version: 3.9.3 Homepage: http://morse.openrobots.org/ @@ -14,7 +15,7 @@ Package: morse-simulator Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, blender (>= 2.59), - ${python:Depends}, morse-simulator-data + ${python3:Depends}, morse-simulator-data Recommends: morse-simulator-doc Conflicts: morse Description: Multi-OpenRobot Simulation Engine diff -Nru morse-simulator-0.6~alpha/debian/patches/fix-ftbfs-python-3.3.patch morse-simulator-0.6~alpha/debian/patches/fix-ftbfs-python-3.3.patch --- morse-simulator-0.6~alpha/debian/patches/fix-ftbfs-python-3.3.patch 1970-01-01 00:00:00.000000000 +0000 +++ morse-simulator-0.6~alpha/debian/patches/fix-ftbfs-python-3.3.patch 2012-10-25 16:47:22.000000000 +0000 @@ -0,0 +1,120 @@ +Description: use pkg-config to find python3 includes +Author: Dmitrijs Ledkovs <dmitrij.led...@ubuntu.com> +Forwarded: no +Last-Update: 2012-10-25 + +Index: b/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,17 +17,17 @@ + + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/config/) + find_package(PkgConfig REQUIRED) ++set(PythonInterp_FIND_VERSION 3.0) ++find_package(PythonInterp REQUIRED) + +-find_package(Python32Interp REQUIRED) +- +-if (NOT PYTHON3INTERP_FOUND) ++if (NOT PYTHONINTERP_FOUND) + MESSAGE(FATAL_ERROR "Can't find python 3.2 on your system") +-endif(NOT PYTHON3INTERP_FOUND) ++endif(NOT PYTHONINTERP_FOUND) + +-find_package(Python32Libs REQUIRED) ++pkg_check_modules(PYTHON3 python3) + + EXECUTE_PROCESS(COMMAND +- ${PYTHON3_EXECUTABLE} -c "import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_lib(1,0,\"\"))" ++ ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_lib(1,0,\"\"))" + OUTPUT_VARIABLE PYTHON_INSTALL + ERROR_VARIABLE PYTHON_STDERR + RESULT_VARIABLE PYTHON_ERR +@@ -50,11 +50,11 @@ + + if (BUILD_YARP2_SUPPORT) + EXECUTE_PROCESS(COMMAND +- ${PYTHON3_EXECUTABLE} -c "import yarp;" ++ ${PYTHON_EXECUTABLE} -c "import yarp;" + RESULT_VARIABLE YARP_PY_ERR + ) + if (YARP_PY_ERR) +- MESSAGE(FATAL_ERROR "BUILD_YARP_SUPPORT is required, but '${PYTHON3_EXECUTABLE}' can't find yarp python binding") ++ MESSAGE(FATAL_ERROR "BUILD_YARP_SUPPORT is required, but '${PYTHON_EXECUTABLE}' can't find yarp python binding") + endif (YARP_PY_ERR) + endif(BUILD_YARP2_SUPPORT) + +@@ -62,12 +62,12 @@ + # check to make sure pymoos is installed + if (BUILD_MOOS_SUPPORT) + EXECUTE_PROCESS(COMMAND +- ${PYTHON3_EXECUTABLE} -c "import pymoos.MOOSCommClient;" ++ ${PYTHON_EXECUTABLE} -c "import pymoos.MOOSCommClient;" + RESULT_VARIABLE MOOS_PY_ERR + ) + if (MOOS_PY_ERR) + #message(${MOOS_PY_ERR}) +- #MESSAGE(FATAL_ERROR "BUILD_MOOS_SUPPORT is required, but '${PYTHON3_EXECUTABLE}' can't find MOOS python binding") ++ #MESSAGE(FATAL_ERROR "BUILD_MOOS_SUPPORT is required, but '${PYTHON_EXECUTABLE}' can't find MOOS python binding") + endif (MOOS_PY_ERR) + endif(BUILD_MOOS_SUPPORT) + +@@ -79,11 +79,11 @@ + + if (BUILD_HLA_SUPPORT) + EXECUTE_PROCESS(COMMAND +- ${PYTHON3_EXECUTABLE} -c "import hla;" ++ ${PYTHON_EXECUTABLE} -c "import hla;" + RESULT_VARIABLE HLA_PY_ERR + ) + if (HLA_PY_ERR) +- MESSAGE(FATAL_ERROR "BUILD_HLA_SUPPORT is required, but '${PYTHON3_EXECUTABLE}' can't find 'hla' python binding") ++ MESSAGE(FATAL_ERROR "BUILD_HLA_SUPPORT is required, but '${PYTHON_EXECUTABLE}' can't find 'hla' python binding") + endif (HLA_PY_ERR) + endif(BUILD_HLA_SUPPORT) + +@@ -137,7 +137,7 @@ + + ###### Testing ###### + EXECUTE_PROCESS(COMMAND +- ${PYTHON3_EXECUTABLE} -c "import pymorse" ++ ${PYTHON_EXECUTABLE} -c "import pymorse" + RESULT_VARIABLE PYTHON_ERR + OUTPUT_QUIET + ERROR_QUIET +Index: b/src/morse/middleware/pocolibs/CMakeLists.txt +=================================================================== +--- a/src/morse/middleware/pocolibs/CMakeLists.txt ++++ b/src/morse/middleware/pocolibs/CMakeLists.txt +@@ -6,7 +6,7 @@ + ## It generates _ors_<module_name>_poster.so, ors_<module_name>_poster.py, and + ## we wait for <module_name>.py in the (sensor|actuator) directory) + +-include_directories(${PYTHON3_INCLUDE_DIR}) ++include_directories(${PYTHON3_INCLUDE_DIRS}) + include_directories(${POCOLIBS_INCLUDE_DIRS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + +Index: b/src/morse/modifiers/CMakeLists.txt +=================================================================== +--- a/src/morse/modifiers/CMakeLists.txt ++++ b/src/morse/modifiers/CMakeLists.txt +@@ -1,5 +1,5 @@ + # build and install C modifiers +-INCLUDE_DIRECTORIES(${PYTHON3_INCLUDE_DIR}) ++INCLUDE_DIRECTORIES(${PYTHON3_INCLUDE_DIRS}) + + ADD_LIBRARY (gaussian SHARED gaussian.c) + SET_TARGET_PROPERTIES (gaussian PROPERTIES PREFIX "") +Index: b/src/morse/sensors/CMakeLists.txt +=================================================================== +--- a/src/morse/sensors/CMakeLists.txt ++++ b/src/morse/sensors/CMakeLists.txt +@@ -1,5 +1,5 @@ + # build and install C sensors +-INCLUDE_DIRECTORIES(${PYTHON3_INCLUDE_DIR}) ++INCLUDE_DIRECTORIES(${PYTHON3_INCLUDE_DIRS}) + + #ADD_LIBRARY (sickc SHARED sickcmodule.c) + #SET_TARGET_PROPERTIES (sickc PROPERTIES PREFIX "") diff -Nru morse-simulator-0.6~alpha/debian/patches/series morse-simulator-0.6~alpha/debian/patches/series --- morse-simulator-0.6~alpha/debian/patches/series 2012-09-10 14:51:13.000000000 +0000 +++ morse-simulator-0.6~alpha/debian/patches/series 2012-10-25 12:31:16.000000000 +0000 @@ -0,0 +1 @@ +fix-ftbfs-python-3.3.patch diff -Nru morse-simulator-0.6~alpha/debian/rules morse-simulator-0.6~alpha/debian/rules --- morse-simulator-0.6~alpha/debian/rules 2012-09-10 21:37:46.000000000 +0000 +++ morse-simulator-0.6~alpha/debian/rules 2012-10-25 11:51:00.000000000 +0000 @@ -10,7 +10,7 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --with python3 # --builddirectory=build override_dh_auto_configure:
Regards, Dmitrijs.
