Commit 782a2547 authored by Alastair McKinstry's avatar Alastair McKinstry

* Remove -ljasper as unnecessary. libjasper is being removed from Debian

as obsolete and  unsupported
* Move to Standards-Version: 3.9.7
parent b6c643bd
flexpart (9.02-12) unstable; urgency=medium
* Remove -ljasper as unnecessary. libjasper is being removed from Debian
as obsolete and unsupported
* Move to Standards-Version: 3.9.7
-- Alastair McKinstry <mckinstry@debian.org> Mon, 29 Feb 2016 15:37:20 +0000
flexpart (9.02-11) unstable; urgency=medium
* Rebuild for gfortran, grib_api.mod change. Closes: #777851.
......
......@@ -4,9 +4,8 @@ Priority: optional
Maintainer: Alastair McKinstry <mckinstry@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://transport.nilu.no/flexpart
Vcs-Git: git://anonscm.debian.org/debian-science/packages/flexpart.git
......
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Makefile changes needed for Debian
Last-Updated: 2013-12-14
Last-Updated: 2016-02-29
Forwarded: not-needed
Index: flexpart-9.02/makefile.gfs_gfortran
===================================================================
--- flexpart-9.02.orig/makefile.gfs_gfortran 2013-12-14 11:16:12.000000000 +0000
+++ flexpart-9.02/makefile.gfs_gfortran 2013-12-14 11:16:12.000000000 +0000
--- flexpart-9.02.orig/makefile.gfs_gfortran
+++ flexpart-9.02/makefile.gfs_gfortran
@@ -1,14 +1,14 @@
SHELL = /bin/bash
-MAIN = FLEXPART_GFS_GFORTRAN
......@@ -24,11 +24,11 @@ Index: flexpart-9.02/makefile.gfs_gfortran
+LIBPATH1 = /usr/lib
+LIBPATH2 =
+FFLAGS = -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+LFLAGS:= $(LDFLAGS) $(FFLAGS) -L$(LIBPATH1) -Wl,--as-needed -lgrib_api_f90 -lgrib_api -lm -ljasper
+LFLAGS:= $(LDFLAGS) $(FFLAGS) -L$(LIBPATH1) -Wl,--as-needed -lgrib_api_f90 -lgrib_api -lm
#
MODOBJS = \
@@ -78,7 +78,7 @@
@@ -78,7 +78,7 @@ dynamic_viscosity.o get_settling.o
$(MAIN): $(MODOBJS) $(OBJECTS)
......@@ -37,7 +37,7 @@ Index: flexpart-9.02/makefile.gfs_gfortran
$(OBJECTS): $(MODOBJS)
@@ -86,5 +86,5 @@
@@ -86,5 +86,5 @@ $(OBJECTS): $(MODOBJS)
$(FC) -c $(FFLAGS) $<
clean:
......@@ -46,8 +46,8 @@ Index: flexpart-9.02/makefile.gfs_gfortran
Index: flexpart-9.02/makefile.ecmwf_gfortran
===================================================================
--- flexpart-9.02.orig/makefile.ecmwf_gfortran 2013-12-14 11:16:12.000000000 +0000
+++ flexpart-9.02/makefile.ecmwf_gfortran 2013-12-14 11:16:45.000000000 +0000
--- flexpart-9.02.orig/makefile.ecmwf_gfortran
+++ flexpart-9.02/makefile.ecmwf_gfortran
@@ -1,15 +1,14 @@
SHELL = /bin/bash
-MAIN = FLEXPART_GFORTRAN
......@@ -66,12 +66,12 @@ Index: flexpart-9.02/makefile.ecmwf_gfortran
+LIBPATH1 = /usr/lib
+LIBPATH2 =
+FFLAGS = -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+LFLAGS = $(LDFLAGS) $(FFLAGS) -Wl,--as-needed -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
+LFLAGS = $(LDFLAGS) $(FFLAGS) -Wl,--as-needed -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm
+MODPATH = /usr/include
#
MODOBJS = \
@@ -79,13 +78,13 @@
@@ -79,13 +78,13 @@ dynamic_viscosity.o get_settling.o
$(MAIN): $(MODOBJS) $(OBJECTS)
......
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Pass $(FCFLAGS) so mcmodel params can be set
Last-Updated: 2016-02-29
Forwarded: not-needed
Index: flexpart-9.02/makefile.ecmwf_gfortran
===================================================================
--- flexpart-9.02.orig/makefile.ecmwf_gfortran 2013-12-15 10:55:46.000000000 +0000
+++ flexpart-9.02/makefile.ecmwf_gfortran 2013-12-15 10:56:28.000000000 +0000
@@ -6,7 +6,7 @@
--- flexpart-9.02.orig/makefile.ecmwf_gfortran
+++ flexpart-9.02/makefile.ecmwf_gfortran
@@ -1,4 +1,4 @@
-SHELL = /bin/bash
+\SHELL = /bin/bash
MAIN = flexpart.ecmwf
#
@@ -6,7 +6,7 @@ FC = gfortran
INCPATH = /usr/include
LIBPATH1 = /usr/lib
LIBPATH2 =
-FFLAGS = -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+FFLAGS = $(FCFLAGS) -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
LFLAGS = $(LDFLAGS) $(FFLAGS) -Wl,--as-needed -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
+FFLAGS = $(FCFLAGS) -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
LFLAGS = $(LDFLAGS) $(FFLAGS) -Wl,--as-needed -L$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm
MODPATH = /usr/include
#
Index: flexpart-9.02/makefile.gfs_gfortran
===================================================================
--- flexpart-9.02.orig/makefile.gfs_gfortran 2013-12-15 10:55:46.000000000 +0000
+++ flexpart-9.02/makefile.gfs_gfortran 2013-12-15 10:55:46.000000000 +0000
@@ -7,7 +7,7 @@
--- flexpart-9.02.orig/makefile.gfs_gfortran
+++ flexpart-9.02/makefile.gfs_gfortran
@@ -7,7 +7,7 @@ FC = gfortran
INCPATH = /usr/include
LIBPATH1 = /usr/lib
LIBPATH2 =
-FFLAGS = -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
+FFLAGS = $(FCFLAGS) -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
LFLAGS:= $(LDFLAGS) $(FFLAGS) -L$(LIBPATH1) -Wl,--as-needed -lgrib_api_f90 -lgrib_api -lm -ljasper
+FFLAGS = -O2 $(FCFLAGS) -O2 -fdefault-real-8 -fconvert=little-endian -frecord-marker=4 -I$(INCPATH)
LFLAGS:= $(LDFLAGS) $(FFLAGS) -L$(LIBPATH1) -Wl,--as-needed -lgrib_api_f90 -lgrib_api -lm
#
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment