[Pkg-gnupg-commit] [gnupg] 01/01: corrected Conflicts with older gnupg binaries (Closes: #821910)

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg.

commit 165850d676f25c80d6836ae01773dc0a3ace0693
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Apr 22 00:07:37 2016 -0400

    corrected Conflicts with older gnupg binaries (Closes: #821910)
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index acb69ab..d516bc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnupg (1.4.20-6+exp2) experimental; urgency=medium
+
+  * corrected Conflicts with older gnupg binaries (Closes: #821910)
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Fri, 22 Apr 2016 00:06:39 -0400
+
 gnupg (1.4.20-6+exp1) experimental; urgency=medium
 
   * ship binary packages gpgv1 and gnupg1, since gnupg2 source package is
diff --git a/debian/control b/debian/control
index 99be58b..a671d82 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Architecture: any
 Multi-Arch: foreign
 Depends: gpgv | gpgv1, ${misc:Depends}, ${shlibs:Depends}
 Recommends: gnupg1-curl, ${shlibs:Recommends}
-Conflicts: gnupg (<< 1.4.20-5+exp1)
+Conflicts: gnupg (<< 1.4.20-6+exp1)
 Suggests: gnupg-doc, libpcsclite1, parcimonie, xloadimage | imagemagick | eog
 Description: GNU privacy guard - a free PGP replacement ("classic" version)
  GnuPG is GNU's tool for secure communication and data storage.

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