[ros-nodelet-core] 01/01: add python3 support

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch python3
in repository ros-nodelet-core.

commit 6608940dcc27f47d9e4ac3ceaae14b64dcde9a16
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Sun Oct 18 14:59:22 2015 +0200

    add python3 support
---
 debian/control                              | 12 +++++------
 debian/patches/Python3-support.patch        |  8 +++++++
 debian/patches/series                       |  1 +
 debian/python-nodelet-topic-tools.pyinstall |  2 --
 debian/python-nodelet.pyinstall             |  2 --
 debian/python3-nodelet-topic-tools.install  |  1 +
 debian/python3-nodelet.install              |  1 +
 debian/rules                                | 33 +++++------------------------
 8 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index 3bf329f..33a98fe 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends: debhelper (>= 9), catkin, libbondcpp-dev, cmake-modules,
 		libsmc-dev, message-generation, pluginlib-dev,
 		libclass-loader-dev, libroslib-dev,
 		libdynamic-reconfigure-dev, libboost-thread-dev,
-		libboost-dev, dh-python, python-dev, uuid-dev, python-nose, libroscpp-msgs-dev,
-		python-dynamic-reconfigure, python-roslib, dh-exec (>=0.3)
+		libboost-dev, dh-python, python3-dev, uuid-dev, python3-nose, libroscpp-msgs-dev,
+		python3-dynamic-reconfigure, python3-roslib, dh-exec (>=0.3)
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://wiki.ros.org/nodelet_core
@@ -32,10 +32,10 @@ Description: ROS nodelet library - service header files
  .
  This package contains the development files for the service.
 
-Package: python-nodelet
+Package: python3-nodelet
 Section: python
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: ROS nodelet library - service files - Python
  The nodelet package is designed to provide a way to run multiple algorithms in
  the same process with zero copy transport between algorithms.
@@ -95,10 +95,10 @@ Description: ROS nodelet_topic_tools library - development files
  .
  This package contains the development files for the service.
 
-Package: python-nodelet-topic-tools
+Package: python3-nodelet-topic-tools
 Section: python
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: ROS nodelet_topic_tools library - service files
  The nodelet package is designed to provide a way to run multiple algorithms in
  the same process with zero copy transport between algorithms.
diff --git a/debian/patches/Python3-support.patch b/debian/patches/Python3-support.patch
new file mode 100644
index 0000000..b5746e8
--- /dev/null
+++ b/debian/patches/Python3-support.patch
@@ -0,0 +1,8 @@
+--- a/nodelet_topic_tools/cfg/NodeletThrottle.cfg
++++ b/nodelet_topic_tools/cfg/NodeletThrottle.cfg
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python3
+ 
+ from dynamic_reconfigure.parameter_generator_catkin import *
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c0916ef..3a98664 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
+Python3-support.patch
diff --git a/debian/python-nodelet-topic-tools.pyinstall b/debian/python-nodelet-topic-tools.pyinstall
deleted file mode 100644
index 25c2ca0..0000000
--- a/debian/python-nodelet-topic-tools.pyinstall
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/python2*/*/nodelet_topic_tools/*.py nodelet_topic_tools
-debian/tmp/usr/lib/python2*/*/nodelet_topic_tools/cfg/*.py nodelet_topic_tools.cfg
diff --git a/debian/python-nodelet.pyinstall b/debian/python-nodelet.pyinstall
deleted file mode 100644
index 3664c60..0000000
--- a/debian/python-nodelet.pyinstall
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/python2*/*/nodelet/*.py nodelet
-debian/tmp/usr/lib/python2*/*/nodelet/srv/*.py nodelet.srv
diff --git a/debian/python3-nodelet-topic-tools.install b/debian/python3-nodelet-topic-tools.install
new file mode 100644
index 0000000..40e2141
--- /dev/null
+++ b/debian/python3-nodelet-topic-tools.install
@@ -0,0 +1 @@
+usr/lib/python3*/*/nodelet_topic_tools
diff --git a/debian/python3-nodelet.install b/debian/python3-nodelet.install
new file mode 100644
index 0000000..5a4ac99
--- /dev/null
+++ b/debian/python3-nodelet.install
@@ -0,0 +1 @@
+usr/lib/python3*/*/nodelet
diff --git a/debian/rules b/debian/rules
index e48a70f..0d7d9b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,9 @@
 #!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
-
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
-# main packaging script based on dh7 syntax
 %:
-	dh $@ --parallel --with=python2 --buildsystem=cmake
-
-# debmake generated override targets
-# This is example for Cmake (See http://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
-
+	dh $@ --parallel --with=python3 --buildsystem=cmake
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DPython_ADDITIONAL_VERSIONS=3.4
 
+get-orig-source:
+	uscan --verbose --force-download --repack --compress xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-nodelet-core.git