From 5cefa2f90a51556771b22249898c39a95ab394de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Thu, 3 Mar 2016 21:16:34 +0100 Subject: [PATCH] New upstream release. * Fixed VCS URLs (https). * Fixed (build-)depends for new release. * Standards-Version is 3.9.7 now (no change). * Added myself to d/copyright. * Fixed order in d/copyright. * Install /usr/bin/tosca-parser as alternatives in both packages. --- debian/changelog | 8 +++++++- debian/control | 22 +++++++++++----------- debian/copyright | 9 +++++---- debian/python-tosca-parser.postinst | 11 +++++++++++ debian/python-tosca-parser.postrm | 11 +++++++++++ debian/python-tosca-parser.prerm | 11 +++++++++++ debian/python3-tosca-parser.postinst | 11 +++++++++++ debian/python3-tosca-parser.postrm | 11 +++++++++++ debian/python3-tosca-parser.prerm | 11 +++++++++++ debian/rules | 3 +++ 10 files changed, 92 insertions(+), 16 deletions(-) create mode 100644 debian/python-tosca-parser.postinst create mode 100644 debian/python-tosca-parser.postrm create mode 100644 debian/python-tosca-parser.prerm create mode 100644 debian/python3-tosca-parser.postinst create mode 100644 debian/python3-tosca-parser.postrm create mode 100644 debian/python3-tosca-parser.prerm diff --git a/debian/changelog b/debian/changelog index 5fe611d..d5939fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ -python-tosca-parser (0.1.0-4) UNRELEASED; urgency=medium +python-tosca-parser (0.4.0-1) UNRELEASED; urgency=medium + * New upstream release. * Fixed VCS URLs (https). + * Fixed (build-)depends for new release. + * Standards-Version is 3.9.7 now (no change). + * Added myself to d/copyright. + * Fixed order in d/copyright. + * Install /usr/bin/tosca-parser as alternatives in both packages. -- Ondřej Nový Sun, 28 Feb 2016 15:52:18 +0100 diff --git a/debian/control b/debian/control index 5b68d98..29119f1 100644 --- a/debian/control +++ b/debian/control @@ -12,31 +12,31 @@ Build-Depends: debhelper (>= 9), python3-all, python3-setuptools, Build-Depends-Indep: python-babel, - python-cliff (>= 1.13.0), + python-cliff (>= 1.15.0), python-coverage, python-dateutil, python-fixtures (>= 1.3.1), python-hacking (>= 0.10.0), python-oslosphinx (>= 2.5.0), - python-oslotest (>= 1.7.0), - python-pbr (>= 1.3), + python-oslotest (>= 1.10.0), + python-pbr (>= 1.6), python-six (>= 1.9.0), python-testscenarios, python-testtools (>= 1.4.0), python-yaml, python3-babel, - python3-cliff (>= 1.13.0), + python3-cliff (>= 1.15.0), python3-dateutil, python3-fixtures (>= 1.3.1), - python3-oslotest (>= 1.7.0), - python3-pbr (>= 1.3), + python3-oslotest (>= 1.10.0), + python3-pbr (>= 1.6), python3-six (>= 1.9.0), python3-testscenarios, python3-testtools (>= 1.4.0), python3-yaml, subunit, testrepository, -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-tosca-parser.git/ Vcs-Git: https://anonscm.debian.org/git/openstack/python-tosca-parser.git Homepage: https://github.com/openstack/tosca-parser @@ -44,9 +44,9 @@ Homepage: https://github.com/openstack/tosca-parser Package: python-tosca-parser Architecture: all Depends: python-babel, - python-cliff (>= 1.13.0), + python-cliff (>= 1.15.0), python-dateutil, - python-pbr (>= 1.3), + python-pbr (>= 1.6), python-six (>= 1.9.0), python-yaml, ${misc:Depends}, @@ -65,9 +65,9 @@ Description: parser for TOSCA Simple Profile in YAML - Python 2.x Package: python3-tosca-parser Architecture: all Depends: python3-babel, - python3-cliff (>= 1.13.0), + python3-cliff (>= 1.15.0), python3-dateutil, - python3-pbr (>= 1.3), + python3-pbr (>= 1.6), python3-six (>= 1.9.0), python3-yaml, ${misc:Depends}, diff --git a/debian/copyright b/debian/copyright index 6a74113..b9d4578 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,10 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: tosca-parser Source: git://github.com/openstack/tosca-parser.git -Files: debian/* -Copyright: (c) 2015, Thomas Goirand -License: Apache-2.0 - Files: * Copyright: (c) 2014-2015, OpenStack Foundation (c) 2014-2015, b1-systems @@ -18,6 +14,11 @@ Copyright: (c) 2014-2015, OpenStack Foundation + (c) 2016, Ondřej Nový +License: Apache-2.0 + License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/debian/python-tosca-parser.postinst b/debian/python-tosca-parser.postinst new file mode 100644 index 0000000..e202c02 --- /dev/null +++ b/debian/python-tosca-parser.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] ; then + update-alternatives --install /usr/bin/tosca-parser tosca-parser /usr/bin/python2-tosca-parser 300 +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python-tosca-parser.postrm b/debian/python-tosca-parser.postrm new file mode 100644 index 0000000..6fc4edd --- /dev/null +++ b/debian/python-tosca-parser.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then + update-alternatives --remove tosca-parser /usr/bin/python2-tosca-parser +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python-tosca-parser.prerm b/debian/python-tosca-parser.prerm new file mode 100644 index 0000000..17a85df --- /dev/null +++ b/debian/python-tosca-parser.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ] ; then + update-alternatives --remove tosca-parser /usr/bin/python2-tosca-parser +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python3-tosca-parser.postinst b/debian/python3-tosca-parser.postinst new file mode 100644 index 0000000..41d8f03 --- /dev/null +++ b/debian/python3-tosca-parser.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] ; then + update-alternatives --install /usr/bin/tosca-parser tosca-parser /usr/bin/python3-tosca-parser 200 +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python3-tosca-parser.postrm b/debian/python3-tosca-parser.postrm new file mode 100644 index 0000000..ced7d62 --- /dev/null +++ b/debian/python3-tosca-parser.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then + update-alternatives --remove tosca-parser /usr/bin/python3-tosca-parser +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/python3-tosca-parser.prerm b/debian/python3-tosca-parser.prerm new file mode 100644 index 0000000..5e48678 --- /dev/null +++ b/debian/python3-tosca-parser.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ] ; then + update-alternatives --remove tosca-parser /usr/bin/python3-tosca-parser +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index 4df8b33..5003882 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,9 @@ override_dh_auto_install: done rm -rf $(CURDIR)/debian/python*-tosca-parser/usr/lib/python*/dist-packages/*.pth + mv $(CURDIR)/debian/python-tosca-parser/usr/bin/tosca-parser $(CURDIR)/debian/python-tosca-parser/usr/bin/python2-tosca-parser + mv $(CURDIR)/debian/python3-tosca-parser/usr/bin/tosca-parser $(CURDIR)/debian/python3-tosca-parser/usr/bin/python3-tosca-parser + override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) @echo "===> Running tests"