From 1a5fd69425bc2bd86f94e3d6ee499b2f7d24522f Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 23 Apr 2022 09:42:14 -0300 Subject: [PATCH] debian/rules: fix build with python3.10 as default --- debian/git-buildpackage-rpm.install | 10 ++-- debian/git-buildpackage.install | 72 ++++++++++++++--------------- debian/not-installed | 14 +++--- debian/rules | 2 +- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install index 503e495a..f79d4f17 100644 --- 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 285bd9c9..8e898c17 100644 --- 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 61676532..0a7a6e06 100644 --- 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 6604f85f..24dedb6c 100755 --- 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 -- 2.34.1