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

[vicho at users.alioth.debian.org]

    Date: Sunday, October 23, 2016 @ 16:18:24
  Author: vicho
Revision: 13626

Remove deb_specific__use_gpg_21_keys_for_test.patch as test-gpg now
migrates the secret keys at the beginning of the test

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2016-10-23 15:16:30 UTC (rev 13625)
+++ packages/mercurial/trunk/debian/changelog	2016-10-23 16:18:24 UTC (rev 13626)
@@ -1,6 +1,8 @@
 mercurial (4.0~rc1-1) UNRELEASED; urgency=medium
 
   * First release candidate for mercurial 4.0
+  * Remove deb_specific__use_gpg_21_keys_for_test.patch as test-gpg now
+    migrates the secret keys at the beginning of the test
 
  -- Javi Merino <vicho at debian.org>  Sun, 23 Oct 2016 15:56:41 +0100
 

Deleted: 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	2016-10-23 15:16:30 UTC (rev 13625)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_gpg_21_keys_for_test.patch	2016-10-23 16:18:24 UTC (rev 13626)
@@ -1,21 +0,0 @@
-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
-@@ -35,6 +35,10 @@ and migrate secret keys
-   $ 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-10-23 15:16:30 UTC (rev 13625)
+++ packages/mercurial/trunk/debian/patches/series	2016-10-23 16:18:24 UTC (rev 13626)
@@ -5,4 +5,3 @@
 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