summaryrefslogtreecommitdiff
diff options
authorThomas Goirand <zigo@debian.org>2016-02-17 15:57:38 +0000
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2016-02-18 04:25:17 +0000
commitf5c724f2e5346c60faa1c84e86fd2ea8e957bc06 (patch)
treef70e37f2bdd00ca5be7c45dc0095b8ee3230bb9f
parentfae83466b8630f304b50c90676f9f61eab42ab13 (diff)
Imported using git-ubuntu import.
Notes
Notes: * Fixed FTBFS by adding missing python-invoke as build-depends (Closes: #802147). * Added dh-python as build-depends. * HTTPS for VCS URLs. * Fix debian/copyright ordering.
-rw-r--r--debian/changelog10
-rw-r--r--debian/control28
-rw-r--r--debian/copyright8
-rw-r--r--debian/gbp.conf9
-rwxr-xr-xdebian/rules4
5 files changed, 39 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 5d9ad4f..dcb6e0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+python-invocations (0.6.2-2) unstable; urgency=medium
+
+ * Fixed FTBFS by adding missing python-invoke as build-depends
+ (Closes: #802147).
+ * Added dh-python as build-depends.
+ * HTTPS for VCS URLs.
+ * Fix debian/copyright ordering.
+
+ -- Thomas Goirand <zigo@debian.org> Wed, 17 Feb 2016 15:57:38 +0000
+
python-invocations (0.6.2-1) unstable; urgency=medium
* Initial release. (Closes: #768955)
diff --git a/debian/control b/debian/control
index d4d2d98..2ab5011 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,26 @@ Source: python-invocations
Section: python
Priority: optional
Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
-Uploaders: Thomas Goirand <zigo@debian.org>
-Build-Depends: debhelper (>= 9), python-setuptools, python-all (>= 2.6.6-3~), python3-setuptools, python3-all
+Uploaders: Thomas Goirand <zigo@debian.org>,
+Build-Depends: debhelper (>= 9),
+ dh-python,
+ openstack-pkg-tools,
+ python-all,
+ python-setuptools,
+ python3-all,
+ python3-setuptools,
+Build-Depends-Indep: python-invoke,
+ python3-invoke,
Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-invocations.git
-Vcs-Git: git://anonscm.debian.org/openstack/python-invocations.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=openstack/python-invocations.git
+Vcs-Git: https://anonscm.debian.org/git/openstack/python-invocations.git
Homepage: http://pyinvoke.org
Package: python-invocations
Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${python:Depends}, ${misc:Depends}
-Suggests: python-invocations-doc
+Depends: ${misc:Depends},
+ ${python:Depends},
+Suggests: python-invocations-doc,
Description: reusable invoke tasks - Python 2.x
Invocations is a collection of reusable "Invoke" tasks/task modules, including
(but not limited to) Python project management tools such as documentation
@@ -26,9 +34,9 @@ Description: reusable invoke tasks - Python 2.x
Package: python3-invocations
Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${python3:Depends}, ${misc:Depends}
-Suggests: python-invocations-doc
+Depends: ${misc:Depends},
+ ${python3:Depends},
+Suggests: python-invocations-doc,
Description: Reusable Invoke tasks - Python 3.x
Invocations is a collection of reusable "Invoke" tasks/task modules, including
(but not limited to) Python project management tools such as documentation
diff --git a/debian/copyright b/debian/copyright
index aba124c..a908602 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: invocations
Source: https://pypi.python.org/pypi/invocations
-Files: debian/*
-Copyright: (c) 2014, Thomas Goirand <zigo@debian.org>
+Files: *
+Copyright: (c) 2013-2015, Jeff Forcier <jeff@bitprophet.org>
License: BSD-2-clause
-Files: *
-Copyright: (c) 2013, Jeff Forcier <jeff@bitprophet.org>
+Files: debian/*
+Copyright: (c) 2014-2016, Thomas Goirand <zigo@debian.org>
License: BSD-2-clause
License: BSD-2-clause
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 856f8c2..f74b9f8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,8 @@
[DEFAULT]
-upstream-branch = upstream-unstable
-debian-branch = debian-unstable
-pristine-tar = True
+upstream-branch = master
+debian-branch = debian/unstable
+upstream-tag = %(version)s
+compression = gz
-[git-buildpackage]
+[buildpackage]
export-dir = ../build-area/
diff --git a/debian/rules b/debian/rules
index 720648c..1889e54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,8 @@
PYTHONS:=$(shell pyversions -vr)
PYTHON3S:=$(shell py3versions -vr)
-#UPSTREAM_GIT = git://github.com/<please-user>/invocations.git
--include /usr/share/openstack-pkg-tools/pkgos.make
+UPSTREAM_GIT = git://github.com/pyinvoke/invocations.git
+include /usr/share/openstack-pkg-tools/pkgos.make
%:
dh $@ --buildsystem=python_distutils --with python2,python3