r45621 - in /packages/morse/trunk/debian: changelog control morse-simulator.install patches/fix-ftbfs-python-3.3.patch python3-morse-simulator.install rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Mon Mar 4 17:21:33 UTC 2013
Author: sylvestre
Date: Mon Mar 4 17:21:32 2013
New Revision: 45621
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45621
Log:
* 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.
Added:
packages/morse/trunk/debian/patches/fix-ftbfs-python-3.3.patch
Modified:
packages/morse/trunk/debian/changelog
packages/morse/trunk/debian/control
packages/morse/trunk/debian/morse-simulator.install
packages/morse/trunk/debian/python3-morse-simulator.install
packages/morse/trunk/debian/rules
Modified: packages/morse/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/changelog?rev=45621&op=diff
==============================================================================
--- packages/morse/trunk/debian/changelog (original)
+++ packages/morse/trunk/debian/changelog Mon Mar 4 17:21:32 2013
@@ -1,3 +1,13 @@
+morse-simulator (1.0.0-1~exp2) experimental; urgency=low
+
+ [ Dmitrijs Ledkov ]
+ * 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.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 04 Mar 2013 18:02:01 +0100
+
morse-simulator (1.0.0-1~exp1) experimental; urgency=low
* New upstream release
Modified: packages/morse/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/control?rev=45621&op=diff
==============================================================================
--- packages/morse/trunk/debian/control (original)
+++ packages/morse/trunk/debian/control Mon Mar 4 17:21:32 2013
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Séverin Lemaignan <severin at 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 +14,7 @@
Package: morse-simulator
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, blender (>= 2.59),
- ${python:Depends}, python3.2, morse-simulator-data
+ ${python3:Depends}, morse-simulator-data
Recommends: morse-simulator-doc
Conflicts: morse
Description: Multi-OpenRobot Simulation Engine
@@ -95,7 +95,7 @@
Package: python3-morse-simulator
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- ${python:Depends}, morse-simulator-data
+ ${python3:Depends}, morse-simulator-data
Conflicts: morse
Description: Multi-OpenRobot Simulation Engine
List of morse features:
Modified: packages/morse/trunk/debian/morse-simulator.install
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/morse-simulator.install?rev=45621&op=diff
==============================================================================
--- packages/morse/trunk/debian/morse-simulator.install (original)
+++ packages/morse/trunk/debian/morse-simulator.install Mon Mar 4 17:21:32 2013
@@ -1,2 +1,1 @@
debian/tmp/usr/bin/
-
Added: packages/morse/trunk/debian/patches/fix-ftbfs-python-3.3.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/patches/fix-ftbfs-python-3.3.patch?rev=45621&op=file
==============================================================================
--- packages/morse/trunk/debian/patches/fix-ftbfs-python-3.3.patch (added)
+++ packages/morse/trunk/debian/patches/fix-ftbfs-python-3.3.patch Mon Mar 4 17:21:32 2013
@@ -1,0 +1,120 @@
+Description: use pkg-config to find python3 includes
+Author: Dmitrijs Ledkovs <dmitrij.ledkov at 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 "")
Modified: packages/morse/trunk/debian/python3-morse-simulator.install
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/python3-morse-simulator.install?rev=45621&op=diff
==============================================================================
--- packages/morse/trunk/debian/python3-morse-simulator.install (original)
+++ packages/morse/trunk/debian/python3-morse-simulator.install Mon Mar 4 17:21:32 2013
@@ -1,1 +1,1 @@
-usr/lib/python3/dist-packages/morse/
+debian/tmp/usr/lib
Modified: packages/morse/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/morse/trunk/debian/rules?rev=45621&op=diff
==============================================================================
--- packages/morse/trunk/debian/rules (original)
+++ packages/morse/trunk/debian/rules Mon Mar 4 17:21:32 2013
@@ -5,7 +5,7 @@
#export DH_VERBOSE=1
%:
- dh $@
+ dh $@ --with python3
override_dh_auto_configure:
dh_auto_configure -- -DBUILD_DOC_SUPPORT=OFF
@@ -15,4 +15,3 @@
rm -fr $$(find $(CURDIR) -name '__pycache__')
override_dh_auto_test:
-
More information about the debian-science-commits
mailing list