[ros-navigation-msgs] 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-navigation-msgs.

commit e602a537b7d418e1c001c8fdc56b18fd082ebc98
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Sun Oct 18 15:07:01 2015 +0200

    add python3 support
---
 debian/control                                   |  8 +++---
 debian/patches/packages_xml_remove_unicode.patch | 26 ++++++++++++++++++++
 debian/patches/series                            |  1 +
 debian/python-map-msgs.pyinstall                 |  3 ---
 debian/python-move-base-msgs.pyinstall           |  2 --
 debian/python3-map-msgs.install                  |  1 +
 debian/python3-move-base-msgs.install            |  1 +
 debian/rules                                     | 31 +++++-------------------
 8 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/debian/control b/debian/control
index 8d80f10..9788117 100644
--- a/debian/control
+++ b/debian/control
@@ -17,10 +17,10 @@ Depends: ${misc:Depends}, message-runtime
 Description: C/C++ headers for map-related ROS Messages
  This package contains the generated C++ headers.
 
-Package: python-map-msgs
+Package: python3-map-msgs
 Section: python
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: Python code for map-related ROS Messages,
  This package contains the generated Python package.
 
@@ -37,10 +37,10 @@ Depends: ${misc:Depends}, message-runtime
 Description: C/C++ headers for move-base-related ROS Messages
  This package contains the generated C++ headers.
 
-Package: python-move-base-msgs
+Package: python3-move-base-msgs
 Section: python
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: Python code for move-base-related ROS Messages,
  This package contains the generated Python package.
 
diff --git a/debian/patches/packages_xml_remove_unicode.patch b/debian/patches/packages_xml_remove_unicode.patch
new file mode 100644
index 0000000..c048ad0
--- /dev/null
+++ b/debian/patches/packages_xml_remove_unicode.patch
@@ -0,0 +1,26 @@
+Description: replace unicode "é" with "e" in packages.xml
+ This is necessary until a bug in catkin_pkg/package.py is fixed which is
+ unable to handle non-ascii characters with the following backtrace:
+ .
+    Traceback (most recent call last):
+      File "/usr/share/catkin/cmake/parse_package_xml.py", line 98, in <module>
+        main()
+      File "/usr/share/catkin/cmake/parse_package_xml.py", line 90, in main
+        package = parse_package(args.package_xml)
+      File "/usr/lib/python3/dist-packages/catkin_pkg/package.py", line 370, in parse_package
+        return parse_package_string(f.read(), filename, warnings=warnings)
+      File "/usr/lib/python3.4/encodings/ascii.py", line 26, in decode
+        return codecs.ascii_decode(input, self.errors)[0]
+    UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 183: ordinal not in range(128)
+
+--- a/map_msgs/package.xml
++++ b/map_msgs/package.xml
+@@ -4,7 +4,7 @@
+    <description>
+       This package defines messages commonly used in mapping packages.
+    </description>
+-   <author>Stéphane Magnenat</author>
++   <author>Stephane Magnenat</author>
+    <maintainer email="davidvlu at gmail.com">David V. Lu!!</maintainer>
+    <maintainer email="mferguson at fetchrobotics.com">Michael Ferguson</maintainer>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6e9def9..98be2d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-CMakeLists.txt.patch
+packages_xml_remove_unicode.patch
diff --git a/debian/python-map-msgs.pyinstall b/debian/python-map-msgs.pyinstall
deleted file mode 100644
index 656b975..0000000
--- a/debian/python-map-msgs.pyinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/python2*/*/map_msgs/*.py map_msgs
-debian/tmp/usr/lib/python2*/*/map_msgs/msg/*.py map_msgs.msg
-debian/tmp/usr/lib/python2*/*/map_msgs/srv/*.py map_msgs.srv
diff --git a/debian/python-move-base-msgs.pyinstall b/debian/python-move-base-msgs.pyinstall
deleted file mode 100644
index 15e415c..0000000
--- a/debian/python-move-base-msgs.pyinstall
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/python2*/*/move_base_msgs/*.py move_base_msgs
-debian/tmp/usr/lib/python2*/*/move_base_msgs/msg/*.py move_base_msgs.msg
diff --git a/debian/python3-map-msgs.install b/debian/python3-map-msgs.install
new file mode 100644
index 0000000..ebd9e67
--- /dev/null
+++ b/debian/python3-map-msgs.install
@@ -0,0 +1 @@
+usr/lib/python3*/*/map_msgs
diff --git a/debian/python3-move-base-msgs.install b/debian/python3-move-base-msgs.install
new file mode 100644
index 0000000..127e323
--- /dev/null
+++ b/debian/python3-move-base-msgs.install
@@ -0,0 +1 @@
+usr/lib/python3*/*/move_base_msgs
diff --git a/debian/rules b/debian/rules
index bd3004c..c0b0d42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +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 --buildsystem=cmake --with python2
+	dh $@ --parallel --buildsystem=cmake --with python3
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DPython_ADDITIONAL_VERSIONS=3.4
 
-# 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)
+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-navigation-msgs.git