[Pkg-gnupg-commit] [gnupg2] 01/03: preparing for 2.1.5-1 release

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch experimental
in repository gnupg2.

commit 33d1bdc322bcd2bc4e9db4a662f808f8c1815f47
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Jun 11 13:19:33 2015 -0400

    preparing for 2.1.5-1 release
---
 debian/changelog                                   |  6 +++++
 debian/patches/0001-rename-gnupg2.patch            |  4 +--
 ...-public-key-encryption-packet-error-prope.patch | 30 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 587c023..2f5815b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnupg2 (2.1.5-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Thu, 11 Jun 2015 13:18:56 -0400
+
 gnupg2 (2.1.4-2) experimental; urgency=medium
 
   * avoid excess dependencies on headless servers (Closes: #753163)
diff --git a/debian/patches/0001-rename-gnupg2.patch b/debian/patches/0001-rename-gnupg2.patch
index 1386f98..75bf237 100644
--- a/debian/patches/0001-rename-gnupg2.patch
+++ b/debian/patches/0001-rename-gnupg2.patch
@@ -7,7 +7,7 @@ Subject: rename gnupg2
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 58e35f4..e9c1c48 100644
+index 2e7125d..574dc9c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -25,7 +25,7 @@ min_automake_version="1.14"
@@ -18,7 +18,7 @@ index 58e35f4..e9c1c48 100644
 +m4_define([mym4_package],[gnupg2])
  m4_define([mym4_major], [2])
  m4_define([mym4_minor], [1])
- m4_define([mym4_micro], [4])
+ m4_define([mym4_micro], [5])
 @@ -72,7 +72,7 @@ NEED_GNUTLS_VERSION=3.0
  
  development_version=mym4_isbeta
diff --git a/debian/patches/0003-g10-detects-public-key-encryption-packet-error-prope.patch b/debian/patches/0003-g10-detects-public-key-encryption-packet-error-prope.patch
deleted file mode 100644
index 4d48fe3..0000000
--- a/debian/patches/0003-g10-detects-public-key-encryption-packet-error-prope.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: NIIBE Yutaka <gniibe at fsij.org>
-Date: Tue, 19 May 2015 10:32:07 +0900
-Subject: g10: detects public key encryption packet error properly.
-
-g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
-encryption.
----
- g10/mainproc.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/g10/mainproc.c b/g10/mainproc.c
-index e72d076..c90b9e3 100644
---- a/g10/mainproc.c
-+++ b/g10/mainproc.c
-@@ -406,12 +406,10 @@ proc_pubkey_enc (CTX c, PACKET *pkt)
-           c->dek = NULL;
- 	}
-     }
--  else if (is_ELGAMAL(enc->pubkey_algo)
--           || enc->pubkey_algo == PUBKEY_ALGO_DSA
--           || enc->pubkey_algo == PUBKEY_ALGO_ECDSA
--           || enc->pubkey_algo == PUBKEY_ALGO_EDDSA
-+  else if (enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E
-            || enc->pubkey_algo == PUBKEY_ALGO_ECDH
--           || is_RSA (enc->pubkey_algo)
-+           || enc->pubkey_algo == PUBKEY_ALGO_RSA
-+           || enc->pubkey_algo == PUBKEY_ALGO_RSA_E
-            || enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL)
-     {
-       /* Note that we also allow type 20 Elgamal keys for decryption.
diff --git a/debian/patches/series b/debian/patches/series
index bc11ee8..6a70d45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-rename-gnupg2.patch
 0002-avoid-beta-warning.patch
-0003-g10-detects-public-key-encryption-packet-error-prope.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git