[zygrib] 04/22: Update patches

[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 c43aa84d99df45791f40422f6581350f781177c5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 4 10:54:34 2015 +0100

    Update patches
---
 debian/patches/as-needed.patch |  2 +-
 debian/patches/paths.patch     | 40 +++++++++++++++++++++++++++++++++++++++-
 debian/patches/qt5.patch       |  5 +++++
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
index a2e1ffe..2cb3ea6 100644
--- a/debian/patches/as-needed.patch
+++ b/debian/patches/as-needed.patch
@@ -1,7 +1,7 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Link only necessary libraries
 Forwarded: no
-Last-Updated: 2014-04-17
+Last-Updated: 2015-05-03
 
 Index: zygrib-7.0.0/Makefile
 ===================================================================
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index 02a96fc..7fa5670 100644
--- a/debian/patches/paths.patch
+++ b/debian/patches/paths.patch
@@ -1,7 +1,7 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Desciption: Set the paths to locations on Debian
 Forwarded: not-needed
-Last-Updated:  2014-04-16
+Last-Updated:  2015-05-03
 
 Index: zygrib-7.0.0/src/util/Util.h
 ===================================================================
@@ -31,3 +31,41 @@ Index: zygrib-7.0.0/src/util/Util.h
  	static QString getServerName ();
  
      static void     setSetting (const QString &key, const QVariant &value);
+Index: zygrib-7.0.0/src/zyGrib.pro
+===================================================================
+--- zygrib-7.0.0.orig/src/zyGrib.pro
++++ zygrib-7.0.0/src/zyGrib.pro
+@@ -5,14 +5,14 @@ TEMPLATE = app
+ TARGET   = zyGrib
+ 
+ DEPENDPATH  += . util map GUI
+-INCLUDEPATH += . util map GUI curvedrawer qwt-6.0.1/src
++INCLUDEPATH += . util map GUI curvedrawer 
+ 
+ # ----------------------------------------------------
+ # platform specific
+ # ----------------------------------------------------
+ win32 {
+ 	INCLUDEPATH += C:/libs/include/
+-	LIBS += -LC:/libs/lib/ -lbz2 -lz -lproj -lnova -Lqwt-6.0.1/lib/ -lqwt
++	LIBS += -LC:/libs/lib/ -lbz2 -lz -lproj -lnova -lqwt
+ 	DESTDIR = release
+ 	RC_FILE += resource.rc
+ }
+@@ -20,14 +20,14 @@ else {
+ macx {
+ 	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+ 	INCLUDEPATH += /opt/local/include/
+-	LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.0.1/lib/ -lqwt
++	LIBS += -lbz2 -lz -lproj -lnova  -lqwt
+ 	DESTDIR = ..
+ 	CONFIG += i386
+ 	ICON = ../data/img/zyGrib.icns
+ }
+ else {
+ 	DESTDIR = .
+-	LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.0.1/lib/ -lqwt
++	LIBS += -lbz2 -lz -lproj -lnova  -lqwt
+ }
+ }
+ # ----------------------------------------------------
diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index 665312d..b72298d 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -1,3 +1,8 @@
+Description: Transition from QT4 to QT5
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2015-05-03
+Forwarded: no
+
 Index: zygrib-7.0.0/Makefile
 ===================================================================
 --- zygrib-7.0.0.orig/Makefile

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