[Pkg-gnupg-commit] [gnupg1] 12/15: use breaks+replaces instead of conflicts for clashing gnupg1.info

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg1.

commit 6f9b319e9b014071d7c9ee0232f34e539a9d003e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Aug 3 13:46:27 2016 -0400

    use breaks+replaces instead of conflicts for clashing gnupg1.info
---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index cb87978..12ae6a6 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Architecture: any
 Multi-Arch: foreign
 Depends: gpgv | gpgv1, ${misc:Depends}, ${shlibs:Depends}
 Recommends: gnupg1-curl, ${shlibs:Recommends}
-Conflicts: gnupg (<< 1.4.20-6+exp1)
+Breaks: gnupg (<< 1.4.20-6+exp1)
+Replaces: 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/gnupg1.git