Package: release.debian.org Severity: normal Tags: buster User: release.debian....@packages.debian.org Usertags: pu X-Debbugs-Cc: roehl...@debian.org
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Dear release team, this is an proposed update for buster. [ Reason ] This update fixes the RC stable bug #933100 (broken test suite) that was caused by a change in the git command output after the initial upload of version 0.8.12-1. [ Impact ] The issue makes the autopkgtest suite fail and thus affects updates to buster which involve hg-git. There is no user-visible change. [ Tests ] I verified that the change actually fixes the test suite with a rebuild in a buster chroot. [ Risks ] There is no functional change in the binary package, this update affects the build itself only. If this update is considered inappropriate, the severity of bug #933100 could be downgraded instead. [ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable [ Changes ] tests/test-illegal-contents.t is patched with the minimal changes from upstream to fix the test suite. [ Other Info ] The change in d/gbp.conf tells git-buildpackage that the proposed update lives in a different branch and has zero impact on the package itself. -----BEGIN PGP SIGNATURE----- iQGzBAEBCgAdFiEEJvtDgpxjkjCIVtam+C8H+466LVkFAmDRllAACgkQ+C8H+466 LVkKsgv/Wit7oJnTht1N/a13lxNlBQYJhLsTHrZsgM6GL6R0bWmxanbAxPYei9b2 uPmjlyJgl+xSepHrWrHB2CavogjoCCZY9vR93vQ/slAdipRRv4SlagjPgpcUA6IL aOOIg95Kg6qZbMgmqg/nHpe0Y76JZ5RCTlZ5JMK30CT2HKCL8i9TVtDbFzSLZKWE qHQulq1KM2+ZzDCzwe7yCE1eppkFVkKMqmD0C8CFxWYZzd5WUzW4DGwTjiqSIpRu R84yU7K3b0BrX5ORfx6an9YbmAfa9bm1fvDnXe1SxPAC65RgfceCbfbhtiazuBSG pwVARdoI9ZzB4bydCjKRn0AxzhDolkq7iOmbH1EGGmc3Q5JVTbXS0Chof4k95roq x6vbalRkg4e0jtUa4TUbwtkC4FwDP22UtGFrgS0gwqhpPPECvS68kr5N2/2DCjXS M60d0y3c/4EY2t5NWZM6m044fZfBeXgV73xzWSxcQ79sfHIyb3WsEkuJdBweRh1W p6k/IFZY =BIAh -----END PGP SIGNATURE-----
diff -Nru hg-git-0.8.12/debian/changelog hg-git-0.8.12/debian/changelog --- hg-git-0.8.12/debian/changelog 2019-01-10 15:26:54.000000000 +0100 +++ hg-git-0.8.12/debian/changelog 2021-06-22 09:23:36.000000000 +0200 @@ -1,3 +1,10 @@ +hg-git (0.8.12-1+deb10u1) buster; urgency=medium + + * Team upload. + * Cherry-pick relaxed output check in test suite (Closes: #933100) + + -- Timo Röhling <roehl...@debian.org> Tue, 22 Jun 2021 09:23:36 +0200 + hg-git (0.8.12-1) unstable; urgency=medium * Team upload diff -Nru hg-git-0.8.12/debian/gbp.conf hg-git-0.8.12/debian/gbp.conf --- hg-git-0.8.12/debian/gbp.conf 2019-01-10 15:26:54.000000000 +0100 +++ hg-git-0.8.12/debian/gbp.conf 2021-06-22 09:06:19.000000000 +0200 @@ -1,2 +1,2 @@ [DEFAULT] -debian-branch=debian/master +debian-branch=debian/buster diff -Nru hg-git-0.8.12/debian/patches/0005-Relax-output-check-in-test-suite.patch hg-git-0.8.12/debian/patches/0005-Relax-output-check-in-test-suite.patch --- hg-git-0.8.12/debian/patches/0005-Relax-output-check-in-test-suite.patch 1970-01-01 01:00:00.000000000 +0100 +++ hg-git-0.8.12/debian/patches/0005-Relax-output-check-in-test-suite.patch 2021-06-22 09:15:54.000000000 +0200 @@ -0,0 +1,30 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= <roehl...@debian.org> +Date: Tue, 22 Jun 2021 09:15:45 +0200 +Subject: Relax output check in test suite + +--- + tests/test-illegal-contents.t | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/tests/test-illegal-contents.t b/tests/test-illegal-contents.t +index 98c8ee6..312c1df 100644 +--- a/tests/test-illegal-contents.t ++++ b/tests/test-illegal-contents.t +@@ -45,10 +45,15 @@ We can override if needed: + It may not be legal to check out in Git. + It may also be rejected by some git server configurations. + $ cd .. +- $ git clone hg/.hg/git git ++ $ git clone hg/.hg/git git || true + Cloning into 'git'... + done. +- error: Invalid path 'nested/.git/hooks/post-update' ++ error: [Ii]nvalid path 'nested/.git/hooks/post-update' (re) ++ fatal: unable to checkout working tree (?) ++ warning: Clone succeeded, but checkout failed. (?) ++ You can inspect what was checked out with 'git status' (?) ++ and retry( the checkout)? with '.*' (re) (?) ++ (?) + + Now check something that case-folds to .git, which might let you own + Mac users: diff -Nru hg-git-0.8.12/debian/patches/series hg-git-0.8.12/debian/patches/series --- hg-git-0.8.12/debian/patches/series 2019-01-10 15:26:54.000000000 +0100 +++ hg-git-0.8.12/debian/patches/series 2021-06-22 09:15:54.000000000 +0200 @@ -2,3 +2,4 @@ ae6b1ba7482963bc9de51f299891e99005794e4e.patch 143b7511eadbea7507d847c805241a6db290ffe7.patch 8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6.patch +0005-Relax-output-check-in-test-suite.patch
