[eccodes] 27/106: Conflict more

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository eccodes.

commit c0ed5da40aaa0092da30bfde261184703fb8578d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jul 29 05:27:33 2016 +0100

    Conflict more
---
 debian/control | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 3ac572a..779b486 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), dh-buildinfo, cmake,
   libboost-dev, libhdf5-dev,
   libaec-dev,
   libopenjp2-7-dev
-Build-Conflicts: libopenjpeg-dev
+Build-Conflicts: libopenjpeg-dev, libgrib-api-dev
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.7
 Homepage: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
@@ -28,7 +28,8 @@ Description: GRIB and BUFR enecoding/encoding software library
 Package: libeccodes-dev
 Section: libdevel
 Architecture: any
-Depends: libeccodes0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libeccodes0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+  libaec-dev, libpng-dev, libjpeg-dev, zlib1g-dev
 Conflicts: libgrib-api-dev
 Description: GRIB and BUFR decoding/encoding software library (development)
  ecCodes is the ECMWF encoding/decoding software for GRIB and BUFR.
@@ -52,6 +53,7 @@ Package: python3-eccodes
 Section: python
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}
+Conflicts: libgrib-api-dev
 Provides: ${python3:Provides}
 Description: Python module for the ECMWF GRIB API library
  ecCodes is the ECMWF encoding/decoding software for GRIB and BUFR.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eccodes.git