[emos] 04/37: WIP: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Jun 27 08:14:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository emos.
commit 6ca4cafd1cc6e692322f8e851416f0ac4fcee017
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun May 10 01:12:18 2015 +0100
WIP: refresh patches
---
debian/patches/bufrnum.patch | 21 +++------
debian/patches/config.patch | 102 +++++++++----------------------------------
debian/patches/huge.patch | 18 ++++----
debian/patches/series | 1 -
4 files changed, 35 insertions(+), 107 deletions(-)
diff --git a/debian/patches/bufrnum.patch b/debian/patches/bufrnum.patch
index 4923354..54901fc 100644
--- a/debian/patches/bufrnum.patch
+++ b/debian/patches/bufrnum.patch
@@ -2,15 +2,15 @@ Description: Add BUFRNUM() function to bufrdc/ code. According to docs, each int
A function to describe its version number, but bufrnum was not present.
Author: Alastair McKinstry <mckinstry at debian.org>
Forwarded: no
-Last-Updated: 2009-04-17
+Last-Updated: 2015-05-13
# From gribex/emoscyc.F, it appears that each interface has its own _CYCLE number,
# emoscyc.F used BUFRNUM, but it was never defined; I've defined it here
# matching gribnum, intpnum, etc.
# -- AMCK, 2009-04-16
diff -Nur -x '*.orig' -x '*~' emos/bufrdc/bufrnum.F emos.new/bufrdc/bufrnum.F
---- emos/bufrdc/bufrnum.F 1970-01-01 01:00:00.000000000 +0100
-+++ emos.new/bufrdc/bufrnum.F 2009-04-17 21:40:59.000000000 +0100
+--- emos/bufrdc_wmo/bufrnum.F 1970-01-01 01:00:00.000000000 +0100
++++ emos.new/bufrdc_wmo/bufrnum.F 2009-04-17 21:40:59.000000000 +0100
@@ -0,0 +1,122 @@
+C
+C
@@ -135,8 +135,8 @@ diff -Nur -x '*.orig' -x '*~' emos/bufrdc/bufrnum.F emos.new/bufrdc/bufrnum.F
+ RETURN
+ END
diff -Nur -x '*.orig' -x '*~' emos/bufrdc/grprs.h emos.new/bufrdc/grprs.h
---- emos/bufrdc/grprs.h 1970-01-01 01:00:00.000000000 +0100
-+++ emos.new/bufrdc/grprs.h 2009-04-17 21:41:47.000000000 +0100
+--- emos/bufrdc_wmo/grprs.h 1970-01-01 01:00:00.000000000 +0100
++++ emos.new/bufrdc_wmo/grprs.h 2009-04-17 21:41:47.000000000 +0100
@@ -0,0 +1,7 @@
+C
+C Common blocks holding default or user supplied values for printing.
@@ -145,14 +145,3 @@ diff -Nur -x '*.orig' -x '*~' emos/bufrdc/grprs.h emos.new/bufrdc/grprs.h
+ INTEGER GRPRSM
+C
+ COMMON /GRPRSCM/ GRPRSM, GRPRSET
-diff -Nur -x '*.orig' -x '*~' emos/bufrdc/sources emos.new/bufrdc/sources
---- emos/bufrdc/sources 2008-07-23 11:41:34.000000000 +0100
-+++ emos.new/bufrdc/sources 2009-04-17 21:41:33.000000000 +0100
-@@ -3,6 +3,7 @@
- #
-
- SOURCES.F = \
-+ bufrnum.F \
- bbuprs0.F \
- bbuprs1.F \
- bbuprs2.F \
diff --git a/debian/patches/config.patch b/debian/patches/config.patch
index 8bff598..610ab0a 100644
--- a/debian/patches/config.patch
+++ b/debian/patches/config.patch
@@ -4,37 +4,10 @@ Forwarded: no
Last-Updated: 2013-04-03
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ emoslib-000371+dfsg/configure.ac 2009-12-08 12:05:24.000000000 +0000
-@@ -0,0 +1,11 @@
-+dnl Process this file with autoconf to produce a configure script.
-+
-+AC_INIT(configure.ac)
-+AM_INIT_AUTOMAKE(emoslib, 000392)
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_CONFIG_FILES([Makefile pkgconfig/Makefile pkgconfig/emos.pc pkgconfig/emosR64.pc fft/Makefile])
-+
-+AC_C_BIGENDIAN
-+
-+AC_OUTPUT
-Index: emoslib-000392+dfsg/config/config.linux_gfortranA64
-===================================================================
---- emoslib-000392+dfsg.orig/config/config.linux_gfortranA64 2011-12-09 13:28:47.000000000 +0000
-+++ emoslib-000392+dfsg/config/config.linux_gfortranA64 2011-12-09 13:28:52.000000000 +0000
-@@ -17,7 +17,7 @@
- FASTCFLAGS = $(CFLAGS)
- #
- FC = gfortran
--FFLAGS = $(DEBUG) $(PROFILE) $(CC_A32) -fcray-pointer -fno-second-underscore -Dlinux $(USE_NO_POINTERS) -Dgfortran -DLITTLE_ENDIAN -DINTEGER_IS_INT
-+FFLAGS = $(DEBUG) $(PROFILE) $(CC_A32) -fcray-pointer -fno-second-underscore -Dlinux $(USE_NO_POINTERS) -Dgfortran -DLITTLE_ENDIAN -DINTEGER_IS_INT -DTABLE_PATH=\"/usr/share/emos\" -D_FORTIFY_SOURCE=2
- VECTFFLAGS = $(FFLAGS)
- # |
- # v
-Index: emoslib-000392+dfsg/config/config.linux_gfortran+picR64
+Index: emos.git/config/config.linux_gfortran+picR64
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ emoslib-000392+dfsg/config/config.linux_gfortran+picR64 2011-12-09 13:38:53.000000000 +0000
+--- /dev/null
++++ emos.git/config/config.linux_gfortran+picR64
@@ -0,0 +1,26 @@
+#
+# Configuration file for linux (32-bit reals).
@@ -62,10 +35,10 @@ Index: emoslib-000392+dfsg/config/config.linux_gfortran+picR64
+#
+RANLIB = /usr/bin/ranlib
+
-Index: emoslib-000392+dfsg/config/config.linux_gfortran+pic
+Index: emos.git/config/config.linux_gfortran+pic
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ emoslib-000392+dfsg/config/config.linux_gfortran+pic 2011-12-09 13:37:43.000000000 +0000
+--- /dev/null
++++ emos.git/config/config.linux_gfortran+pic
@@ -0,0 +1,27 @@
+#
+# Configuration file for linux (32-bit reals).
@@ -94,52 +67,19 @@ Index: emoslib-000392+dfsg/config/config.linux_gfortran+pic
+#
+RANLIB = /usr/bin/ranlib
+
-Index: emoslib-000392+dfsg/config/config.linux_gfortranR64
+Index: emos.git/configure.ac
===================================================================
---- emoslib-000392+dfsg.orig/config/config.linux_gfortranR64 2011-12-09 13:28:47.000000000 +0000
-+++ emoslib-000392+dfsg/config/config.linux_gfortranR64 2011-12-09 13:38:28.000000000 +0000
-@@ -7,17 +7,17 @@
- PROFILE=
- DEBUG = -O2
- USE_NO_POINTERS =
--LARGE_FILE = -Dlinux -DFOPEN64 -D_LARGEFILE64_SOURCE
-+LARGE_FILE = -Dlinux -DFOPEN64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- #CC_A32 = -m32
- CC_A32 =
- #
- #
- CC = gcc
--CFLAGS = $(DEBUG) $(PROFILE) -DREAL_8 -DLITTLE_ENDIAN $(CC_A32) $(LOCAL_CFLAGS) $(LARGE_FILE)
-+CFLAGS = $(DEBUG) $(PROFILE) -DREAL_8 $(CC_A32) $(LOCAL_CFLAGS) $(LARGE_FILE) -D_FORTIFY_SOURCE=2
- FASTCFLAGS = $(CFLAGS)
- #
- FC = gfortran
--FFLAGS = $(DEBUG) $(PROFILE) $(CC_A32) -fdefault-real-8 -fcray-pointer -fno-second-underscore -Dlinux $(USE_NO_POINTERS) -DREAL_8 -DREAL_BIGGER_THAN_INTEGER -Dgfortran -DLITTLE_ENDIAN
-+FFLAGS = $(DEBUG) $(PROFILE) $(CC_A32) -fdefault-real-8 -fcray-pointer -fno-second-underscore -Dlinux $(USE_NO_POINTERS) -DREAL_8 -DREAL_BIGGER_THAN_INTEGER -DTABLE_PATH=\"/usr/share/emos\" -D_FORTIFY_SOURCE=2
- VECTFFLAGS = $(FFLAGS)
- # |
- # v
-Index: emoslib-000392+dfsg/config/config.linux_gfortran
-===================================================================
---- emoslib-000392+dfsg.orig/config/config.linux_gfortran 2011-12-09 13:28:47.000000000 +0000
-+++ emoslib-000392+dfsg/config/config.linux_gfortran 2011-12-09 13:38:06.000000000 +0000
-@@ -9,16 +9,16 @@
- #CC_A32 = -m32
- CC_A32 =
- USE_NO_POINTERS =
--LARGE_FILE = -Dlinux -DFOPEN64 -D_LARGEFILE64_SOURCE
-+LARGE_FILE = -Dlinux -DFOPEN64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
- #
- #
- #
- CC = gcc
--CFLAGS = $(DEBUG) $(PROFILE) -DLITTLE_ENDIAN $(CC_A32) $(LOCAL_CFLAGS) $(LARGE_FILE)
-+CFLAGS = $(DEBUG) $(PROFILE) $(CC_A32) $(LOCAL_CFLAGS) $(LARGE_FILE) -D_FORTIFY_SOURCE=2
- FASTCFLAGS = $(CFLAGS)
- #
- FC = gfortran
--FFLAGS = $(DEBUG) $(PROFILE) $(CC_A32) -fcray-pointer -fno-second-underscore -Dlinux $(USE_NO_POINTERS) -Dgfortran -DLITTLE_ENDIAN
-+FFLAGS = $(DEBUG) $(PROFILE) $(CC_A32) -fcray-pointer -fno-second-underscore -Dlinux $(USE_NO_POINTERS) -Dgfortran -DTABLE_PATH=\"/usr/share/emos\" -D_FORTIFY_SOURCE=2
- VECTFFLAGS = $(FFLAGS)
- # |
- # v
+--- /dev/null
++++ emos.git/configure.ac
+@@ -0,0 +1,11 @@
++dnl Process this file with autoconf to produce a configure script.
++
++AC_INIT(configure.ac)
++AM_INIT_AUTOMAKE(emoslib, 000392)
++AM_CONFIG_HEADER(config.h)
++
++AC_CONFIG_FILES([Makefile pkgconfig/Makefile pkgconfig/emos.pc pkgconfig/emosR64.pc fft/Makefile])
++
++AC_C_BIGENDIAN
++
++AC_OUTPUT
diff --git a/debian/patches/huge.patch b/debian/patches/huge.patch
index 946f82d..b8b9df0 100644
--- a/debian/patches/huge.patch
+++ b/debian/patches/huge.patch
@@ -1,13 +1,13 @@
Description: Use HUGE() rather than hard-code, to avoid FTBFS on powerpc gfortran
Author: Alastair McKinstry <mckinstry at debian.org>
Forwarded: no
-Last-Updated: 2010-03-10
+Last-Updated: 2015-05-13
-Index: emos.git/bufrdc/buens4.F
+Index: emos.git/bufrdc_wmo/buens4.F
===================================================================
---- emos.git.orig/bufrdc/buens4.F 2010-02-24 10:52:48.000000000 +0000
-+++ emos.git/bufrdc/buens4.F 2011-12-09 12:35:25.000000000 +0000
-@@ -138,8 +138,8 @@
+--- emos.git.orig/bufrdc_wmo/buens4.F
++++ emos.git/bufrdc_wmo/buens4.F
+@@ -140,8 +140,8 @@ C ------------------------
C
IF(KERR.GT.0) RETURN
C
@@ -18,11 +18,11 @@ Index: emos.git/bufrdc/buens4.F
C
C* 1.1 KEEP POINTERS TO THE BEGINING OF THE SECTION.
C ---------------------------------------------
-Index: emos.git/bufrdc/buexs4.F
+Index: emos.git/bufrdc_wmo/buexs4.F
===================================================================
---- emos.git.orig/bufrdc/buexs4.F 2009-11-13 10:30:25.000000000 +0000
-+++ emos.git/bufrdc/buexs4.F 2011-12-09 12:35:25.000000000 +0000
-@@ -148,8 +148,8 @@
+--- emos.git.orig/bufrdc_wmo/buexs4.F
++++ emos.git/bufrdc_wmo/buexs4.F
+@@ -150,8 +150,8 @@ C JNS - POINTER TO VALUES
C
IF(KERR.GT.0) RETURN
C
diff --git a/debian/patches/series b/debian/patches/series
index 15708e3..2ca0758 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
huge.patch
-config.patch
bufrnum.patch
pkgconfig.patch
little_endian.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git
More information about the debian-science-commits
mailing list