[zygrib] 06/06: update patches

[Alastair McKinstry]

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

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

commit def669c8b9fcfecbcc0914df6d30b904ed0edf32
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jan 12 17:38:33 2017 +0000

    update patches
---
 debian/patches/as-needed.patch | 18 ++++++++--------
 debian/patches/paths.patch     | 48 +++++++++++++++---------------------------
 2 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/debian/patches/as-needed.patch b/debian/patches/as-needed.patch
index 2cb3ea6..2b5ba41 100644
--- a/debian/patches/as-needed.patch
+++ b/debian/patches/as-needed.patch
@@ -3,16 +3,16 @@ Description: Link only necessary libraries
 Forwarded: no
 Last-Updated: 2015-05-03
 
-Index: zygrib-7.0.0/Makefile
+Index: zygrib-8.0.1+dfsg.1/Makefile
 ===================================================================
---- zygrib-7.0.0.orig/Makefile
-+++ zygrib-7.0.0/Makefile
-@@ -36,7 +36,7 @@ zyGrib: $(SRC)
+--- zygrib-8.0.1+dfsg.1.orig/Makefile
++++ zygrib-8.0.1+dfsg.1/Makefile
+@@ -42,7 +42,7 @@ veryclean: clean
+ zyGrib: $(SRC)
  	@ echo
  	rm -f ./zyGrib
- 	cd src/qwt-6.0.1/src; $(QMAKE); make -j5
--	cd src; $(QMAKE); make -j5
-+	cd src; $(QMAKE); make -j5 LFLAGS=" -Wl,--as-needed"
+-	cd $(QWTDIR)/src; $(QMAKE); make -j6
++	cd $(QWTDIR)/src; $(QMAKE); make -j6 LFLAGS=" -Wl,--as-needed"
+ 	cd src/g2clib; make
+ 	cd src; $(QMAKE); make -j6
  	@ echo "-----------------------------------"
- 	@ echo "#!/bin/bash" >> ./zyGrib
- 	@ echo "cd `pwd`" >> ./zyGrib
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index 880db6c..0aeacd5 100644
--- a/debian/patches/paths.patch
+++ b/debian/patches/paths.patch
@@ -3,11 +3,11 @@ Desciption: Set the paths to locations on Debian
 Forwarded: not-needed
 Last-Updated:  2016-02-07
 
-Index: zygrib-7.0.0/src/util/Util.h
+Index: zygrib-8.0.1+dfsg.1/src/util/Util.h
 ===================================================================
---- zygrib-7.0.0.orig/src/util/Util.h
-+++ zygrib-7.0.0/src/util/Util.h
-@@ -71,15 +71,15 @@ class Util : public QObject
+--- zygrib-8.0.1+dfsg.1.orig/src/util/Util.h
++++ zygrib-8.0.1+dfsg.1/src/util/Util.h
+@@ -78,15 +78,15 @@ class Util : public QObject
  							const QString &dir, const QString &filter=QString());
  		
  	static QString pathData ()   {return "./";};
@@ -31,41 +31,27 @@ 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
+Index: zygrib-8.0.1+dfsg.1/src/zyGrib.pro
 ===================================================================
---- zygrib-7.0.0.orig/src/zyGrib.pro
-+++ zygrib-7.0.0/src/zyGrib.pro
-@@ -5,14 +5,14 @@ TEMPLATE = app
+--- zygrib-8.0.1+dfsg.1.orig/src/zyGrib.pro
++++ zygrib-8.0.1+dfsg.1/src/zyGrib.pro
+@@ -8,7 +8,7 @@ TEMPLATE = app
  TARGET   = zyGrib
  
  DEPENDPATH  += . util map GUI
--INCLUDEPATH += . util map GUI curvedrawer qwt-6.0.1/src
+-INCLUDEPATH += . util map GUI curvedrawer qwt-6.1.3/src g2clib
 +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-qt5
+@@ -35,8 +35,8 @@ else {
  }
  }
+ 
+-LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.1.3/lib/ -lqwt
+-LIBS +=  -Lg2clib -lg2c -lpng -ljasper  # respect order!
++LIBS += -lbz2 -lz -lproj -lnova -lqwt-qt5
++LIBS +=  -Lg2clib -lg2c -lpng   # respect order!
+ 
  # ----------------------------------------------------
+ CFLAGS += -std=c99 

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