[zygrib] 10/22: Changes for qt5, qwt6 compilation

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/8.0.1-1
in repository zygrib.

commit 50bcd0477cf052a9cee056f01edc3fbc7c2da33a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Oct 16 14:51:09 2015 +0100

    Changes for qt5, qwt6 compilation
---
 debian/patches/qt5.patch | 99 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index 9d2f381..36ef125 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -55,6 +55,13 @@ Index: zygrib-7.0.0/src/zyGrib.pro
 ===================================================================
 --- zygrib-7.0.0.orig/src/zyGrib.pro
 +++ zygrib-7.0.0/src/zyGrib.pro
+@@ -1,5 +1,5 @@
+ CONFIG += qt release
+-# CONFIG += qt debug console
++# CONFIG += qt debug console
+ 
+ TEMPLATE = app
+ TARGET   = zyGrib
 @@ -11,7 +11,7 @@ INCLUDEPATH += . util map GUI curvedrawe
  # platform specific
  # ----------------------------------------------------
@@ -73,6 +80,98 @@ Index: zygrib-7.0.0/src/zyGrib.pro
  
  CODECFORTR = UTF-8
  CODECFORSRC = UTF-8
+@@ -109,10 +109,10 @@ HEADERS += \
+            FileLoaderGRIB.h \
+            FileLoaderIAC.h \
+            FileLoaderMBLUE.h \
+-           Font.h \
+-           GshhsRangsReader.h \
+-           GshhsReader.h \
+-           GisReader.h \
++           util/Font.h \
++           map/GshhsRangsReader.h \
++           map/GshhsReader.h \
++           map/GisReader.h \
+            GribAnimator.h \
+            GribPlot.h \
+            GribReader.h \
+@@ -138,19 +138,19 @@ HEADERS += \
+            MainWindow.h \
+            MapDrawer.h \
+            MenuBar.h \
+-           Orthodromie.h \
+-           POI.h \
+-           POI_Editor.h \
+-           PositionEditor.h \
+-           Projection.h \
+-           Settings.h \
++           util/Orthodromie.h \
++           map/POI.h \
++           map/POI_Editor.h \
++           map/PositionEditor.h \
++           map/Projection.h \
++           util/Settings.h \
+            SkewT.h \
+-           SylkFile.h \
++           util/SylkFile.h \
+            Terrain.h \
+            Therm.h \
+-           Util.h \
++           util/Util.h \
+            Version.h \
+-           zuFile.h
++           util/zuFile.h
+ 
+ SOURCES += \
+ 			 GUI/PositionEditorWidget.cpp \
+@@ -188,15 +188,15 @@ SOURCES += \
+            FileLoaderGRIB.cpp \
+            FileLoaderIAC.cpp \
+            FileLoaderMBLUE.cpp \
+-           Font.cpp \
++           util/Font.cpp \
+ 		   GriddedPlotter.cpp \
+ 		   GriddedReader.cpp \
+ 		   GriddedRecord.cpp \
+-           GshhsRangsReader.cpp \
+-           GshhsReader.cpp \
++           map/GshhsRangsReader.cpp \
++           map/GshhsReader.cpp \
+            GribAnimator.cpp \
+            GribPlot.cpp \
+-           GisReader.cpp \
++           map/GisReader.cpp \
+            GribReader.cpp \
+            GribRecord.cpp \
+            IacPlot.cpp \
+@@ -215,18 +215,18 @@ SOURCES += \
+            MeteoTable.cpp \
+            MeteoTableWidget.cpp \
+            MeteotableOptionsDialog.cpp \
+-           Orthodromie.cpp \
+-           POI.cpp \
+-           POI_Editor.cpp \
+-           PositionEditor.cpp \
+-           Projection.cpp \
+-           Projection_libproj.cpp \
+-           Settings.cpp \
++           util/Orthodromie.cpp \
++           map/POI.cpp \
++           map/POI_Editor.cpp \
++           map/PositionEditor.cpp \
++           map/Projection.cpp \
++           map/Projection_libproj.cpp \
++           util/Settings.cpp \
+            SkewT.cpp \
+            SkewTWindow.cpp \
+            Terrain.cpp \
+            Therm.cpp \
+-           Util.cpp \
+-           zuFile.cpp
++           util/Util.cpp \
++           util/zuFile.cpp
+ 
+ 
 Index: zygrib-7.0.0/src/DialogSelectMetar.cpp
 ===================================================================
 --- zygrib-7.0.0.orig/src/DialogSelectMetar.cpp

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