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

Johannes Schauer josch at moszumanska.debian.org
Mon Oct 26 13:57:32 UTC 2015 

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

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

commit fd9cf9661d042af7ddd6ab3b1e2d88c3fcb68400
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Sun Oct 18 10:56:47 2015 +0200

    add python3 support
---
 debian/control                                     | 42 +++++++++++-----------
 debian/python-rosboost-cfg.install                 |  1 -
 debian/python-rosboost-cfg.pyinstall               |  1 -
 debian/python-rosclean.pyinstall                   |  1 -
 debian/python-roscreate.pyinstall                  |  1 -
 debian/python-roslib.install                       |  1 -
 debian/python-roslib.pyinstall                     |  1 -
 debian/python-rosmake.install                      |  1 -
 debian/python-rosmake.pyinstall                    |  1 -
 debian/python-rosunit.pyinstall                    |  1 -
 debian/python3-rosboost-cfg.install                |  2 ++
 ...n-rosclean.install => python3-rosclean.install} |  1 +
 ...roscreate.install => python3-roscreate.install} |  1 +
 debian/python3-roslib.install                      |  2 ++
 debian/python3-rosmake.install                     |  2 ++
 ...hon-rosunit.install => python3-rosunit.install} |  1 +
 debian/rules                                       |  8 ++++-
 17 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/debian/control b/debian/control
index 502faff..560a093 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
 Section: libs
 Priority: extra
 Build-Depends: debhelper (>= 9),
-	       python,
+	       python3,
 	       catkin,
          librospack-dev,
          libboost-program-options-dev,
@@ -14,8 +14,8 @@ Build-Depends: debhelper (>= 9),
          libboost-thread-dev,
          libgtest-dev,
          libtinyxml-dev,
-         python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3),
-         libpython-dev
+         python3-all (>= 2.6.6-3), python3-setuptools (>= 0.6b3),
+         libpython3-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ros/ros-ros.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/ros-ros.git
@@ -35,7 +35,7 @@ Description: rosmake mk files
 Package: rosbuild
 Section: devel
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python
+Depends: ${misc:Depends}, ${python3:Depends}, python3
 Multi-Arch: foreign
 Description: scripts for managing the ROS build system
  Rosbuild solves the core problem of gathering appropriate build flags
@@ -77,11 +77,11 @@ Description: library for roslib
  .
  This package contains the library.
 
-Package: python-roslib
+Package: python3-roslib
 Section: python
 Architecture: all
 Multi-Arch: allowed
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-rospkg, catkin
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-rospkg, catkin
 Description: Python library for roslib
  Base dependencies and support libraries for ROS. roslib contains many of
  the common data structures and tools that are shared across ROS client
@@ -103,35 +103,35 @@ Description: Assorted shell commands for using ROS with bash
  these shells, though much of the functionality is similar to the 
  bash shell extensions. 
 
-Package: python-rosboost-cfg
+Package: python3-rosboost-cfg
 Section: python
 Architecture: all
 Multi-Arch: allowed
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python3:Provides}
 Description: Contains scripts used by the rosboost-cfg tool 
  It used for determining cflags/lflags/etc. of boost on your system
  when you use is a ROS environtment. ROS is a meta-operating system for your
  robot.  It provides language-independent and network-transparent 
  communication for a distributed robot control system.
 
-Package: python-rosclean
+Package: python3-rosclean
 Section: python
 Architecture: all
 Multi-Arch: allowed
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python3:Provides}
 Description: cleanup filesystem resources (e.g. log files)
  rosclean purge will remove directories associated with storing ROS-related
  log files. You will be asked to confirm each deletion and it is important
  that you verify the command that rosclean purge executes is correct.
 
-Package: python-roscreate
+Package: python3-roscreate
 Section: python
 Architecture: all
 Multi-Arch: allowed
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python3:Provides}
 Description: Tool that assists in the creation of ROS filesystem resources
  It provides: roscreate-pkg, which creates a new package directory, including
  the appropriate build and manifest files.  It creates a new ROS package with
@@ -139,23 +139,23 @@ Description: Tool that assists in the creation of ROS filesystem resources
  Makefile. It addresses the common problem of packages being created using
  pre-existing packages, which leads to errors in build files and manifests.
 
-Package: python-rosmake
+Package: python3-rosmake
 Section: python
 Architecture: all
 Multi-Arch: allowed
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python3:Provides}
 Description: rosmake is a ros dependency aware build tool
  Tool to assist with building ROS packages. It facilitates
  building packages that have dependencie, which can be used to build 
  all dependencies in the correct order.
 
-Package: python-rosunit
+Package: python3-rosunit
 Section: python
 Architecture: all
 Multi-Arch: allowed
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python3:Provides}
 Description: Unit-testing package for ROS
  This is a lower-level library for rostest and handles unit tests, whereas
  rostest handles integration tests. It's an internal tool for running unit 
diff --git a/debian/python-rosboost-cfg.install b/debian/python-rosboost-cfg.install
deleted file mode 100644
index 96858d1..0000000
--- a/debian/python-rosboost-cfg.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/rosboost-cfg
diff --git a/debian/python-rosboost-cfg.pyinstall b/debian/python-rosboost-cfg.pyinstall
deleted file mode 100644
index 70a6433..0000000
--- a/debian/python-rosboost-cfg.pyinstall
+++ /dev/null
@@ -1 +0,0 @@
-tools/rosboost_cfg/src/rosboost_cfg/*.py rosboost_cfg
diff --git a/debian/python-rosclean.pyinstall b/debian/python-rosclean.pyinstall
deleted file mode 100644
index 9284d2a..0000000
--- a/debian/python-rosclean.pyinstall
+++ /dev/null
@@ -1 +0,0 @@
-tools/rosclean/src/rosclean/*.py rosclean
diff --git a/debian/python-roscreate.pyinstall b/debian/python-roscreate.pyinstall
deleted file mode 100644
index 4f98e69..0000000
--- a/debian/python-roscreate.pyinstall
+++ /dev/null
@@ -1 +0,0 @@
-tools/roscreate/src/roscreate/*.py roscreate
diff --git a/debian/python-roslib.install b/debian/python-roslib.install
deleted file mode 100644
index daf65b9..0000000
--- a/debian/python-roslib.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/roslib/gendeps
diff --git a/debian/python-roslib.pyinstall b/debian/python-roslib.pyinstall
deleted file mode 100644
index c58e61f..0000000
--- a/debian/python-roslib.pyinstall
+++ /dev/null
@@ -1 +0,0 @@
-core/roslib/src/roslib/*.py roslib
diff --git a/debian/python-rosmake.install b/debian/python-rosmake.install
deleted file mode 100644
index 0b87ed7..0000000
--- a/debian/python-rosmake.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/rosmake
diff --git a/debian/python-rosmake.pyinstall b/debian/python-rosmake.pyinstall
deleted file mode 100644
index 9bbedd1..0000000
--- a/debian/python-rosmake.pyinstall
+++ /dev/null
@@ -1 +0,0 @@
-tools/rosmake/src/rosmake/*.py rosmake
diff --git a/debian/python-rosunit.pyinstall b/debian/python-rosunit.pyinstall
deleted file mode 100644
index 7e12bf1..0000000
--- a/debian/python-rosunit.pyinstall
+++ /dev/null
@@ -1 +0,0 @@
-tools/rosunit/src/rosunit/*.py rosunit
diff --git a/debian/python3-rosboost-cfg.install b/debian/python3-rosboost-cfg.install
new file mode 100644
index 0000000..a328170
--- /dev/null
+++ b/debian/python3-rosboost-cfg.install
@@ -0,0 +1,2 @@
+usr/bin/rosboost-cfg
+usr/lib/python3*/*/rosboost_cfg
diff --git a/debian/python-rosclean.install b/debian/python3-rosclean.install
similarity index 56%
rename from debian/python-rosclean.install
rename to debian/python3-rosclean.install
index 118e998..ee34045 100644
--- a/debian/python-rosclean.install
+++ b/debian/python3-rosclean.install
@@ -1,2 +1,3 @@
 usr/bin/rosclean
 usr/share/rosclean
+usr/lib/python3*/*/rosclean
diff --git a/debian/python-roscreate.install b/debian/python3-roscreate.install
similarity index 59%
rename from debian/python-roscreate.install
rename to debian/python3-roscreate.install
index 36cf51d..b2e7704 100644
--- a/debian/python-roscreate.install
+++ b/debian/python3-roscreate.install
@@ -1,2 +1,3 @@
 usr/bin/roscreate-pkg
 usr/share/roscreate
+usr/lib/python3*/*/roscreate
diff --git a/debian/python3-roslib.install b/debian/python3-roslib.install
new file mode 100644
index 0000000..bc2004c
--- /dev/null
+++ b/debian/python3-roslib.install
@@ -0,0 +1,2 @@
+usr/lib/roslib/gendeps
+usr/lib/python3*/*/roslib
diff --git a/debian/python3-rosmake.install b/debian/python3-rosmake.install
new file mode 100644
index 0000000..d062ef7
--- /dev/null
+++ b/debian/python3-rosmake.install
@@ -0,0 +1,2 @@
+usr/bin/rosmake
+usr/lib/python3*/*/rosmake
diff --git a/debian/python-rosunit.install b/debian/python3-rosunit.install
similarity index 55%
rename from debian/python-rosunit.install
rename to debian/python3-rosunit.install
index 550be9b..5b1e610 100644
--- a/debian/python-rosunit.install
+++ b/debian/python3-rosunit.install
@@ -1,2 +1,3 @@
 usr/bin/rosunit
 usr/share/rosunit
+usr/lib/python3*/*/rosunit
diff --git a/debian/rules b/debian/rules
index 9b91676..0937243 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,4 +2,10 @@
 # -*- makefile -*-
 
 %:
-	dh  $@ --parallel --buildsystem=cmake --with python2
+	dh  $@ --parallel --buildsystem=cmake --with python3
+
+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-ros.git

More information about the debian-science-commits mailing list