[Python-apps-commits] r13584 - in packages/mercurial/trunk/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Friday, September 2, 2016 @ 21:03:38
  Author: vicho
Revision: 13584

Fix "FTBFS: Tests failures" by fixing test-gpg.t's output to take into account gpg 2.1's messages when importing classic gpg keyring files. (Closes: #835730)

Added:
  packages/mercurial/trunk/debian/patches/deb_specific__use_gpg_21_keys_for_test.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2016-09-02 21:03:29 UTC (rev 13583)
+++ packages/mercurial/trunk/debian/changelog	2016-09-02 21:03:38 UTC (rev 13584)
@@ -1,6 +1,9 @@
 mercurial (3.9.1-1) UNRELEASED; urgency=medium
 
   * New upstream release signed with a new gpg key
+  * Fix "FTBFS: Tests failures" by fixing test-gpg.t's output to take into
+    account gpg 2.1's messages when importing classic gpg keyring files.
+    (Closes: #835730)
 
  -- Javi Merino <vicho at debian.org>  Fri, 02 Sep 2016 09:17:02 +0300
 

Added: packages/mercurial/trunk/debian/patches/deb_specific__use_gpg_21_keys_for_test.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_gpg_21_keys_for_test.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_gpg_21_keys_for_test.patch	2016-09-02 21:03:38 UTC (rev 13584)
@@ -0,0 +1,21 @@
+Description: Fix gpg test output to match gpg 2.1
+ The gpg test uses private/public keyring like "classic" gpg.  Debian
+ has moved to "modern" gpg, which automatically migrates the key on
+ first use, and it spits it out on first invocation.
+Author: Javi Merino <vicho at debian.org>
+Bug-Debian: http://bugs.debian.org/835730
+Forwarded: not-needed
+
+--- a/tests/test-gpg.t
++++ b/tests/test-gpg.t
+@@ -18,6 +18,10 @@ Test the GPG extension
+   $ hg sigs
+ 
+   $ HGEDITOR=cat hg sign -e 0
++  gpg: starting migration from earlier GnuPG versions
++  gpg: porting secret keys from '*/tests/gpg/secring.gpg' to gpg-agent (glob)
++  gpg: key A22D09A74E24F1F2: secret key imported
++  gpg: migration succeeded
+   signing 0:e63c23eaa88a
+   Added signature for changeset e63c23eaa88a
+   

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2016-09-02 21:03:29 UTC (rev 13583)
+++ packages/mercurial/trunk/debian/patches/series	2016-09-02 21:03:38 UTC (rev 13584)
@@ -5,3 +5,4 @@
 deb_specific__disable_libdir_replacement.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 deb_specific__fix_fhs_paths.patch
+deb_specific__use_gpg_21_keys_for_test.patch