[ros-catkin-pkg] 01/03: Convert package to pybuild
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Fri Jun 30 06:01:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to branch master
in repository ros-catkin-pkg.
commit 082f9f30c037da0f525c9d72042da89881be8c30
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Thu Jun 29 23:31:23 2017 +0200
Convert package to pybuild
- Add a python3- package.
- Add patch to fix shebang.
Close: #866352
---
debian/control | 46 ++++++++++++++------------
debian/copyright | 2 +-
debian/docs | 1 -
debian/dput.cf | 23 -------------
debian/patches/0002-Fix-shebang.patch | 62 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 15 ++-------
debian/source/options | 1 +
8 files changed, 93 insertions(+), 58 deletions(-)
diff --git a/debian/control b/debian/control
index 40cd51b..e836ddd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,35 +1,39 @@
Source: ros-catkin-pkg
-Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
- Leopold Palomo-Avellaneda <leo at alaxarxa.net>,
- Jochen Sprickerhof <jspricke at debian.org>
Section: python
Priority: optional
-Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 10),
- python,
- python-dateutil,
- python-docutils,
- python-mock,
- dh-python
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Thomas Moulard <thomas.moulard at gmail.com>, Leopold Palomo-Avellaneda <leo at alaxarxa.net>, Jochen Sprickerhof <jspricke at debian.org>
+Build-Depends: debhelper (>= 10), dh-python, python-all, python-setuptools, python3-all, python3-setuptools, python-mock, python3-mock, python-docutils, python3-docutils, python-dateutil, python3-dateutil
Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-catkin-pkg.git
-Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-catkin-pkg.git
Homepage: http://www.ros.org/wiki/catkin_pkg
-X-Python-Version: >= 2.7
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/ros/ros-catkin-pkg.git
+Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/ros/ros-catkin-pkg.git
+#Testsuite: autopkgtest-pkg-python
Package: python-catkin-pkg
Architecture: all
Multi-Arch: foreign
-Depends: python,
- python-dateutil,
- python-docutils,
- python-mock,
- ${misc:Depends}
-Description: Low-level build system macros for Robot OS -- Python module
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Low-level build system macros for Robot OS -- Python 2 module
+ This package is part of Robot OS (ROS). It is a library for
+ retrieving information about catkin packages. Catkin contains CMake
+ macros that are useful in the development of ROS-related systems. ROS
+ provides libraries and tools to help software developers create robot
+ applications.
+ .
+ This package is a Python 2 module needed to use Catkin.
+
+Package: python3-catkin-pkg
+Architecture: all
+Multi-Arch: foreign
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Low-level build system macros for Robot OS -- Python 3 module
This package is part of Robot OS (ROS). It is a library for
retrieving information about catkin packages. Catkin contains CMake
macros that are useful in the development of ROS-related systems. ROS
provides libraries and tools to help software developers create robot
- applications.
+ applications.
.
- This package is a Python module needed to use Catkin.
+ This package is a Python 2 module needed to use Catkin.
diff --git a/debian/copyright b/debian/copyright
index 93a3ff4..fcb61d7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: catkin_pkg
Upstream-Contact: Dirk Thomas <dthomas at osrfoundation.org>
Source: https://github.com/ros-infrastructure/catkin_pkg
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index a1320b1..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.rst
diff --git a/debian/dput.cf b/debian/dput.cf
deleted file mode 100644
index 8b2bdba..0000000
--- a/debian/dput.cf
+++ /dev/null
@@ -1,23 +0,0 @@
-[all-building]
-method = scp
-login = rosbuild
-fqdn = repos.ros.org
-incoming = /var/www/repos/building/queue/all
-run_dinstall = 0
-post_upload_command = ssh rosbuild at repos.ros.org -- /usr/bin/reprepro -b /var/www/repos/building --ignore=emptyfilenamepart -V processincoming all
-
-[all-shadow-fixed]
-method = scp
-login = rosbuild
-fqdn = repos.ros.org
-incoming = /var/www/repos/ros-shadow-fixed/ubuntu/queue/all
-run_dinstall = 0
-post_upload_command = ssh rosbuild at repos.ros.org -- /usr/bin/reprepro -b /var/www/repos/ros-shadow-fixed/ubuntu --ignore=emptyfilenamepart -V processincoming all
-
-[all-ros]
-method = scp
-login = rosbuild
-fqdn = repos.ros.org
-incoming = /var/www/repos/ros/ubuntu/queue/all
-run_dinstall = 0
-post_upload_command = ssh rosbuild at repos.ros.org -- /usr/bin/reprepro -b /var/www/repos/ros/ubuntu --ignore=emptyfilenamepart -V processincoming all
diff --git a/debian/patches/0002-Fix-shebang.patch b/debian/patches/0002-Fix-shebang.patch
new file mode 100644
index 0000000..832b237
--- /dev/null
+++ b/debian/patches/0002-Fix-shebang.patch
@@ -0,0 +1,62 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 30 Jun 2017 00:20:42 +0200
+Subject: Fix shebang
+
+---
+ bin/catkin_create_pkg | 2 +-
+ bin/catkin_find_pkg | 2 +-
+ bin/catkin_generate_changelog | 2 +-
+ bin/catkin_tag_changelog | 2 +-
+ bin/catkin_test_changelog | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bin/catkin_create_pkg b/bin/catkin_create_pkg
+index ea7aa89..3d66824 100755
+--- a/bin/catkin_create_pkg
++++ b/bin/catkin_create_pkg
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+
+ import sys
+
+diff --git a/bin/catkin_find_pkg b/bin/catkin_find_pkg
+index 953953a..5d9d4a5 100755
+--- a/bin/catkin_find_pkg
++++ b/bin/catkin_find_pkg
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+
+ import sys
+
+diff --git a/bin/catkin_generate_changelog b/bin/catkin_generate_changelog
+index 7d68e27..ddd421e 100755
+--- a/bin/catkin_generate_changelog
++++ b/bin/catkin_generate_changelog
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+
+ import sys
+
+diff --git a/bin/catkin_tag_changelog b/bin/catkin_tag_changelog
+index 0c134c7..991044b 100755
+--- a/bin/catkin_tag_changelog
++++ b/bin/catkin_tag_changelog
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+
+ import sys
+
+diff --git a/bin/catkin_test_changelog b/bin/catkin_test_changelog
+index 0801fd8..33e01d9 100755
+--- a/bin/catkin_test_changelog
++++ b/bin/catkin_test_changelog
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+
+ import sys
+
diff --git a/debian/patches/series b/debian/patches/series
index a0b7478..945f6a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Set-default-ROS_DISTRO-to-debian.patch
+0002-Fix-shebang.patch
diff --git a/debian/rules b/debian/rules
index 491936c..b1acf30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,7 @@
#!/usr/bin/make -f
-# This file was automatically generated by stdeb 0.6.0+git at
-# Mon, 01 Dec 2014 12:34:47 +0100
+export PYBUILD_NAME=catkin-pkg
+export PYBUILD_AFTER_INSTALL=rm -rf 'debian/python3-catkin-pkg/usr/bin'
%:
- dh $@ --with python2 --buildsystem=python_distutils
-
-
-override_dh_clean:
- rm -rf src/catkin_pkg.egg-info
- dh_clean
-
-get-orig-source:
- uscan --verbose --force-download --repack --compress xz
-
+ dh $@ --with python2,python3 --buildsystem=pybuild
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..98d8c8f
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^src/[^/]*[.]egg-info/"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-catkin-pkg.git
More information about the debian-science-commits
mailing list