[med-svn] [ncbi-entrez-direct] 03/05: Conflicts: acedb-other (over efetch), epub-utils (over einfo).

[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 62e651fa70d2ddcf6748a4e9d8772594c81c1e63
Author: Aaron M. Ucko <ucko at debian.org>
Date:   Sat Dec 24 23:25:07 2016 -0500

    Conflicts: acedb-other (over efetch), epub-utils (over einfo).
---
 debian/changelog | 3 ++-
 debian/control   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b3c1f5d..9ace3ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ncbi-entrez-direct (5.90.20161221+ds-3) UNRELEASED; urgency=medium
   * NOT YET RELEASED.
   * debian/control:
     - Build-Depends: Correct syntax for multiple exclusions.
+    - Conflicts: acedb-other (over efetch), epub-utils (over einfo).
 
- -- Aaron M. Ucko <ucko at debian.org>  Sat, 24 Dec 2016 23:24:29 -0500
+ -- Aaron M. Ucko <ucko at debian.org>  Sat, 24 Dec 2016 23:25:05 -0500
 
 ncbi-entrez-direct (5.90.20161221+ds-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index f3a9291..d800149 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Depends: libwww-perl,
          ${misc:Depends},
 	 ${perl:Depends},
          ${shlibs:Depends}
+Conflicts: acedb-other (over efetch), epub-utils (over einfo).
 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