[emos] 06/37: WIP: refresh patches, part 2
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 8868f1eb5575e98b9d79995874ceb619e50c74c4
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed May 13 15:20:44 2015 +0100
WIP: refresh patches, part 2
---
debian/patches/little_endian.patch | 176 +++++-------------------------
debian/patches/remove_sharedlib_dbg.patch | 31 ------
debian/patches/series | 6 +-
debian/patches/shared.patch | 31 ------
4 files changed, 30 insertions(+), 214 deletions(-)
diff --git a/debian/patches/little_endian.patch b/debian/patches/little_endian.patch
index 529b27e..bce88fe 100644
--- a/debian/patches/little_endian.patch
+++ b/debian/patches/little_endian.patch
@@ -4,11 +4,11 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2011-12-09
Forwarded: no
-Index: emoslib-000392+dfsg.1/gribex/ecloc1.F
+Index: emoslib-000403+dfsg.1/gribex/ecloc1.F
===================================================================
---- emoslib-000392+dfsg.1.orig/gribex/ecloc1.F 2013-04-04 17:14:58.000000000 +0100
-+++ emoslib-000392+dfsg.1/gribex/ecloc1.F 2013-04-04 17:14:58.000000000 +0100
-@@ -69,7 +69,7 @@
+--- emoslib-000403+dfsg.1.orig/gribex/ecloc1.F
++++ emoslib-000403+dfsg.1/gribex/ecloc1.F
+@@ -69,7 +69,7 @@ C CSGNBT - encode sign bit
C DSGNBT - decode sign bit
C ELDEFS - encode ECMWF section 1, local usage definitions
C DLDEFS - decode ECMWF section 1, local usage definitions
@@ -17,10 +17,10 @@ Index: emoslib-000392+dfsg.1/gribex/ecloc1.F
C SWAP4 - swap order of characters in the experiment version
#endif
C
-Index: emoslib-000392+dfsg.1/gribex/fortranInterface.c
+Index: emoslib-000403+dfsg.1/gribex/fortranInterface.c
===================================================================
---- emoslib-000392+dfsg.1.orig/gribex/fortranInterface.c 2013-04-04 17:14:58.000000000 +0100
-+++ emoslib-000392+dfsg.1/gribex/fortranInterface.c 2013-04-04 17:14:58.000000000 +0100
+--- emoslib-000403+dfsg.1.orig/gribex/fortranInterface.c
++++ emoslib-000403+dfsg.1/gribex/fortranInterface.c
@@ -9,6 +9,7 @@
* nor does it submit to any jurisdiction.
*/
@@ -29,7 +29,7 @@ Index: emoslib-000392+dfsg.1/gribex/fortranInterface.c
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-@@ -180,7 +181,7 @@
+@@ -180,7 +181,7 @@ void isec1l(fortint* section1, fortint*
fortint ldefnum(fortint* centre, fortint* subcentre, fortint* number) {
int shift = (sizeof(fortint)-1)*8;
@@ -38,7 +38,7 @@ Index: emoslib-000392+dfsg.1/gribex/fortranInterface.c
return ((*centre*1000000) + (*subcentre*1000) + (*number & 0xff));
#else
return ((*centre*1000000) + (*subcentre*1000) + ((*number>>shift) & 0xff));
-@@ -223,7 +224,7 @@
+@@ -223,7 +224,7 @@ fortint number;
for( loop = 7; loop >= missing; loop-- ) value[loop] = value[loop-missing];
for( loop = 0; loop < missing; loop++ ) value[loop] = '0';
}
@@ -47,11 +47,11 @@ Index: emoslib-000392+dfsg.1/gribex/fortranInterface.c
p = value[0];
value[0] = value[6];
value[6] = p;
-Index: emoslib-000392+dfsg.1/gribex/grprs1b.F
+Index: emoslib-000403+dfsg.1/gribex/grprs1b.F
===================================================================
---- emoslib-000392+dfsg.1.orig/gribex/grprs1b.F 2013-04-04 17:14:58.000000000 +0100
-+++ emoslib-000392+dfsg.1/gribex/grprs1b.F 2013-04-04 17:14:58.000000000 +0100
-@@ -88,6 +88,7 @@
+--- emoslib-000403+dfsg.1.orig/gribex/grprs1b.F
++++ emoslib-000403+dfsg.1/gribex/grprs1b.F
+@@ -88,6 +88,7 @@ C ----------------------------------
C
IMPLICIT NONE
C
@@ -59,7 +59,7 @@ Index: emoslib-000392+dfsg.1/gribex/grprs1b.F
#include "grprs.h"
#include "grbcom.h"
C
-@@ -519,7 +520,7 @@
+@@ -519,7 +520,7 @@ C
WRITE(GRPRSM,1105) KSEC1(44)
WRITE(HVERSION, '(A8)' ) KSEC1(45)
WRITE(GRPRSM,1106)
@@ -68,7 +68,7 @@ Index: emoslib-000392+dfsg.1/gribex/grprs1b.F
X HVERSION(8:8),
X HVERSION(7:7),
X HVERSION(6:6),
-@@ -711,7 +712,7 @@
+@@ -711,7 +712,7 @@ C
WRITE(GRPRSM,1803) KSEC1(44)
WRITE(HVERSION, '(A8)' ) KSEC1(45)
WRITE(GRPRSM,1804)
@@ -77,7 +77,7 @@ Index: emoslib-000392+dfsg.1/gribex/grprs1b.F
X HVERSION(8:8),
X HVERSION(7:7),
X HVERSION(6:6),
-@@ -728,7 +729,7 @@
+@@ -728,7 +729,7 @@ C
DO JLOOP = 1, KSEC1(46)
WRITE(HVERSION, '(A8)' ) KSEC1(46+JLOOP)
WRITE(GRPRSM,1806)
@@ -86,7 +86,7 @@ Index: emoslib-000392+dfsg.1/gribex/grprs1b.F
X HVERSION(8:8),
X HVERSION(7:7),
X HVERSION(6:6),
-@@ -789,7 +790,7 @@
+@@ -789,7 +790,7 @@ C
WRITE(GRPRSM,2115) KSEC1(56)
WRITE(GRPRSM,2116) KSEC1(57)
WRITE(HVERSION, '(A8)' ) KSEC1(58)
@@ -95,11 +95,11 @@ Index: emoslib-000392+dfsg.1/gribex/grprs1b.F
WRITE(GRPRSM,2117) HVERSION(5:5)
#else
WRITE(GRPRSM,2117) HVERSION(8:8)
-Index: emoslib-000392+dfsg.1/gribex/grprs1.F
+Index: emoslib-000403+dfsg.1/gribex/grprs1.F
===================================================================
---- emoslib-000392+dfsg.1.orig/gribex/grprs1.F 2013-04-04 17:14:58.000000000 +0100
-+++ emoslib-000392+dfsg.1/gribex/grprs1.F 2013-04-04 17:14:58.000000000 +0100
-@@ -168,6 +168,7 @@
+--- emoslib-000403+dfsg.1.orig/gribex/grprs1.F
++++ emoslib-000403+dfsg.1/gribex/grprs1.F
+@@ -168,6 +168,7 @@ C ----------------------------------
C
IMPLICIT NONE
C
@@ -107,7 +107,7 @@ Index: emoslib-000392+dfsg.1/gribex/grprs1.F
#include "grprs.h"
#include "grbcom.h"
C
-@@ -949,7 +950,7 @@
+@@ -949,7 +950,7 @@ C
WRITE(GRPRSM,2115) KSEC1(56)
WRITE(GRPRSM,2116) KSEC1(57)
WRITE(HVERSION, '(A8)' ) KSEC1(58)
@@ -116,10 +116,10 @@ Index: emoslib-000392+dfsg.1/gribex/grprs1.F
WRITE(GRPRSM,2117) HVERSION(5:5)
#else
WRITE(GRPRSM,2117) HVERSION(8:8)
-Index: emoslib-000392+dfsg.1/Makefile.am
+Index: emoslib-000403+dfsg.1/Makefile.am
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ emoslib-000392+dfsg.1/Makefile.am 2013-04-04 17:14:58.000000000 +0100
+--- /dev/null
++++ emoslib-000403+dfsg.1/Makefile.am
@@ -0,0 +1,20 @@
+# Makefile for libemos
+#
@@ -141,10 +141,10 @@ Index: emoslib-000392+dfsg.1/Makefile.am
+ ( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
+ done
+ rm -f $(LIBRARY)
-Index: emoslib-000392+dfsg.1/NEWS
+Index: emoslib-000403+dfsg.1/NEWS
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ emoslib-000392+dfsg.1/NEWS 2013-04-04 17:14:58.000000000 +0100
+--- /dev/null
++++ emoslib-000403+dfsg.1/NEWS
@@ -0,0 +1,9 @@
+EMOSLIB
+
@@ -155,123 +155,3 @@ Index: emoslib-000392+dfsg.1/NEWS
+ * handling pure binary unix files
+ * interpolating fields
+ * handling files of GRIB products in an indexed manner
-Index: emoslib-000392+dfsg.1/ChangeLog
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ emoslib-000392+dfsg.1/ChangeLog 2013-04-04 17:14:58.000000000 +0100
-@@ -0,0 +1,115 @@
-+Changes in 000371
-+=================
-+ Latest Emos library 000370 is updated on 7.9.2009 due to changes of N320 Reduced Gaussian Grid definition.
-+
-+BUFR routines
-+
-+ * Check on section 4 size and actual data size. The check will be performed only is variable CHECK_S4=true is set.
-+ * For bufr Edition 4 section 3 and 4 can have odd number of bytes
-+ * Compression on character string
-+ * Fix for bufr creation for multi-subset uncompressed case with different delayed replications in the subsets and if soft return error code -28 was returned from previous subset
-+ * IEEE change for big/little endian
-+ * bufren.F: Bug fix uncompress multi subset packing
-+
-+Interpolation software
-+
-+ * intfb.F: bug fix memory allocation for double interpolation
-+ * hsp2gg2.F: new function to determine gaussian number and spectral truncation based on output resolution of rotated lat-lon field. It is done to save computation time for high resolution
-+ * sharelib.c, sharedll.c, sharedgg.c: added set of functions to support shared memory handling
-+ * krg2rgu.F: increased JPACK = 1500000, JPMAXNG=1280
-+ * hsp2gg.F : Match T255 and T213 against N128 instead of N160
-+
-+Changes in 000370
-+=================
-+
-+BUFR routines
-+
-+ * bufr_repack_206t205.F: KELEM changed from 2000 to 16000
-+ * bufr_split.F added handling of BUFR subtypes 216 and 217
-+ * buprt.F - Prints full name of 64 characters and better control of code/flag table printing
-+ * buens3.F - Bug fix to reset ksec3(4) flag for compression.
-+ * added bustop.F - A new routine used by mbufr_mars_filter.F to force stopping expansion after certain number of elements.
-+ * bufr_split.F: Program modified to create maximum 255 files to split 255 possible bufr subtypes.
-+
-+Gribex routines
-+
-+ * grchk1.F: added class 17 la LACE ALADIN,18 yt YOTC
-+
-+Interpolation software
-+
-+ * igplsm.F: commented check if less then zero because of bitmaped fields
-+ * auresol.F : deleted 1023 and added 2047 truncation
-+ * intuvxh.F intuvgh.F: NINT instead of INT for calculation of NLON NLAT
-+ * iagcntl.F iarcntl.F: added env variable LSM_REAL to allow real values of lsm
-+ * intvect.F: reseting OUTLEN for V wind component
-+ * kintrg.F: Bug fix for reduced gaussian to reduced gaussian interpolation. Set env varible RG2RG_COMP in order to get compatible result with previous Emos libraries
-+ * intout.F: softer criteria for non global fields instead of AND - OR
-+
-+Changes in 000360
-+=================
-+
-+BUFR routines
-+
-+ * bufrtools/bufr_split.F: subtype 241 GTS IASI added
-+ * A new variable USE_TABLE_C introduced. When set to true bufr software will load code and flag tables. There are subroutines to get the meaning of the code and flag values.
-+ * buprt.F has been modified to print code/flag values meaning
-+ * New subroutine buget_opera_image.F to handle radar image data up to 10 mega pixels particularly suitable for Opera composite radar images ( rain rates).
-+ * Subroutine bufrex.f has been modified to handle delayed repetitions
-+ * Missing value indicator rvind=1.7D38 and eps=10D-8 are used in consistent way.
-+ * parameter.F modified. JELEM=320000 set
-+ * Example decode_bufr_image.F is available in the examples directory.
-+ * Bufr tables updated.
-+ * Bufr user's Guide updated
-+
-+Gribex routines
-+
-+ * getsetValues.c: rename copyName to copyNameLoc due to multiple definition in shared library
-+ * gribtemplates: added localDefinitionTemplate_098_000_031
-+ * grchk1.F: added stream 1040 Ensemble Forecast Hindcast Statistics (EFHS)
-+ * grchk1.F: added stream 1240 Eurosip Monthly Means, 1241 Eurosip Hindcast Monthly Means
-+ * dmesec2 emesec2: Bug fix decode/encode Mercator data
-+
-+Interpolation software
-+
-+ * intfb.F: bug fix to avoid multiple memory allocation before rg2rgy routine
-+ * kintrg.F: parameter number 43 - Soil type to be procesed with nearest neighbour interpolation
-+ * hirlsm.F hll2ll hrg2gg: Added completely new checking for nearest neighbour processing
-+ * iglsmd.c : added env varibale LSM_10MIN to force processing of lsm with 10min file
-+ * hsp2gg.F :Added checking for a automatic truncation T1279 -> N640
-+ * w251idx.F wvqlint.F, wvqlidx.F:allow upto 0.1 degree resolution
-+ * hirlsm.F : Neaarest Neighbour interpolation modified
-+ * hntfaph.F : added check weather to enable lsm processing
-+ * oceanp.c: increased JP_GUESS = 519840 to allow for 0.25*0.25 interpolated grid
-+ * kintrg.F : set JPMAXNG to 1280 to allow N640
-+
-+Changes in 000350
-+=================
-+
-+BUFR routines
-+
-+ * Introduction of 209YYY operator to represent IEEE 32/64 bit floating point numbers.
-+ * The software now keeps in memory maximum 10 tables which speeds up parallel processing in some cases.
-+ * ctable.F btable.F dtable.F: The unit number used to open file for bufr tables was changed to use any free unit number
-+
-+Gribex routines
-+
-+ * calcop.F: packcf.F unpackcf.F : Increased maximum Truncation to be handled to T2047
-+ * grchk1.F: added class 16 dt (Data Targeting System)
-+ * gribtemplate:
-+ added - localDefinitionTemplate_214_098_245
-+ updated - localDefinitionTemplate_098_235_015, localDefinitionTemplate_098_235_004, localDefinitionTemplate_098_235_016
-+
-+Interpolation software
-+
-+ * islproc.F hirlam.F igtog.F igtogr.F irgtog.F: parameter .43 - Soil type to be procesed with nearest neighbour
-+ * intout.F: forsing bilinear interpolation for rotation setting keyword interpolation to "bilinear"
-+ * wv2didx.F: Bug fix calculation of indexes along each latitude in iregular lat-lon if it input field is not global, treating separetly cases for global and non globa input field
-+ * wv2dint.F: Bug fix generating latitutes for input field
-+ * jgetgg.F: added 640 reduced gaussian definition
-+ * hgenll.F: NINT instead of INT for calculation of NLON NLAT
-+
-+PBIO routines
-+
-+ * pbio.c: Bug fix - setvbuf to be called every time new file is open
-+ * jopnggsm.c: Bug fix - calculation of coefficient file size
-+ * gbyte_alpha.c: Bug fix for 64 bits packing
diff --git a/debian/patches/remove_sharedlib_dbg.patch b/debian/patches/remove_sharedlib_dbg.patch
deleted file mode 100644
index f537b66..0000000
--- a/debian/patches/remove_sharedlib_dbg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Remove unnused references, that for some reason collide when linking in shared_lib.c
-Author: Alastair McKinstry <mckinstry at debian.org>
-Forwarded: no
-Last-Updated: 2011-12-09
-
-Index: emoslib-000382+dfsg/interpolation/sharedgg.c
-===================================================================
---- emoslib-000382+dfsg.orig/interpolation/sharedgg.c 2011-12-09 12:37:35.000000000 +0000
-+++ emoslib-000382+dfsg/interpolation/sharedgg.c 2011-12-09 12:50:15.000000000 +0000
-@@ -29,8 +29,6 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
-
--extern int sharedlib_dbg;
--
- #ifndef CRAY
- #ifdef FORTRAN_NO_UNDERSCORE
- #define SHAREDLL sharedll
-Index: emoslib-000382+dfsg/interpolation/sharedll.c
-===================================================================
---- emoslib-000382+dfsg.orig/interpolation/sharedll.c 2011-12-09 12:37:35.000000000 +0000
-+++ emoslib-000382+dfsg/interpolation/sharedll.c 2011-12-09 12:50:15.000000000 +0000
-@@ -29,8 +29,6 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
-
--extern int sharedlib_dbg;
--
- #ifndef CRAY
- #ifdef FORTRAN_NO_UNDERSCORE
- #define SHAREDLL sharedll
diff --git a/debian/patches/series b/debian/patches/series
index 2ca0758..f392103 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,6 @@ huge.patch
bufrnum.patch
pkgconfig.patch
little_endian.patch
-shared.patch
-underscore_names.patch
-remove_sharedlib_dbg.patch
-wvqlid2.patch
+# underscore_names.patch
+# wvqlid2.patch
# emosnum.patch
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
deleted file mode 100644
index 0d46de6..0000000
--- a/debian/patches/shared.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Don't set external variables; is not allowed by Gcc.
-Author: Alastair McKinstry <mckinstry at debian.org>
-Last-Updated: 2011-12-09
-Forwarded: no
-
-Index: emoslib-000371+dfsg/interpolation/sharedgg.c
-===================================================================
---- emoslib-000371+dfsg.orig/interpolation/sharedgg.c 2009-12-06 12:58:59.000000000 +0000
-+++ emoslib-000371+dfsg/interpolation/sharedgg.c 2009-12-06 12:59:04.000000000 +0000
-@@ -29,7 +29,7 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
-
--extern int sharedlib_dbg = 0;
-+extern int sharedlib_dbg;
-
- #ifndef CRAY
- #ifdef FORTRAN_NO_UNDERSCORE
-Index: emoslib-000371+dfsg/interpolation/sharedll.c
-===================================================================
---- emoslib-000371+dfsg.orig/interpolation/sharedll.c 2009-12-06 12:58:12.000000000 +0000
-+++ emoslib-000371+dfsg/interpolation/sharedll.c 2009-12-06 12:58:16.000000000 +0000
-@@ -29,7 +29,7 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
-
--extern int sharedlib_dbg = 0;
-+extern int sharedlib_dbg;
-
- #ifndef CRAY
- #ifdef FORTRAN_NO_UNDERSCORE
--
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