diff -Nru git-imerge-1.2.0/debian/changelog git-imerge-1.2.0/debian/changelog --- git-imerge-1.2.0/debian/changelog 2023-08-13 06:54:17.000000000 +0000 +++ git-imerge-1.2.0/debian/changelog 2023-08-19 06:05:54.000000000 +0000 @@ -1,3 +1,11 @@ +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) diff -Nru git-imerge-1.2.0/debian/clean git-imerge-1.2.0/debian/clean --- git-imerge-1.2.0/debian/clean 2023-08-04 04:38:43.000000000 +0000 +++ git-imerge-1.2.0/debian/clean 2023-08-19 06:05:54.000000000 +0000 @@ -1,2 +1,3 @@ -t/tmp +.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 2023-08-13 06:26:05.000000000 +0000 +++ git-imerge-1.2.0/debian/control 2023-08-19 06:05:54.000000000 +0000 @@ -26,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/rules git-imerge-1.2.0/debian/rules --- git-imerge-1.2.0/debian/rules 2023-08-13 06:53:53.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 $@ --buildsystem=pybuild