Merging debian version 10.0.0+dfsg-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 27 insertions, 10 deletions

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 000000000..8e8dfa620
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,3 @@
+New major updates bring new dependencies for the unit tests. Maybe use
+dh_python3 or /usr/share/dh-python/dhpython/pydist.py to automate mapping the
+lib names to Debian packages?
diff --git a/debian/changelog b/debian/changelog
index 623f8a4a0..0cb63dde6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ansible (10.0.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 10.0.0+dfsg
+  * d/control: Update VCS links after moving package to python-team
+  * Update salsa CI pipeline file to recommended naming
+  * Update d/salsa-ci.yml to recommendations
+  * Add debian/TODO
+  * Bump minimum required ansible-core version
+  * ansible.utils now requires python3-netaddr >= 0.10.1
+  * Exclude shipped python venv
+
+ -- Lee Garrett <debian@rocketjump.eu>  Wed, 05 Jun 2024 17:18:54 +0200
+
 ansible (9.5.1+dfsg-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 956f73312..7563a4e8e 100644
--- a/debian/control
+++ b/debian/control
@@ -21,20 +21,20 @@ Rules-Requires-Root: no
 Standards-Version: 4.7.0
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/ansible
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/ansible
-XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/ansible
-XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/ansible.git
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/python-team/packages/ansible
+XSBC-Original-Vcs-Git: https://salsa.debian.org/python-team/packages/ansible.git
 Homepage: https://www.ansible.com
 
 Package: ansible
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
-         ansible-core (>= 2.16.6-1~),
+         ansible-core (>= 2.17.0-1~),
          openssh-client | python3-paramiko (>= 2.6.0),
          python3-dnspython,
          python3-httplib2,
          python3-jinja2,
-         python3-netaddr,
+         python3-netaddr (>= 0.10.1-1~),
          python3-yaml
 Recommends: python3-argcomplete,
             python3-cryptography,
diff --git a/debian/copyright b/debian/copyright
index ac6301461..5afd28e87 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,8 @@ Files-Excluded:
     ansible_collections/containers/podman/docs/_static/jquery.js
     ansible_collections/containers/podman/docs/_static/underscore.js
     ansible_collections/containers/podman/docs/searchindex.js
+    ansible_collections/inspur/ispim/venv
+    ansible_collections/kaytus/ksmanage/venv
 
 Files: *
 Copyright: 2017, <meiliu@fusionlayer.com>
diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
deleted file mode 100644
index ac7bc44ad..000000000
--- a/debian/gitlab-ci.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-
-variables:
-  RELEASE: 'unstable'
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 000000000..49a554940
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,5 @@
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+  RELEASE: 'unstable'