[SCM] krita packaging branch, master, updated. debian/3.0.1+dfsg-1-11-g7df7623

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/calligra/krita.git;a=commitdiff;h=0d81a8b

The following commit has been merged in the master branch:
commit 0d81a8b5de8d1f59316cbc6ff4722c7ad1ba3240
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 23 13:27:37 2016 +0100

    enable the OpenEXR support again
    
    it seems the conflict with Eigen3 headers is gone
    
    add libopenexr-dev B-D
---
 debian/changelog | 3 +++
 debian/control   | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c60b17..29b2c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ krita (1:3.1.1+dfsg-0r1) UNRELEASED; urgency=medium
     - stop removing the Breeze color schemes, they are not installed anymore
   * Suggest ffmpeg, used for the video export.
   * Update lintian overrides.
+  * Enable the OpenEXR support again -- it seems the conflict with Eigen3
+    headers is gone
+    - add the libopenexr-dev build dependency
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 Dec 2016 23:34:50 +0100
 
diff --git a/debian/control b/debian/control
index b63d906..74cf4d8 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,7 @@ Build-Depends: cmake (>= 2.8.12),
                libjpeg-dev,
                liblcms2-dev,
                libopencolorio-dev,
-# conflicts with eigen3
-#               libopenexr-dev,
+               libopenexr-dev,
                libpng-dev,
                libpoppler-qt5-dev,
                libraw-dev,

-- 
krita packaging