[metview] 74/97: Now B-D on libopenjpeg-dev rather than conflict

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository metview.

commit 9659098fcf7528baa5d2e2a3595e18101203a9ab
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 6 21:02:57 2015 +0100

    Now B-D on libopenjpeg-dev rather than conflict
---
 debian/changelog | 3 ++-
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a082597..18eb57a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-metview (4.5.3-1) experimental; urgency=medium
+metview (4.5.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Move to cmake-based build
@@ -6,6 +6,7 @@ metview (4.5.3-1) experimental; urgency=medium
   * syserrlist.patch temporarily disabled
   * no-m32 patch temporarily disabled.
   * Need to build-depend on libgrib-api-tools
+  * Now B-D on openjpeg-dev. 
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 02 May 2015 13:34:23 +0100
 
diff --git a/debian/control b/debian/control
index 69986b4..8746455 100644
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,9 @@ Build-Depends: debhelper (>= 9), gfortran,
   libmotif-dev, libxmu-dev, libgdbm-dev, libcurl4-gnutls-dev,
   libcairo2-dev, pkg-config, swig, libexpat1-dev,
   libterralib-dev, ksh, libproj-dev,
-  libgd-dev, imagemagick, libjasper-dev, libnetcdf-dev,
+  libgd-dev, imagemagick, libnetcdf-dev, libopenjpeg-dev,
   scm [!arm64 !ppc64], cmake
-Build-Conflicts: lesstif2-dev, libopenjpeg-dev
+Build-Conflicts: lesstif2-dev
 Standards-Version: 3.9.6
 Homepage: https://software.ecmwf.int/wiki/display/METV/Home
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/metview.git

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