[ros-rosdistro] 01/02: Convert package to pybuild

Jochen Sprickerhof jspricke at moszumanska.debian.org
Fri Jul 14 17:59:09 UTC 2017


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

jspricke pushed a commit to branch master
in repository ros-rosdistro.

commit 036cfeb14c6b05b02bed6f7744e930c99195e6e3
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jul 1 21:32:02 2017 +0200

    Convert package to pybuild
    
    - Add python3 package.
    - Fix copyright file.
---
 debian/control          | 45 +++++++++++++++++++++++++++++----------------
 debian/copyright        | 22 +++++++++++-----------
 debian/pydist-overrides |  2 --
 debian/rules            | 16 +++-------------
 debian/source/options   |  1 +
 5 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/debian/control b/debian/control
index 0c6bd60..4acbbb2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,37 @@
 Source: ros-rosdistro
-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 (>= 10), dh-python
+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-yaml, python3-yaml, python3-catkin-pkg
 Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosdistro.git
-Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosdistro.git
 Homepage: http://wiki.ros.org/rosdistro
-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-rosdistro.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/ros/ros-rosdistro.git
+Testsuite: autopkgtest-pkg-python
 
 Package: python-rosdistro
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, 
-	python-argparse,
-	python-catkin-pkg, 
-	python-rospkg, 
-	python-setuptools, 
-	python-yaml
-Description: Tool to work with rosdistro files (for Robot OS)
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Tool to work with rosdistro files (for Robot OS, Python 2)
+ This package is part of Robot OS (ROS). The rosdistro tool allows you
+ to get access to the full dependency tree and the vcs information of
+ all packages and repositories.
+ .
+ rosdistro is a file format for managing ROS Distributions and the ROS
+ stacks they contain. This file format is used as input to a variety
+ of tools in the ROS build and release toolchain, from stack release
+ tools to rosdoc. The rosdistro format has changed for Catkin-based
+ repositories.
+ .
+ This package installs the library for Python 2.
+
+Package: python3-rosdistro
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Description: Tool to work with rosdistro files (for Robot OS, Python 3)
  This package is part of Robot OS (ROS). The rosdistro tool allows you
  to get access to the full dependency tree and the vcs information of
  all packages and repositories.
@@ -29,4 +40,6 @@ Description: Tool to work with rosdistro files (for Robot OS)
  stacks they contain. This file format is used as input to a variety
  of tools in the ROS build and release toolchain, from stack release
  tools to rosdoc. The rosdistro format has changed for Catkin-based
- repositories. 
+ repositories.
+ .
+ This package installs the library for Python 3.
diff --git a/debian/copyright b/debian/copyright
index 3bdbfc1..aa06c5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,17 @@ Copyright: 2013, Open Source Robotics Foundation, Inc.
            2016, Clearpath Robotics
 License: BSD-3-clause
 
+Files: src/rosdistro/external/appdirs.py
+Copyright: 2005-2010 ActiveState Software Inc.
+           2013 Eddy Petrișor 
+License: Expat
+
+Files: debian/*
+Copyright: 2013, Thomas Moulard <thomas.moulard at gmail.com>,
+           2013-2017, Jochen Sprickerhof <jspricke at debian.org>,
+                      Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+License: BSD-3-clause
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -40,18 +51,7 @@ License: BSD-3-clause
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
-
-Files: debian/*
-Copyright: 2013, Thomas Moulard <thomas.moulard at gmail.com>,
-           2013-2015, Jochen Sprickerhof <jspricke at debian.org>,
-           	      Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-License: BSD-3-clause
  
-Files: external/appdirs.py
-Copyright: 2005-2010 ActiveState Software Inc.
-           2013 Eddy Petrișor 
-License: Expat
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
deleted file mode 100644
index abe3a2d..0000000
--- a/debian/pydist-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-catkin_pkg python-catkin-pkg
-rospkg python-rospkg
diff --git a/debian/rules b/debian/rules
index 85dc358..3f1c8bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
 
-# This file was automatically generated by stdeb 0.6.0+git at
-# Thu, 10 Oct 2013 11:59:22 +0200
+export PYBUILD_NAME=rosdistro
+export PYBUILD_AFTER_INSTALL=rm -rf 'debian/python3-rosdistro/usr/bin'
 
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
-
-
-override_dh_clean:
-	rm -rf src/rosdistro.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-rosdistro.git



More information about the debian-science-commits mailing list