[cdo] 40/84: Merge tag 'dfsg_1.6.2' into debian

Alastair McKinstry mckinstry at moszumanska.debian.org
Sat Jun 13 16:48:31 UTC 2015


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

mckinstry pushed a commit to branch master
in repository cdo.

commit f903fb07505bd25d8005d933c0894cb41018ca78
Merge: 709b137 3065885
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 15 10:30:05 2013 +0000

    Merge tag 'dfsg_1.6.2' into debian

 ChangeLog                                          |   136 +-
 Makefile.am                                        |     2 +-
 Makefile.in                                        |     4 +-
 NEWS                                               |    10 +
 OPERATORS                                          |     5 +-
 cdo.spec                                           |     2 +-
 config/default                                     |    31 +-
 configure                                          |   225 +-
 configure.ac                                       |     6 +-
 contrib/Makefile.in                                |     2 +
 contrib/cdoCompletion.bash                         |     3 +
 contrib/cdoCompletion.tcsh                         |     3 +
 contrib/cdoCompletion.zsh                          |     3 +
 contrib/python/cdo.py                              |    83 +-
 libcdi/ChangeLog                                   |    82 +
 libcdi/Makefile.in                                 |    18 +
 libcdi/NEWS                                        |    14 +
 libcdi/aclocal.m4                                  |   158 +
 libcdi/app/Makefile.in                             |    18 +
 libcdi/app/cdi.c                                   |    30 +-
 libcdi/app/printinfo.h                             |    49 +-
 libcdi/config/default                              |     4 +-
 libcdi/configure                                   |   554 +-
 libcdi/configure.ac                                |   136 +-
 libcdi/examples/Makefile.am                        |    42 +-
 libcdi/examples/Makefile.in                        |    30 +-
 libcdi/examples/pio/Makefile.am                    |     7 +-
 libcdi/examples/pio/Makefile.in                    |    25 +-
 libcdi/examples/pio/collectData.c                  |   122 +-
 libcdi/examples/pio/collectData2003.F90            |   140 +-
 libcdi/examples/pio/collectDataNStreams.c          |   147 +-
 libcdi/examples/pio/compareResourcesArray.c        |    64 +-
 libcdi/interfaces/Makefile.in                      |    18 +
 libcdi/interfaces/python/CdiObj.py                 |   702 +-
 libcdi/interfaces/python/cdiobj_wrap.cpp           | 18134 +++++++++----------
 libcdi/m4/acx_options.m4                           |    23 +-
 libcdi/m4/acx_sl_fc_mod_path_flag.m4               |     2 +-
 libcdi/src/Makefile.am                             |    29 +-
 libcdi/src/Makefile.in                             |    87 +-
 libcdi/src/cdf_int.c                               |    22 +-
 libcdi/src/cdf_int.h                               |    15 +-
 libcdi/src/cdi.h                                   |   161 +-
 libcdi/src/cdi.inc                                 |   135 +-
 libcdi/src/cdiFortran.c                            |    49 +-
 libcdi/src/cdi_int.c                               |   163 +-
 libcdi/src/cdi_int.h                               |    34 +-
 libcdi/src/cdilib.c                                |  8403 +++++----
 libcdi/src/cfortran.h                              |    68 +-
 libcdi/src/cgribex.h                               |    37 +-
 libcdi/src/cgribexlib.c                            |   685 +-
 libcdi/src/config.h.in                             |    12 +
 libcdi/src/error.c                                 |    45 +-
 libcdi/src/error.h                                 |    30 +
 libcdi/src/file.c                                  |    84 +-
 libcdi/src/file.h                                  |     2 +
 libcdi/src/gribapi.h                               |    35 +-
 libcdi/src/grid.c                                  |  1194 +-
 libcdi/src/institution.c                           |   139 +-
 libcdi/src/institution.h                           |     4 +-
 libcdi/src/mo_cdi.f90                              |   664 +-
 libcdi/src/model.c                                 |   150 +-
 libcdi/src/model.h                                 |     4 +-
 libcdi/src/namespace.c                             |   195 +-
 libcdi/src/namespace.h                             |    54 +-
 libcdi/src/pio.c                                   |    17 +-
 libcdi/src/pio.h                                   |    10 +-
 libcdi/src/pio_c_temp.h                            |    25 -
 libcdi/src/pio_cdf_int.c                           |    75 +
 libcdi/src/pio_cdf_int.h                           |    15 +
 libcdi/src/pio_client.c                            |   256 +
 libcdi/src/pio_client.h                            |     7 +
 libcdi/src/pio_comm.c                              |   210 +-
 libcdi/src/pio_interface.c                         |   617 +-
 libcdi/src/pio_interface.h                         |    13 +-
 libcdi/src/pio_list_set.c                          |     3 +-
 libcdi/src/pio_mpinonb.c                           |     6 +-
 libcdi/src/pio_posixasynch.c                       |     1 +
 libcdi/src/pio_posixfpguardsendrecv.c              |    43 +-
 libcdi/src/pio_posixnonb.c                         |     1 +
 libcdi/src/pio_record_send.c                       |    19 +-
 libcdi/src/pio_rpc.c                               |   140 -
 libcdi/src/pio_rpc.h                               |    94 +-
 libcdi/src/pio_serialize.c                         |   115 +
 libcdi/src/pio_serialize.h                         |    14 +
 libcdi/src/pio_server.c                            |   958 +-
 libcdi/src/pio_util.c                              |   202 +-
 libcdi/src/pio_util.h                              |   121 +-
 libcdi/src/resource_handle.c                       |   516 +-
 libcdi/src/resource_handle.h                       |    39 +-
 libcdi/src/resource_unpack.c                       |   108 +
 libcdi/src/resource_unpack.h                       |    26 +
 libcdi/src/serialize.c                             |    88 +
 libcdi/src/serialize.h                             |    32 +
 libcdi/src/stream.c                                |   826 +-
 libcdi/src/stream_cdf.c                            |   465 +-
 libcdi/src/stream_cdf.h                            |     3 +
 libcdi/src/stream_cgribex.c                        |     7 +-
 libcdi/src/stream_ext.c                            |     2 +-
 libcdi/src/stream_grb.c                            |   158 +-
 libcdi/src/stream_grb.h                            |     3 +
 libcdi/src/stream_gribapi.c                        |   357 +-
 libcdi/src/stream_record.c                         |    36 +
 libcdi/src/stream_srv.c                            |     6 +-
 libcdi/src/table.c                                 |     3 +
 libcdi/src/taxis.c                                 |   264 +-
 libcdi/src/taxis.h                                 |     9 +
 libcdi/src/varscan.c                               |    84 +-
 libcdi/src/varscan.h                               |     3 +
 libcdi/src/vlist.c                                 |   132 +-
 libcdi/src/vlist.h                                 |    22 +-
 libcdi/src/vlist_att.c                             |   120 +-
 libcdi/src/vlist_att.h                             |    13 +-
 libcdi/src/vlist_var.c                             |   280 +-
 libcdi/src/vlist_var.h                             |    12 +-
 libcdi/src/zaxis.c                                 |   495 +-
 libcdi/tests/Makefile.am                           |    16 +-
 libcdi/tests/Makefile.in                           |   110 +-
 libcdi/tests/cksum_verify                          |   Bin 0 -> 13808 bytes
 libcdi/tests/cksum_verify.c                        |    58 +
 libcdi/tests/cksum_write.c                         |    96 +-
 libcdi/tests/cksum_write_chunk.c                   |     2 +
 libcdi/tests/pio_cksum_cdf                         |    10 +
 libcdi/tests/pio_cksum_cdf.in                      |    10 +
 libcdi/tests/pio_write.c                           |   105 +-
 libcdi/tests/pio_write_run                         |     7 +-
 libcdi/tests/pio_write_run.in                      |     7 +-
 libcdi/tests/{test_cksum_nc => test_chunk_cksum}   |     8 +-
 .../tests/{test_cksum_nc => test_chunk_cksum.in}   |     6 +-
 libcdi/tests/test_cksum_nc                         |     2 +-
 libcdi/tests/test_cksum_nc2                        |     2 +-
 libcdi/tests/test_cksum_nc4                        |     2 +-
 libcdi/tests/test_resource_copy                    |   Bin 0 -> 8984 bytes
 .../test_resource_copy.c}                          |    76 +-
 libcdi/util/sunf95preproc-wrapper                  |    54 +-
 libcdi/util/sxpreproc-wrapper                      |    52 +-
 libcdi/util/xlfpreproc-wrapper                     |    37 +
 m4/acx_options.m4                                  |    32 +-
 m4/ax_pthread.m4                                   |     2 +-
 src/Adisit.c                                       |   122 +-
 src/Arith.c                                        |     2 +
 src/Arithc.c                                       |     1 +
 src/Arithdays.c                                    |     1 +
 src/CdoMagicsMapper.c                              |     4 +-
 src/Consecstat.c                                   |    80 +-
 src/Derivepar.c                                    |    16 +-
 src/Detrend.c                                      |    29 +-
 src/Diff.c                                         |    12 +-
 src/Duplicate.c                                    |    33 +-
 src/EOFs.c                                         |    12 +-
 src/EcaIndices.c                                   |     2 +
 src/Echam5ini.c                                    |    20 +-
 src/Ensstat.c                                      |    11 +-
 src/Ensstat3.c                                     |    13 +-
 src/Ensval.c                                       |     8 +-
 src/Eof3d.c                                        |    14 +-
 src/Eofcoeff.c                                     |     4 +-
 src/Eofcoeff3d.c                                   |     4 +-
 src/Fillmiss.c                                     |   174 +-
 src/Filter.c                                       |    41 +-
 src/Fldrms.c                                       |     4 +
 src/Fldstat.c                                      |     2 +
 src/Fourier.c                                      |    29 +-
 src/Gather.c                                       |     2 +-
 src/Gradsdes.c                                     |     4 +-
 src/Gridboxstat.c                                  |    25 +-
 src/Harmonic.c                                     |     4 +-
 src/Hi.c                                           |     6 +-
 src/Importbinary.c                                 |     2 +-
 src/Importcmsaf.c                                  |    10 +-
 src/Info.c                                         |     6 +-
 src/Intgrid.c                                      |     9 +-
 src/Intgridtraj.c                                  |     3 +
 src/Intlevel.c                                     |     2 +-
 src/Intyear.c                                      |     4 +-
 src/Isosurface.c                                   |     2 +
 src/Maggraph.c                                     |    20 +-
 src/Magplot.c                                      |     2 +-
 src/Magvector.c                                    |     4 +-
 src/Makefile.am                                    |     4 +
 src/Makefile.in                                    |   149 +-
 src/Mastrfu.c                                      |    46 +-
 src/Merge.c                                        |    17 +
 src/Mergetime.c                                    |    90 +-
 src/Merstat.c                                      |     3 +
 src/Monarith.c                                     |     3 +
 src/Output.c                                       |    10 +-
 src/Outputgmt.c                                    |     4 +-
 src/Pack.c                                         |    25 +-
 src/Regres.c                                       |    40 +-
 src/Remap.c                                        |     5 +-
 src/Rhopot.c                                       |     3 +
 src/Runpctl.c                                      |    29 +-
 src/Runstat.c                                      |    12 +-
 src/Scatter.c                                      |     4 +-
 src/Seascount.c                                    |    49 +-
 src/Seasstat.c                                     |    62 +-
 src/Selbox.c                                       |     8 +-
 src/Select.c                                       |    70 +-
 src/Seltime.c                                      |    28 +-
 src/Setgrid.c                                      |    41 +-
 src/Setmiss.c                                      |     8 +-
 src/Setpartab.c                                    |    24 +-
 src/Sinfo.c                                        |    30 +-
 src/Sort.c                                         |   192 +-
 src/Sorttimestamp.c                                |    28 +-
 src/Spectral.c                                     |    23 +-
 src/Spectrum.c                                     |    64 +-
 src/Split.c                                        |     6 +-
 src/Splitrec.c                                     |     4 +-
 src/Splitsel.c                                     |    16 +-
 src/Splittime.c                                    |    48 +-
 src/Splityear.c                                    |     4 +-
 src/Subtrend.c                                     |    47 +-
 src/Timcount.c                                     |    46 +-
 src/Timpctl.c                                      |    25 +-
 src/Timselpctl.c                                   |    25 +-
 src/Timselstat.c                                   |     1 +
 src/Timsort.c                                      |    30 +-
 src/Timstat.c                                      |    23 +-
 src/Timstat3.c                                     |    15 +-
 src/Trend.c                                        |    41 +-
 src/Trms.c                                         |     4 +
 src/Tstepcount.c                                   |     9 +-
 src/Vargen.c                                       |     8 +-
 src/Varrms.c                                       |     4 +
 src/Vertint.c                                      |    50 +-
 src/Vertstat.c                                     |     4 +
 src/Wct.c                                          |     3 +
 src/YAR.c                                          |    60 +-
 src/Ydayarith.c                                    |     2 +
 src/Ydaypctl.c                                     |    24 +-
 src/Ydaystat.c                                     |     1 +
 src/Ydrunpctl.c                                    |    44 +-
 src/Ydrunstat.c                                    |   113 +-
 src/Yearmonstat.c                                  |     3 +-
 src/Yhourarith.c                                   |     2 +
 src/Yhourstat.c                                    |     1 +
 src/Ymonarith.c                                    |     2 +
 src/Ymonpctl.c                                     |    24 +-
 src/Ymonstat.c                                     |     1 +
 src/Yseaspctl.c                                    |    24 +-
 src/Yseasstat.c                                    |    60 +-
 src/Zonstat.c                                      |     2 +
 src/cdo.c                                          |   225 +-
 src/cdo.h                                          |     4 +-
 src/cdo_int.h                                      |     8 +-
 src/cdo_pthread.c                                  |    14 +-
 src/cdo_vlist.c                                    |    12 +
 src/config.h.in                                    |     9 +
 src/dtypes.h                                       |     4 +-
 src/ecacore.c                                      |    56 +-
 src/ecautil.c                                      |    16 +-
 src/expr.c                                         |    10 +
 src/expr_lex.c                                     |     6 +-
 src/features.c                                     |   114 +
 src/field.c                                        |     2 +-
 src/field.h                                        |     3 +
 src/field2.c                                       |   138 +-
 src/fieldc.c                                       |     7 +-
 src/fieldmem.c                                     |    20 +-
 src/fouriertrans.c                                 |   112 +-
 src/grid.c                                         |   622 +-
 src/grid_area.c                                    |   410 +
 src/griddes.c                                      |    39 +-
 src/griddes.h                                      |     2 +-
 src/griddes_h5.c                                   |    10 +-
 src/griddes_nc.c                                   |    12 +-
 src/gridreference.c                                |   290 +
 src/hetaeta.c                                      |    22 +-
 src/interpol.c                                     |    95 +-
 src/job.c                                          |    20 +-
 src/legendre.c                                     |    26 +-
 src/magics_template_parser.c                       |     2 +-
 src/merge_sort2.c                                  |     8 +-
 src/merge_sort2.h                                  |     2 +-
 src/modules.c                                      |    32 +-
 src/namelist.c                                     |     2 +-
 src/operator_help.h                                |   382 +-
 src/par_io.c                                       |    10 +-
 src/par_io.h                                       |     6 +-
 src/pipe.c                                         |     6 +-
 src/pipe.h                                         |     8 +-
 src/printinfo.h                                    |    49 +-
 src/process.c                                      |    34 +-
 src/pstream.c                                      |   120 +-
 src/pthread_debug.c                                |    16 +-
 src/realtime.c                                     |    12 +-
 src/remap.h                                        |     4 +-
 src/remap_scrip_io.c                               |   762 +
 src/remaplib.c                                     |  1059 +-
 src/remapsort.c                                    |    18 +-
 src/specspace.c                                    |    14 +-
 src/statistic.c                                    |     6 +-
 src/template_parser.h                              |     2 +-
 src/timer.c                                        |     8 +-
 src/userlog.c                                      |    24 +-
 src/util.c                                         |     4 +-
 src/vinterp.c                                      |    18 +-
 test/Makefile.am                                   |    11 +-
 test/Makefile.in                                   |    27 +-
 test/data/Makefile.am                              |     8 +
 {contrib => test/data}/Makefile.in                 |    59 +-
 test/data/bathy4.grb                               |   Bin 0 -> 6008 bytes
 test/data/gp2sp_ref                                |   Bin 0 -> 4064 bytes
 test/data/gp2spl_ref                               |   Bin 0 -> 6256 bytes
 test/data/hl_l19.grb                               |   Bin 0 -> 4888 bytes
 test/data/ml2pl_ref                                |   Bin 0 -> 312 bytes
 test/data/n16_bic_ref                              |   Bin 0 -> 8240 bytes
 test/data/n16_bil_ref                              |   Bin 0 -> 8240 bytes
 test/data/n16_con_ref                              |   Bin 0 -> 8240 bytes
 test/data/n16_laf_ref                              |   Bin 0 -> 8240 bytes
 test/data/n16_nn_ref                               |   Bin 0 -> 8240 bytes
 test/data/n32_bic_ref                              |   Bin 0 -> 32816 bytes
 test/data/n32_bil_ref                              |   Bin 0 -> 32816 bytes
 test/data/n32_con_ref                              |   Bin 0 -> 32816 bytes
 test/data/n32_laf_ref                              |   Bin 0 -> 32816 bytes
 test/data/n32_nn_ref                               |   Bin 0 -> 32816 bytes
 test/data/sp2gp_ref                                |   Bin 0 -> 8368 bytes
 test/data/sp2gpl_ref                               |   Bin 0 -> 8368 bytes
 test/data/t21_geosp_tsurf.grb                      |   Bin 0 -> 8368 bytes
 test/data/timavg_ref                               |   Bin 0 -> 52 bytes
 test/data/timmax_ref                               |   Bin 0 -> 52 bytes
 test/data/timmean_ref                              |   Bin 0 -> 52 bytes
 test/data/timmin_ref                               |   Bin 0 -> 52 bytes
 test/data/timstd1_ref                              |   Bin 0 -> 52 bytes
 test/data/timstd_ref                               |   Bin 0 -> 52 bytes
 test/data/timsum_ref                               |   Bin 0 -> 52 bytes
 test/data/timvar1_ref                              |   Bin 0 -> 52 bytes
 test/data/timvar_ref                               |   Bin 0 -> 52 bytes
 test/data/ts_mm_5years                             |   Bin 0 -> 3120 bytes
 test/test_Gridarea.sh                              |    27 +
 test/test_Remap.sh                                 |    43 +
 test/test_Spectral.sh                              |    65 +
 test/test_Timstat.sh                               |    32 +
 test/test_Vertint.sh                               |    30 +
 test/test_info.py                                  |    37 -
 336 files changed, 27791 insertions(+), 21353 deletions(-)

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



More information about the debian-science-commits mailing list