[metview] 05/06: Enable Qt5 upstream

[Alastair McKinstry]

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

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

commit bf33041ac8ed648664c6eedfacb3b9c24a0dfd40
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 21 12:52:51 2015 +0100

    Enable Qt5 upstream
---
 debian/changelog                 | 1 +
 debian/patches/mv_compress.patch | 6 +++---
 debian/patches/series            | 2 +-
 debian/rules                     | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 027be0a..bd2cee3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 metview (4.5.7-1) UNRELEASED; urgency=medium
 
   * New upstream release. 
+   - Qt5 now merged upstream.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 20 Oct 2015 20:01:18 +0100
 
diff --git a/debian/patches/mv_compress.patch b/debian/patches/mv_compress.patch
index d7146f5..643acee 100644
--- a/debian/patches/mv_compress.patch
+++ b/debian/patches/mv_compress.patch
@@ -1,7 +1,7 @@
-Index: metview-4.5.6/scripts/mv_compress
+Index: metview-4.5.7/scripts/mv_compress
 ===================================================================
---- metview-4.5.6.orig/scripts/mv_compress
-+++ metview-4.5.6/scripts/mv_compress
+--- metview-4.5.7.orig/scripts/mv_compress
++++ metview-4.5.7/scripts/mv_compress
 @@ -25,7 +25,7 @@ text_ERR="ERROR: script `basename $0` FA
  
  #The original version of this function was taken from: 
diff --git a/debian/patches/series b/debian/patches/series
index 65653cc..47111fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ fix-paths.patch
 fix-scripts.patch
 cmake-fixes.patch
 mv_compress.patch
-qt5.patch
+# qt5.patch
diff --git a/debian/rules b/debian/rules
index b9df1b3..80bd8a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,8 @@ override_dh_auto_configure:
 		-DMAGICS_PATH=/usr \
 		-DBUILD_SHARED_LIBS=On \
 		-DENABLE_RPATHS=Off \
-		-DFLEXTRA_PATH=/usr/bin/flextra
+		-DFLEXTRA_PATH=/usr/bin/flextra \
+		-DENABLE_QT5=On 
 	for f in ${AUTOGENERATED} ; do \
                 sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
                 done

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