On Sat, 27 Aug 2016 15:34:28 +0000 Santiago Vila <sanv...@debian.org> wrote: > Package: src:hg-git > Version: 0.8.5-3 > Severity: serious > > Dear maintainer: > > I tried to build this package in stretch with "dpkg-buildpackage -A" > (which is what the "Arch: all" autobuilder would do to build it) > but it failed: >
Proposing patch to fix this. Regards, Dimitri.
diff -Nru hg-git-0.8.5/debian/changelog hg-git-0.8.5/debian/changelog --- hg-git-0.8.5/debian/changelog 2016-05-27 14:21:17.000000000 +0100 +++ hg-git-0.8.5/debian/changelog 2016-09-15 15:02:05.000000000 +0100 @@ -1,3 +1,11 @@ +hg-git (0.8.5-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix test-suite failure with new git, different output from + git. Closes: #835611 + + -- Dimitri John Ledkov <x...@ubuntu.com> Thu, 15 Sep 2016 15:01:27 +0100 + hg-git (0.8.5-3) unstable; urgency=medium * Fix "FTBFS: AttributeError: 'overlaychangelog' object has no attribute diff -Nru hg-git-0.8.5/debian/patches/git-2.9.3-ftbfs.patch hg-git-0.8.5/debian/patches/git-2.9.3-ftbfs.patch --- hg-git-0.8.5/debian/patches/git-2.9.3-ftbfs.patch 1970-01-01 01:00:00.000000000 +0100 +++ hg-git-0.8.5/debian/patches/git-2.9.3-ftbfs.patch 2016-09-15 15:02:40.000000000 +0100 @@ -0,0 +1,20 @@ +Description: Fix test-suite failure with new git, different output from git +Author: Dimitri John Ledkov <x...@ubuntu.com> +Bug-Debian: https://bugs.debian.org/835611 + +--- hg-git-0.8.5.orig/tests/test-subrepos.t ++++ hg-git-0.8.5/tests/test-subrepos.t +@@ -16,11 +16,11 @@ Load commonly used test logic + $ git add alpha + $ fn_git_commit -m 'add alpha' + $ git submodule add ../gitsubrepo subrepo1 +- Cloning into 'subrepo1'... ++ Cloning into '$TESTTMP/gitrepo1/subrepo1'... + done. + $ fn_git_commit -m 'add subrepo1' + $ git submodule add ../gitsubrepo xyz/subrepo2 +- Cloning into 'xyz/subrepo2'... ++ Cloning into '$TESTTMP/gitrepo1/xyz/subrepo2'... + done. + $ fn_git_commit -m 'add subrepo2' + we are going to push to this repo from our hg clone, diff -Nru hg-git-0.8.5/debian/patches/series hg-git-0.8.5/debian/patches/series --- hg-git-0.8.5/debian/patches/series 2016-05-27 14:21:17.000000000 +0100 +++ hg-git-0.8.5/debian/patches/series 2016-09-15 15:02:26.000000000 +0100 @@ -1,2 +1,3 @@ from_upstream__overlay_add_changelogrevision.patch from_upstream__Update_test_to_keep_graph_output_stable_across_versions.patch +git-2.9.3-ftbfs.patch