[flextra] 01/01: * Drop linking against libjasper. Not used (dynamically linked to gribapi) * Standards-Version: 3.9.7. No changes required

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/5.0-4
in repository flextra.

commit 36c55b6cf6ab59590d37f536337f2a185c5034fe
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Feb 29 15:00:06 2016 +0000

    * Drop linking against libjasper. Not used  (dynamically linked to gribapi)
    * Standards-Version:  3.9.7. No changes required
---
 debian/changelog              |  6 ++--
 debian/control                |  5 ++-
 debian/patches/makefile.patch | 73 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 4 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5104915..89f0c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-flextra (5.0-4) UNRELEASED; urgency=medium
+flextra (5.0-4) unstable; urgency=medium
 
   * Add git repo at debian-science to debian/control 
+  * Drop linking against libjasper. Not used  (dynamically linked to gribapi)
+  * Standards-Version:  3.9.7. No changes required
 
- -- Alastair McKinstry <mckinstry at debian.org>  Thu, 27 Aug 2015 09:55:08 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 29 Feb 2016 14:59:55 +0000
 
 flextra (5.0-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 25ff877..c56b9a5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,8 @@ Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), 
   gfortran (>= 4:5.2.1), 
-  libgrib-api-dev (>= 1.13.1-3), 
-  libjasper-dev
-Standards-Version: 3.9.6
+  libgrib-api-dev (>= 1.13.1-3)
+Standards-Version: 3.9.7
 Homepage: http://flexpart.eu/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/flextra.git
 
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
new file mode 100644
index 0000000..23ba86c
--- /dev/null
+++ b/debian/patches/makefile.patch
@@ -0,0 +1,73 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Changes needed to build on Debian.
+Forwarded: not-needed
+Last-Updated: 2016-02-29
+
+Index: flextra-5.0/makefile.ecmwf
+===================================================================
+--- flextra-5.0.orig/makefile.ecmwf
++++ flextra-5.0/makefile.ecmwf
+@@ -1,14 +1,13 @@
+ SHELL = /bin/bash
+-MAIN = FLEXTRA_ECMWF
++MAIN = flextra.ecmwf
+ INCF	= incl* 
+ #
+ 
+-INCPATH  = /nilu2/home/flexpart/lib64/absoft/include
+-LIBPATH1 = /nilu2/home/flexpart/lib64/absoft/lib
+-LIBPATH2 = /nilu2/home/flexpart/lib64/absoft/lib
+-FFLAGS   =   -O2 -s -I$(INCPATH) -p$(INCPATH) -m64 -mcmodel=medium
+-#FFLAGS   =  -g -Rb -Rc -Rs  -s  -I$(INCPATH) -p$(INCPATH) -m64 -mcmodel=medium
+-LDFLAGS  = $(FFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
++INCPATH  = /usr/include
++LIBPATH1 = /usr/lib
++LIBPATH2 = /usr/lib
++FFLAGS   = $(FCFLAGS) -fPIC  -fconvert=little-endian -frecord-marker=4  -I$(INCPATH) 
++LFLAGS  = $(FFLAGS) $(LDFLAGS) -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm
+ #
+ 
+ OBJECTS = caldate.o                openoutput.o \
+@@ -45,6 +44,6 @@ OBJECTS = caldate.o                openo
+ 
+ 
+ $(MAIN): $(OBJECTS)
+-	$(FC) *.o -o $(MAIN) $(LDFLAGS)
++	$(FC) *.o -o $(MAIN) $(LFLAGS)
+ $(OBJECTS): $(INCF)
+ 
+Index: flextra-5.0/makefile.gfs
+===================================================================
+--- flextra-5.0.orig/makefile.gfs
++++ flextra-5.0/makefile.gfs
+@@ -1,15 +1,14 @@
+ SHELL = /bin/bash
+-MAIN = FLEXTRA_GFS
++MAIN = flextra.gfs
+ INCF	= incl* 
+ #
+ 
+-FC       = /opt/absoft/bin/f95
+-INCPATH  = /nilu/home/flexpart/lib/grib_api/include
+-LIBPATH1 = /nilu/home/flexpart/lib/grib_api/lib
+-LIBPATH2 = /nilu/home/flexpart/lib/jasper/lib
+-#FFLAGS   =   -s  -B108  -YEXT_NAMES=LCS -I$(INCPATH)
+-FFLAGS   =  -g -Rb -Rc -Rs  -s  -B108  -YEXT_NAMES=LCS -I$(INCPATH) -p$(INCPATH)
+-LDFLAGS  = $(FFLAGS)  -L$(LIBPATH1) -L$(LIBPATH2) -lgrib_api_f77 -lgrib_api -lm -ljasper
++FC       = gfortran
++INCPATH  = /usr/include
++LIBPATH1 = /usr/lib
++LIBPATH2 = /usr/lib
++FFLAGS   = $(FCFLAGS) -fPIC -fconvert=little-endian -frecord-marker=4  -I$(INCPATH)
++LFLAGS  = $(FFLAGS) $(LDFLAGS) -L$(LIBPATH1) -L$(LIBPATH2) -lgrib_api_f77 -lgrib_api -lm
+ #
+ 
+ OBJECTS = caldate.o                openoutput.o \
+@@ -46,6 +45,6 @@ OBJECTS = caldate.o                openo
+ 
+ 
+ $(MAIN): $(OBJECTS)
+-	$(FC) *.o -o $(MAIN) $(LDFLAGS)
++	$(FC) *.o -o $(MAIN) $(LFLAGS)
+ $(OBJECTS): $(INCF)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..82374e5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+makefile.patch

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