[ros-wstool] 01/02: Convert package to pybuild
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Mon Jul 17 06:41:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to branch master
in repository ros-wstool.
commit eb86d7746c7b6872dab03334b7c1e82bbf2249cd
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Fri Jul 14 22:05:10 2017 +0200
Convert package to pybuild
- Add python3-wstool
---
debian/compat | 2 +-
debian/control | 41 ++++++++++++++++------
.../0001-Fix-location-of-completion-scripts.patch | 4 +--
.../patches/0002-Add-fake-identity-for-bzr.patch | 20 +++++++++++
debian/patches/series | 1 +
debian/rules | 15 ++------
debian/source/options | 1 +
7 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 5768bf5..b846e5f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,21 @@
Source: ros-wstool
-Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
- Jochen Sprickerhof <jspricke at debian.org>,
- Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Section: python
Priority: optional
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7.4.3), dh-python
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-wstool.git
-Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-wstool.git
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Thomas Moulard <thomas.moulard at gmail.com>, Jochen Sprickerhof <jspricke at debian.org>, Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Build-Depends: debhelper (>= 10), dh-python, python-all, python-setuptools, python3-all, python3-setuptools, python-vcstools, python-mock, python-yaml, git, mercurial, subversion, bzr, python3-vcstools, python3-mock, python3-yaml
+Standards-Version: 4.0.0
Homepage: http://wiki.ros.org/wstool
-X-Python-Version: >= 2.7
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-wstool.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-wstool.git
+Testsuite: autopkgtest-pkg-python
Package: python-wstool
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-vcstools, python-yaml
-Description: Commands to manage multi-VCS repositories (for Robot OS)
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Commands to manage multi-VCS repositories (for Robot OS) Python 2
This package is part of Robot OS (ROS). It provides commands to
manage several local VCS repositories based on a single workspace
definition file (.rosinstall). Git, Mercurial, Subversion, and Bazaar
@@ -27,4 +27,23 @@ Description: Commands to manage multi-VCS repositories (for Robot OS)
"regenerate" command, and does not allow adding non-version
controlled elements to workspaces. In all other respects, it behaves
the same as rosws.
+ .
+ This package installs the library for Python 2.
+Package: python3-wstool
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Description: Commands to manage multi-VCS repositories (for Robot OS) Python 3
+ This package is part of Robot OS (ROS). It provides commands to
+ manage several local VCS repositories based on a single workspace
+ definition file (.rosinstall). Git, Mercurial, Subversion, and Bazaar
+ are supported.
+ .
+ wstool replaces the rosws tool for catkin workspaces. As catkin
+ workspaces create their own setup file and environment, wstool is
+ reduced to version control functions only. So wstool does not have a
+ "regenerate" command, and does not allow adding non-version
+ controlled elements to workspaces. In all other respects, it behaves
+ the same as rosws.
+ .
+ This package installs the library for Python 3.
diff --git a/debian/patches/0001-Fix-location-of-completion-scripts.patch b/debian/patches/0001-Fix-location-of-completion-scripts.patch
index 39654a4..e4cbbee 100644
--- a/debian/patches/0001-Fix-location-of-completion-scripts.patch
+++ b/debian/patches/0001-Fix-location-of-completion-scripts.patch
@@ -7,10 +7,10 @@ Subject: Fix location of completion scripts
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
-index 2205607..1c352ef 100644
+index 16d6a3a..d678db0 100644
--- a/setup.py
+++ b/setup.py
-@@ -43,10 +43,10 @@ def _resolve_prefix(prefix, type):
+@@ -46,10 +46,10 @@ def _resolve_prefix(prefix, type):
def get_data_files(prefix):
data_files = []
bash_comp_dest = os.path.join(_resolve_prefix(prefix, 'bash_comp'),
diff --git a/debian/patches/0002-Add-fake-identity-for-bzr.patch b/debian/patches/0002-Add-fake-identity-for-bzr.patch
new file mode 100644
index 0000000..7709d27
--- /dev/null
+++ b/debian/patches/0002-Add-fake-identity-for-bzr.patch
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 14 Jul 2017 22:19:27 +0200
+Subject: Add fake identity for bzr
+
+---
+ test/local/test_diff_functions_bzr.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/local/test_diff_functions_bzr.py b/test/local/test_diff_functions_bzr.py
+index d538f93..93393fe 100644
+--- a/test/local/test_diff_functions_bzr.py
++++ b/test/local/test_diff_functions_bzr.py
+@@ -49,6 +49,7 @@ from test.scm_test_base import AbstractSCMTest, _add_to_file, _nth_line_split
+
+ def create_bzr_repo(remote_path):
+ # create a "remote" repo
++ subprocess.check_call(["bzr", "whoami", "Your Name <name at example.com>"], cwd=remote_path)
+ subprocess.check_call(["bzr", "init"], cwd=remote_path)
+ subprocess.check_call(["touch", "fixed.txt"], cwd=remote_path)
+ subprocess.check_call(["touch", "modified.txt"], cwd=remote_path)
diff --git a/debian/patches/series b/debian/patches/series
index b066ae1..c119821 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Fix-location-of-completion-scripts.patch
+0002-Add-fake-identity-for-bzr.patch
diff --git a/debian/rules b/debian/rules
index d3f091f..e29d08b 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
-# Fri, 11 Oct 2013 08:30:40 +0200
+export PYBUILD_NAME=wstool
+export PYBUILD_AFTER_INSTALL=rm -rf 'debian/python3-wstool/usr/bin' 'debian/python3-wstool/usr/share/bash-completion' 'debian/python3-wstool/usr/share/zsh'
%:
- dh $@ --with python2 --buildsystem=python_distutils
-
-
-override_dh_clean:
- rm -rf src/wstool.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..cb61fa5
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-wstool.git
More information about the debian-science-commits
mailing list