diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-05 16:17:01 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-05 16:17:01 +0000 |
commit | 84eff262e090069d0dc264e42c7de0119a0c07d9 (patch) | |
tree | cec4ba3a818c6dff9c3a953f9feea0773c326e9a | |
parent | Merging upstream version 2.17.0. (diff) | |
download | ansible-core-84eff262e090069d0dc264e42c7de0119a0c07d9.tar.xz ansible-core-84eff262e090069d0dc264e42c7de0119a0c07d9.zip |
Merging debian version 2.17.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rw-r--r-- | debian/gbp.conf | 2 | ||||
-rw-r--r-- | debian/patches/0005-use-py3.patch | 24 |
4 files changed, 24 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 08569f6..a5d038b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ansible-core (2.17.0-1) unstable; urgency=medium + + * New upstream version 2.17.0 + * d/control: Update VCS links after moving package to python-team + * Remove trailing whitespace + * Refresh patches + + -- Lee Garrett <debian@rocketjump.eu> Wed, 05 Jun 2024 14:59:38 +0200 + ansible-core (2.16.6-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index 933e914..fd4eed1 100644 --- a/debian/control +++ b/debian/control @@ -29,8 +29,8 @@ Rules-Requires-Root: no Standards-Version: 4.7.0 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/ansible-core Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/ansible-core -XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/ansible-core -XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/ansible-core.git +XSBC-Original-Vcs-Browser: https://salsa.debian.org/python-team/packages/ansible-core +XSBC-Original-Vcs-Git: https://salsa.debian.org/python-team/packages/ansible-core.git Homepage: https://www.ansible.com Package: ansible-core diff --git a/debian/gbp.conf b/debian/gbp.conf index 909d299..fbd98f5 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,7 +3,7 @@ [DEFAULT] debian-branch = debian/latest pristine-tar = True -sign-tags = True +sign-tags = True upstream-branch = upstream/latest [import-orig] diff --git a/debian/patches/0005-use-py3.patch b/debian/patches/0005-use-py3.patch index 0db80e1..ba4f03b 100644 --- a/debian/patches/0005-use-py3.patch +++ b/debian/patches/0005-use-py3.patch @@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +#!/usr/bin/env python3 # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - from __future__ import (absolute_import, division, print_function) + from __future__ import annotations --- a/test/integration/targets/cli/test-cli.py +++ b/test/integration/targets/cli/test-cli.py @@ -1,4 +1,4 @@ @@ -60,16 +60,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -#!/usr/bin/env python +#!/usr/bin/env python3 - from __future__ import (absolute_import, division, print_function) - __metaclass__ = type + from __future__ import annotations + --- a/test/integration/targets/pip/files/setup.py +++ b/test/integration/targets/pip/files/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - from __future__ import (absolute_import, division, print_function) - __metaclass__ = type + from __future__ import annotations + --- a/test/integration/targets/service/files/ansible_test_service.py +++ b/test/integration/targets/service/files/ansible_test_service.py @@ -1,4 +1,4 @@ @@ -84,16 +84,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -#!/usr/bin/env python +#!/usr/bin/env python3 - from __future__ import (absolute_import, division, print_function) - __metaclass__ = type + from __future__ import annotations + --- a/test/integration/targets/throttle/test_throttle.py +++ b/test/integration/targets/throttle/test_throttle.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - from __future__ import (absolute_import, division, print_function) - __metaclass__ = type + from __future__ import annotations + --- a/test/integration/targets/var_precedence/ansible-var-precedence-check.py +++ b/test/integration/targets/var_precedence/ansible-var-precedence-check.py @@ -1,4 +1,4 @@ @@ -116,8 +116,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -#!/usr/bin/env python +#!/usr/bin/env python3 - from __future__ import (absolute_import, division, print_function) - __metaclass__ = type + from __future__ import annotations + --- a/test/integration/targets/cli/test_k_and_K.py +++ b/test/integration/targets/cli/test_k_and_K.py @@ -1,4 +1,4 @@ @@ -125,7 +125,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +#!/usr/bin/env python3 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - # Make coding more python3-ish + from __future__ import annotations --- a/test/integration/targets/service_facts/files/ansible_test_service.py +++ b/test/integration/targets/service_facts/files/ansible_test_service.py @@ -1,4 +1,4 @@ |