[flexpart] 16/26: Merge back uploads that weren't in git

[Alastair McKinstry]

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

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

commit 54f6fc53f7772f20affd8a08f7b906e98bcda235
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 15 10:51:41 2013 +0000

    Merge back uploads that weren't in git
---
 debian/changelog             | 29 ++++++++++++++++++++++-------
 debian/patches/mcmodel.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 debian/rules                 |  8 ++++++--
 4 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3d3b15..f218672 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,27 @@
-flexpart (9.02-2) unstable; urgency=medium
+flexpart (9.02-5) unstable; urgency=low
 
-  * update-alternatives now removes alternatives on rm. Closes: #729212.
-  * Standards-Version: 3.9.5. No changes required. 
-  * Move to section: science. Closes: #729444.
-  * Fix typo in homepage URL. Closes: #730446.
-  * Add -Wl,--as-needed to remove unnecessary links in makefiles
+  * Another typo. Closes: #728128. 
 
- -- Alastair McKinstry <mckinstry at debian.org>  Sat, 14 Dec 2013 09:55:48 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 07 Nov 2013 19:12:35 +0000
+
+flexpart (9.02-4) unstable; urgency=low
+
+  * Fix typo in patch. Also extend to kFreebsd. Closes: #728128. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 04 Nov 2013 08:55:12 +0000
+
+flexpart (9.02-3) unstable; urgency=low
+
+  * Build with mcmodel=medium for amd64. Closes: #728128. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 03 Nov 2013 17:36:57 +0000
+
+flexpart (9.02-2) unstable; urgency=low
+
+  * Depend on jasper, Needed for grib-api. Closes: #724648. 
+    (Dependencies confirmed with pbuilder)
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 14 Oct 2013 12:50:51 +0100
 
 flexpart (9.02-1) unstable; urgency=low
 
diff --git a/debian/patches/mcmodel.patch b/debian/patches/mcmodel.patch
new file mode 100644
index 0000000..7af0b96
--- /dev/null
+++ b/debian/patches/mcmodel.patch
@@ -0,0 +1,26 @@
+Index: flexpart-9.02/makefile.ecmwf_gfortran
+===================================================================
+--- flexpart-9.02.orig/makefile.ecmwf_gfortran	2013-11-03 16:30:39.000000000 +0000
++++ flexpart-9.02/makefile.ecmwf_gfortran	2013-11-03 17:39:23.000000000 +0000
+@@ -6,7 +6,7 @@
+ 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$(LIBPATH2) -L$(LIBPATH1) -lgrib_api_f90 -lgrib_api -lm -ljasper
+ MODPATH = /usr/include
+ #
+Index: flexpart-9.02/makefile.gfs_gfortran
+===================================================================
+--- flexpart-9.02.orig/makefile.gfs_gfortran	2013-11-03 16:30:39.000000000 +0000
++++ flexpart-9.02/makefile.gfs_gfortran	2013-11-03 17:39:38.000000000 +0000
+@@ -7,7 +7,7 @@
+ 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
+ #
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0cd92db..a97fd00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fortran.patch
+mcmodel.patch
diff --git a/debian/rules b/debian/rules
index 191dd1b..9697e73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,19 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+CPU:=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+ifeq ($(CPU), amd64)
+  export FCFLAGS= -mcmodel=medium
+endif
 
 # magic debhelper rule
 %:
 	dh $@
 
 override_dh_auto_build:
-	$(MAKE) -f makefile.gfs_gfortran LDFLAGS=$(LDFLAGS)
+	$(MAKE) -f makefile.gfs_gfortran LDFLAGS=$(LDFLAGS) FCFLAGS=$(FCFLAGS)
 	rm -f *.o *.mod
-	$(MAKE) -f makefile.ecmwf_gfortran LDFLAGS=$(LDFLAGS)
+	$(MAKE) -f makefile.ecmwf_gfortran LDFLAGS=$(LDFLAGS) FCFLAGS=$(FCFLAGS)
 
 override_dh_auto_clean:
 	$(MAKE) -f makefile.gfs_gfortran clean

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