[med-svn] [ncbi-entrez-direct] 02/04: debian/control: Remove annotations from conflicts here. (Oops.)

[Aaron M. Ucko]

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

ucko pushed a commit to branch master
in repository ncbi-entrez-direct.

commit 415aaef1a339f9789b4f52b9ac60ed3211a731aa
Author: Aaron M. Ucko <ucko at debian.org>
Date:   Sat Dec 24 23:48:19 2016 -0500

    debian/control: Remove annotations from conflicts here.  (Oops.)
---
 debian/changelog | 3 ++-
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a4f47d..fc393da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ncbi-entrez-direct (5.90.20161221+ds-4) UNRELEASED; urgency=medium
 
   * NOT YET RELEASED.
+  * debian/control: Remove annotations from conflicts here.  (Oops.)
 
- -- Aaron M. Ucko <ucko at debian.org>  Sat, 24 Dec 2016 23:47:22 -0500
+ -- Aaron M. Ucko <ucko at debian.org>  Sat, 24 Dec 2016 23:48:18 -0500
 
 ncbi-entrez-direct (5.90.20161221+ds-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d800149..3b0b63d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Depends: libwww-perl,
          ${misc:Depends},
 	 ${perl:Depends},
          ${shlibs:Depends}
-Conflicts: acedb-other (over efetch), epub-utils (over einfo).
+Conflicts: acedb-other, epub-utils
 Description: NCBI Entrez utilities on the command line
  Entrez Direct (EDirect) is an advanced method for accessing NCBI's set
  of interconnected databases (publication, sequence, structure, gene,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ncbi-entrez-direct.git