[Python-apps-commits] r13601 - in packages/hg-git/trunk/debian (3 files)

[xnox at users.alioth.debian.org]

    Date: Thursday, September 15, 2016 @ 14:13:35
  Author: xnox
Revision: 13601

* Team upload.
* Fix test-suite failure with new git, different output from
  git. Closes: #835611

Added:
  packages/hg-git/trunk/debian/patches/git-2.9.3-ftbfs.patch
Modified:
  packages/hg-git/trunk/debian/changelog
  packages/hg-git/trunk/debian/patches/series

Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog	2016-09-13 16:24:40 UTC (rev 13600)
+++ packages/hg-git/trunk/debian/changelog	2016-09-15 14:13:35 UTC (rev 13601)
@@ -1,3 +1,11 @@
+hg-git (0.8.5-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix test-suite failure with new git, different output from
+    git. Closes: #835611
+
+ -- Dimitri John Ledkov <xnox at 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

Added: packages/hg-git/trunk/debian/patches/git-2.9.3-ftbfs.patch
===================================================================
--- packages/hg-git/trunk/debian/patches/git-2.9.3-ftbfs.patch	                        (rev 0)
+++ packages/hg-git/trunk/debian/patches/git-2.9.3-ftbfs.patch	2016-09-15 14:13:35 UTC (rev 13601)
@@ -0,0 +1,20 @@
+Description: Fix test-suite failure with new git, different output from git
+Author: Dimitri John Ledkov <xnox at 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,

Modified: packages/hg-git/trunk/debian/patches/series
===================================================================
--- packages/hg-git/trunk/debian/patches/series	2016-09-13 16:24:40 UTC (rev 13600)
+++ packages/hg-git/trunk/debian/patches/series	2016-09-15 14:13:35 UTC (rev 13601)
@@ -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