debian/rules: fix build with python3.10 as default

diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install
index 503e495a741bbc848637f3ac89899c23b8f2bca7..f79d4f172330ac001392dab920c20459971e6fa8 100644 (file)
--- a/debian/git-buildpackage-rpm.install
+++ b/debian/git-buildpackage-rpm.install
@@ -1,6 +1,6 @@
 usr/bin/gbp-builder-mock /usr/share/git-buildpackage/
-usr/lib/python3.?/dist-packages/gbp/rpm usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?//dist-packages/gbp/scripts/import_srpm.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/pq_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/buildpackage_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/rpm_ch.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/rpm usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*//dist-packages/gbp/scripts/import_srpm.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/pq_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/buildpackage_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/rpm_ch.py usr/lib/python3/dist-packages/gbp/scripts/

diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install
index 285bd9c9b6ab7aed990e83e5c4d165a6f292ac11..8e898c171396bc0cecd3a20da9aa774216f190a6 100644 (file)
--- a/debian/git-buildpackage.install
+++ b/debian/git-buildpackage.install
@@ -1,39 +1,39 @@
 usr/bin/gbp
 usr/bin/git-pbuilder
-usr/lib/python3.?/dist-packages/gbp-* usr/lib/python3/dist-packages/
-usr/lib/python3.?/dist-packages/gbp/command_wrappers.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/config.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/dch.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/deb/ usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/errors.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/format.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/git/ usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/__init__.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/log.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/notifications.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/paths.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/patch_series.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/pkg/ usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/scripts/buildpackage.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/clone.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/common/ usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/config.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/create_remote_repo.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/dch.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/import_dsc.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/import_dscs.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/import_orig.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/import_ref.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/export_orig.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/__init__.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/pq.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/pristine_tar.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/pull.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/push.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/setup_gitattributes.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/supercommand.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/scripts/tag.py usr/lib/python3/dist-packages/gbp/scripts/
-usr/lib/python3.?/dist-packages/gbp/tmpfile.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/tristate.py usr/lib/python3/dist-packages/gbp/
-usr/lib/python3.?/dist-packages/gbp/version.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp-* usr/lib/python3/dist-packages/
+usr/lib/python3.*/dist-packages/gbp/command_wrappers.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/config.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/dch.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/deb/ usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/errors.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/format.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/git/ usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/__init__.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/log.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/notifications.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/paths.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/patch_series.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/pkg/ usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/scripts/buildpackage.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/clone.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/common/ usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/config.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/create_remote_repo.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/dch.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/import_dsc.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/import_dscs.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/import_orig.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/import_ref.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/export_orig.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/__init__.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/pq.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/pristine_tar.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/pull.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/push.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/setup_gitattributes.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/supercommand.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/scripts/tag.py usr/lib/python3/dist-packages/gbp/scripts/
+usr/lib/python3.*/dist-packages/gbp/tmpfile.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/tristate.py usr/lib/python3/dist-packages/gbp/
+usr/lib/python3.*/dist-packages/gbp/version.py usr/lib/python3/dist-packages/gbp/
 usr/share/git-buildpackage/gbp.conf etc/git-buildpackage/

diff --git a/debian/not-installed b/debian/not-installed
index 61676532a789764c9633eeb72fdeca1b6df40dcc..0a7a6e0642190fa23091a46c96812bd3e0534c90 100644 (file)
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,8 +1,8 @@
-debian/tmp/usr/lib/python3.9/dist-packages/gbp/deb/__pycache__
-debian/tmp/usr/lib/python3.9/dist-packages/gbp/git/__pycache__
-debian/tmp/usr/lib/python3.9/dist-packages/gbp/pkg/__pycache__
-debian/tmp/usr/lib/python3.9/dist-packages/gbp/__pycache__
-debian/tmp/usr/lib/python3.9/dist-packages/gbp/rpm/__pycache__
-debian/tmp/usr/lib/python3.9/dist-packages/gbp/scripts/common/__pycache__
-debian/tmp/usr/lib/python3.9/dist-packages/gbp/scripts/__pycache__
+debian/tmp/usr/lib/python3.*/dist-packages/gbp/deb/__pycache__
+debian/tmp/usr/lib/python3.*/dist-packages/gbp/git/__pycache__
+debian/tmp/usr/lib/python3.*/dist-packages/gbp/pkg/__pycache__
+debian/tmp/usr/lib/python3.*/dist-packages/gbp/__pycache__
+debian/tmp/usr/lib/python3.*/dist-packages/gbp/rpm/__pycache__
+debian/tmp/usr/lib/python3.*/dist-packages/gbp/scripts/common/__pycache__
+debian/tmp/usr/lib/python3.*/dist-packages/gbp/scripts/__pycache__
 

diff --git a/debian/rules b/debian/rules
index 6604f85fc12eaf613e313207479037d42747c112..24dedb6cad4dd0a8bb088743dc0153971e9d29b8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ override_dh_auto_install:
        mkdir -p debian/git-buildpackage/$(PK4_DIR)
        install -m755 debian/pk4 \
                debian/git-buildpackage/$(PK4_DIR)/gbp
-       chmod a+x debian/tmp/usr/lib/python3.?/dist-packages/gbp/scripts/supercommand.py
+       chmod a+x debian/tmp/usr/lib/python3.*/dist-packages/gbp/scripts/supercommand.py
 
 override_dh_auto_clean:
        dh_auto_clean