[flexpart] 01/01: * Remove -ljasper as unnecessary. libjasper is being removed from Debian as obsolete and unsupported * Move to Standards-Version: 3.9.7

Alastair McKinstry mckinstry at moszumanska.debian.org
Thu Jul 7 10:51:05 UTC 2016 

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

mckinstry pushed a commit to tag debian/9.02-12
in repository flexpart.

commit 782a25473532ada862b823c6cf7d809c2b448940
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Feb 29 15:38:30 2016 +0000

    * Remove -ljasper as unnecessary. libjasper is being removed from Debian
    as obsolete and  unsupported
    * Move to Standards-Version: 3.9.7
---
 debian/changelog             |  8 ++++++++
 debian/control               |  5 ++---
 debian/patches/fortran.patch | 20 ++++++++++----------
 debian/patches/mcmodel.patch | 31 +++++++++++++++++++++----------
 4 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e738da..bac2aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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 at 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. 
diff --git a/debian/control b/debian/control
index 1b47638..29af6b8 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://transport.nilu.no/flexpart
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/flexpart.git
 
diff --git a/debian/patches/fortran.patch b/debian/patches/fortran.patch
index 2bfb190..f8e39a1 100644
--- a/debian/patches/fortran.patch
+++ b/debian/patches/fortran.patch
@@ -1,12 +1,12 @@
 Author: Alastair McKinstry <mckinstry at 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)
diff --git a/debian/patches/mcmodel.patch b/debian/patches/mcmodel.patch
index b07b551..a5390c3 100644
--- a/debian/patches/mcmodel.patch
+++ b/debian/patches/mcmodel.patch
@@ -1,26 +1,37 @@
+Author: Alastair McKinstry <mckinstry at 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
  #
  

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

More information about the debian-science-commits mailing list