diff -Nru git-imerge-1.2.0/debian/changelog git-imerge-1.2.0/debian/changelog --- git-imerge-1.2.0/debian/changelog 2020-10-25 23:51:53.000000000 +0000 +++ git-imerge-1.2.0/debian/changelog 2023-08-19 06:05:54.000000000 +0000 @@ -1,3 +1,23 @@ +git-imerge (1.2.0-5) unstable; urgency=medium + + * Clean up after pybuild tox and the upstream tests (Closes: #1049491) + * Drop PYBUILD_TEST_TOX since pybuild now correctly detects tox + * Suggest not yet existing git-mergify-rebase package too + + -- Paul Wise Sat, 19 Aug 2023 14:05:54 +0800 + +git-imerge (1.2.0-4) unstable; urgency=medium + + * Add patch fixing Tox 4.x compatibility (Closes: #1035639) + * Add nocheck build dep on python3-wheel for dh-python Tox 4.x support + * Declare compliance with Debian Policy 4.6.2 (no changes needed) + * Switch watch file from a manual regex to uscan @ANY_VERSION@ + * Switch autopkgtest to just using pybuild-auto-pkgtest + * Switch from `dh --with python3` to dh-sequence-python3 + * Bump Debian packaging copyright years + + -- Paul Wise Sun, 13 Aug 2023 14:54:17 +0800 + git-imerge (1.2.0-3) unstable; urgency=medium * Mark upstream autopkgtest as allow-stderr, it logs to stderr diff -Nru git-imerge-1.2.0/debian/clean git-imerge-1.2.0/debian/clean --- git-imerge-1.2.0/debian/clean 2020-10-08 04:14:36.000000000 +0000 +++ git-imerge-1.2.0/debian/clean 2023-08-19 06:05:54.000000000 +0000 @@ -1 +1,3 @@ +.tox/ +t/tmp/ git_imerge.egg-info/ diff -Nru git-imerge-1.2.0/debian/control git-imerge-1.2.0/debian/control --- git-imerge-1.2.0/debian/control 2020-10-25 04:20:11.000000000 +0000 +++ git-imerge-1.2.0/debian/control 2023-08-19 06:05:54.000000000 +0000 @@ -5,14 +5,16 @@ Build-Depends: bash-completion, debhelper-compat (= 13), - dh-python, + dh-sequence-python3, git , pkg-config, python3, python3-setuptools, + python3-wheel , tox , -Standards-Version: 4.5.0 +Standards-Version: 4.6.2 Rules-Requires-Root: no +Testsuite: autopkgtest-pkg-pybuild Homepage: https://github.com/mhagger/git-imerge Package: git-imerge @@ -24,6 +26,7 @@ ${misc:Depends}, ${python3:Depends}, Suggests: + git-mergify-rebase, mergify, Description: incremental merge and rebase for git Performs a merge between two branches incrementally. If conflicts are diff -Nru git-imerge-1.2.0/debian/copyright git-imerge-1.2.0/debian/copyright --- git-imerge-1.2.0/debian/copyright 2020-10-08 04:16:57.000000000 +0000 +++ git-imerge-1.2.0/debian/copyright 2023-08-19 06:05:54.000000000 +0000 @@ -16,7 +16,7 @@ Files: debian/* Copyright: 2018 Jessica Clarke - 2020 Paul Wise + 2020, 2023 Paul Wise License: GPL-2+ License: public-domain diff -Nru git-imerge-1.2.0/debian/patches/series git-imerge-1.2.0/debian/patches/series --- git-imerge-1.2.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ git-imerge-1.2.0/debian/patches/series 2023-08-04 08:30:06.000000000 +0000 @@ -0,0 +1 @@ +tox-4-pr-204.patch diff -Nru git-imerge-1.2.0/debian/patches/tox-4-pr-204.patch git-imerge-1.2.0/debian/patches/tox-4-pr-204.patch --- git-imerge-1.2.0/debian/patches/tox-4-pr-204.patch 1970-01-01 00:00:00.000000000 +0000 +++ git-imerge-1.2.0/debian/patches/tox-4-pr-204.patch 2023-08-04 01:20:11.000000000 +0000 @@ -0,0 +1,28 @@ +From 742e11fa42eb67810330263fb93a3fa909d51c34 Mon Sep 17 00:00:00 2001 +Origin: https://github.com/mhagger/git-imerge/pull/204 +From: Paul Wise +Date: Sun, 7 May 2023 12:46:25 +0800 +Subject: [PATCH] Allow tox to execute /bin/sh in test commands + +Tox 4.x requires all external commands to be specifically listed +as allowed before it will let them be run during the tests. + +See-also: https://tox.wiki/en/4.0.0/user_guide.html#system-overview +See-also: https://tox.wiki/en/4.0.0/config.html#allowlist_externals +Fixes: https://bugs.debian.org/1035639 +--- + tox.ini | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tox.ini b/tox.ini +index c4872dc..94c2262 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -2,6 +2,7 @@ + envlist = py + + [testenv] ++allowlist_externals = /bin/sh + commands = + /bin/sh t/test-unconflicted + /bin/sh t/test-conflicted diff -Nru git-imerge-1.2.0/debian/rules git-imerge-1.2.0/debian/rules --- git-imerge-1.2.0/debian/rules 2020-10-08 04:38:14.000000000 +0000 +++ git-imerge-1.2.0/debian/rules 2023-08-19 06:05:54.000000000 +0000 @@ -1,6 +1,4 @@ #!/usr/bin/make -f -export PYBUILD_TEST_TOX=1 - %: - dh $@ --with python3 --buildsystem=pybuild + dh $@ --buildsystem=pybuild diff -Nru git-imerge-1.2.0/debian/tests/control git-imerge-1.2.0/debian/tests/control --- git-imerge-1.2.0/debian/tests/control 2020-10-25 23:50:52.000000000 +0000 +++ git-imerge-1.2.0/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -Tests: upstream -Restrictions: allow-stderr -Depends: - @, diff -Nru git-imerge-1.2.0/debian/tests/upstream git-imerge-1.2.0/debian/tests/upstream --- git-imerge-1.2.0/debian/tests/upstream 2020-10-08 06:46:24.000000000 +0000 +++ git-imerge-1.2.0/debian/tests/upstream 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh -# FIXME: just run tox when it can do that -# https://github.com/tox-dev/tox/issues/410 -set -e -set -u -pass=0 -fail=0 -for f in t/test-*; do - [ -x "$f" ] || continue - echo "$f ..." - if "$f" ; then - pass=$((pass+1)) - echo "$f: PASS" - else - fail=$((fail+1)) - echo "$f: FAIL" - fi -done -echo "Test summary: $pass passed, $fail failed" -[ $fail -eq 0 ] || exit 1 diff -Nru git-imerge-1.2.0/debian/watch git-imerge-1.2.0/debian/watch --- git-imerge-1.2.0/debian/watch 2020-10-08 03:49:07.000000000 +0000 +++ git-imerge-1.2.0/debian/watch 2023-08-04 02:03:10.000000000 +0000 @@ -1,4 +1,4 @@ version=4 -opts="filenamemangle=s%(?:.*?)?v?(\d[\-+\.:\~\da-zA-Z]*)(@ARCHIVE_EXT@)%@PACKAGE@_$1.orig$2%" \ +opts="filenamemangle=s%(?:.*?)?@ANY_VERSION@(@ARCHIVE_EXT@)%@PACKAGE@_$1.orig$2%" \ https://github.com/mhagger/git-imerge/tags \ -(?:.*?/)?v?(\d[\-+\.:\~\da-zA-Z]*)@ARCHIVE_EXT@ +(?:.*?/)?@ANY_VERSION@@ARCHIVE_EXT@