[cdo] 55/84: Merge branch 'dfsg'

Alastair McKinstry mckinstry at moszumanska.debian.org
Sat Jun 13 16:48:38 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 c447ed20de99c4e7f26405d00da42b1d23da2d92
Merge: 1488b93 4b3a298
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jul 5 14:29:27 2014 +0100

    Merge branch 'dfsg'

 ChangeLog                                 |  729 ++--
 Makefile.in                               |  334 +-
 NEWS                                      |   21 +-
 OPERATORS                                 |    3 +
 aclocal.m4                                |  737 ++--
 cdo.spec                                  |    2 +-
 config/compile                            |  232 +-
 config/config.guess                       |  410 ++-
 config/config.sub                         |  241 +-
 config/default                            |   46 +-
 config/depcomp                            |  531 ++-
 config/install-sh                         |   29 +-
 config/ltmain.sh                          | 2494 ++++++++-----
 config/missing                            |  461 +--
 config/mkinstalldirs                      |    9 +-
 config/tap-driver.sh                      |  652 ++++
 configure                                 | 2470 +++++++++----
 configure.ac                              |   27 +-
 contrib/Makefile.in                       |  119 +-
 contrib/cdoCompletion.bash                |   15 +-
 contrib/cdoCompletion.tcsh                |   15 +-
 contrib/cdoCompletion.zsh                 |   15 +-
 libcdi/ChangeLog                          |  614 ++--
 libcdi/Makefile.in                        |  334 +-
 libcdi/NEWS                               |    7 +
 libcdi/aclocal.m4                         |  737 ++--
 libcdi/app/Makefile.in                    |  252 +-
 libcdi/app/cdi.c                          |  150 +-
 libcdi/app/printinfo.h                    |  361 +-
 libcdi/config/compile                     |  232 +-
 libcdi/config/config.guess                |  410 ++-
 libcdi/config/config.sub                  |  241 +-
 libcdi/config/default                     |   14 +-
 libcdi/config/depcomp                     |  531 ++-
 libcdi/config/install-sh                  |   29 +-
 libcdi/config/ltmain.sh                   |    3 +-
 libcdi/config/missing                     |  461 +--
 libcdi/config/mkinstalldirs               |    9 +-
 libcdi/configure                          |  856 +++--
 libcdi/configure.ac                       |    8 +-
 libcdi/examples/Makefile.in               |  302 +-
 libcdi/examples/cdi_write.c               |    4 +-
 libcdi/examples/cdi_write_ens.c           |    2 +-
 libcdi/examples/cdi_write_hybrid.c        |    8 +-
 libcdi/examples/pio/Makefile.in           |  268 +-
 libcdi/examples/pio/collectData.c         |   12 +-
 libcdi/examples/pio/collectDataNStreams.c |   13 +-
 libcdi/interfaces/Makefile.in             |  292 +-
 libcdi/interfaces/cdi.cpp                 |    6 +
 libcdi/m4/acx_options.m4                  |    2 +-
 libcdi/m4/libtool.m4                      |  265 +-
 libcdi/m4/ltoptions.m4                    |   19 +-
 libcdi/src/Makefile.am                    |   13 +-
 libcdi/src/Makefile.in                    |  298 +-
 libcdi/src/basetime.c                     |    3 +-
 libcdi/src/basetime.h                     |    5 +-
 libcdi/src/cdf_int.c                      |   16 +-
 libcdi/src/cdf_int.h                      |    7 +-
 libcdi/src/cdi.h                          |  166 +-
 libcdi/src/cdi.inc                        |   22 +-
 libcdi/src/cdiFortran.c                   |    4 +
 libcdi/src/cdi_cksum.c                    |    2 +-
 libcdi/src/cdi_int.c                      |   67 +-
 libcdi/src/cdi_int.h                      |   36 +-
 libcdi/src/cdilib.c                       | 5537 ++++++++++++++++-------------
 libcdi/src/cdipioFortran.c                |    8 +-
 libcdi/src/cfortran.h                     |   12 +-
 libcdi/src/cgribexlib.c                   |  186 +-
 libcdi/src/cksum.c                        |   54 +-
 libcdi/src/config.h.in                    |    3 -
 libcdi/src/dmemory.c                      |   44 +-
 libcdi/src/dmemory.h                      |   22 +-
 libcdi/src/extralib.c                     |   38 +-
 libcdi/src/file.c                         |   20 +-
 libcdi/src/gaussgrid.c                    |   16 +-
 libcdi/src/gaussgrid.h                    |    2 +-
 libcdi/src/grid.c                         |  278 +-
 libcdi/src/grid.h                         |   10 +-
 libcdi/src/ieglib.c                       |   22 +-
 libcdi/src/institution.c                  |  206 +-
 libcdi/src/institution.h                  |    6 +-
 libcdi/src/mo_cdi.f90                     |  460 ++-
 libcdi/src/model.c                        |  108 +-
 libcdi/src/model.h                        |    4 +-
 libcdi/src/namespace.c                    |   28 +-
 libcdi/src/namespace.h                    |    2 +-
 libcdi/src/pio.c                          |   30 +-
 libcdi/src/pio.h                          |    8 +-
 libcdi/src/pio_cdf_int.c                  |    3 +-
 libcdi/src/pio_client.c                   |    6 +-
 libcdi/src/pio_comm.c                     |   27 +-
 libcdi/src/pio_comm.h                     |    3 -
 libcdi/src/pio_dbuffer.c                  |    2 -
 libcdi/src/pio_impl.h                     |   28 +-
 libcdi/src/pio_interface.c                |   70 +-
 libcdi/src/pio_interface.h                |    4 -
 libcdi/src/pio_list_set.c                 |    7 +-
 libcdi/src/pio_mpinonb.c                  |   13 +-
 libcdi/src/pio_posixasynch.c              |   10 +-
 libcdi/src/pio_posixfpguardsendrecv.c     |    5 +-
 libcdi/src/pio_posixnonb.c                |    3 -
 libcdi/src/pio_record_send.c              |    5 +-
 libcdi/src/pio_rpc.h                      |    3 -
 libcdi/src/pio_serialize.c                |   18 +-
 libcdi/src/pio_serialize.h                |   10 +-
 libcdi/src/pio_server.c                   |   59 +-
 libcdi/src/pio_server.h                   |    6 +-
 libcdi/src/pio_util.c                     |   21 +-
 libcdi/src/pio_util.h                     |   32 +-
 libcdi/src/resource_handle.c              |  358 +-
 libcdi/src/resource_handle.h              |   26 +-
 libcdi/src/resource_unpack.c              |   31 +-
 libcdi/src/resource_unpack.h              |    2 -
 libcdi/src/servicelib.c                   |   32 +-
 libcdi/src/stream.c                       |  252 +-
 libcdi/src/stream_cdf.c                   | 1201 ++++---
 libcdi/src/stream_cgribex.c               |  144 +-
 libcdi/src/stream_ext.c                   |   39 +-
 libcdi/src/stream_grb.c                   |    2 +-
 libcdi/src/stream_gribapi.c               |  507 +--
 libcdi/src/stream_ieg.c                   |   56 +-
 libcdi/src/stream_record.c                |    6 +-
 libcdi/src/stream_srv.c                   |   39 +-
 libcdi/src/stream_var.c                   |   11 +-
 libcdi/src/taxis.c                        |  581 ++-
 libcdi/src/taxis.h                        |   49 +-
 libcdi/src/varscan.c                      |   44 +-
 libcdi/src/varscan.h                      |    2 +-
 libcdi/src/version.c                      |    6 +-
 libcdi/src/vlist.c                        |   94 +-
 libcdi/src/vlist.h                        |   11 +-
 libcdi/src/vlist_att.c                    |   28 +-
 libcdi/src/vlist_var.c                    |  126 +-
 libcdi/src/vlist_var.h                    |    1 +
 libcdi/src/zaxis.c                        |  543 ++-
 libcdi/src/zaxis.h                        |    5 +
 libcdi/tests/Makefile.am                  |    2 +-
 libcdi/tests/Makefile.in                  |  332 +-
 libcdi/tests/cksum_verify.c               |    4 +
 libcdi/tests/deco2d_model.c               |    1 -
 libcdi/tests/pio_write_run.in             |    5 +-
 libcdi/tests/test_resource_copy.c         |    8 +-
 m4/acx_options.m4                         |   10 +-
 m4/libtool.m4                             | 1305 +++++--
 m4/ltoptions.m4                           |   19 +-
 m4/ltversion.m4                           |   12 +-
 src/Adisit.c                              |   10 +-
 src/Arith.c                               |   16 +-
 src/Arithc.c                              |    4 +-
 src/Arithdays.c                           |    2 +-
 src/Arithlat.c                            |    4 +-
 src/CDIread.c                             |    4 +-
 src/CDItest.c                             |    6 +-
 src/CDIwrite.c                            |    8 +-
 src/Cat.c                                 |    2 +-
 src/Change.c                              |   25 +-
 src/Change_e5slm.c                        |    8 +-
 src/Cloudlayer.c                          |   10 +-
 src/Command.c                             |   15 +-
 src/Comp.c                                |   10 +-
 src/Compc.c                               |    4 +-
 src/Complextorect.c                       |    6 +-
 src/Cond.c                                |   14 +-
 src/Cond2.c                               |   16 +-
 src/Condc.c                               |    4 +-
 src/Consecstat.c                          |    6 +-
 src/Copy.c                                |    4 +-
 src/Deltime.c                             |   10 +-
 src/Derivepar.c                           |  161 +-
 src/Detrend.c                             |   26 +-
 src/Diff.c                                |   96 +-
 src/Duplicate.c                           |    8 +-
 src/EOFs.c                                |  102 +-
 src/EcaIndices.c                          |   18 +-
 src/Echam5ini.c                           |   72 +-
 src/Enlarge.c                             |    4 +-
 src/Enlargegrid.c                         |   18 +-
 src/Ensstat.c                             |   12 +-
 src/Ensstat3.c                            |   44 +-
 src/Ensval.c                              |   34 +-
 src/Eof3d.c                               |   77 +-
 src/Eofcoeff.c                            |   64 +-
 src/Eofcoeff3d.c                          |   68 +-
 src/Exprf.c                               |   18 +-
 src/FC.c                                  |    6 +-
 src/Filedes.c                             |   18 +-
 src/Fillmiss.c                            |   12 +-
 src/Filter.c                              |  377 +-
 src/Fldrms.c                              |    6 +-
 src/Fldstat.c                             |    4 +-
 src/Fldstat2.c                            |    6 +-
 src/Fourier.c                             |   46 +-
 src/Gather.c                              |   36 +-
 src/Gengrid.c                             |    6 +-
 src/Gradsdes.c                            |   44 +-
 src/Gridboxstat.c                         |   44 +-
 src/Gridcell.c                            |    8 +-
 src/Harmonic.c                            |   16 +-
 src/Hi.c                                  |    6 +-
 src/Histogram.c                           |   16 +-
 src/Importamsr.c                          |    6 +-
 src/Importbinary.c                        |   31 +-
 src/Importcmsaf.c                         |   47 +-
 src/Importobs.c                           |    8 +-
 src/Info.c                                |   70 +-
 src/Input.c                               |    6 +-
 src/Intgrid.c                             |   36 +-
 src/Intgridtraj.c                         |   14 +-
 src/Intlevel.c                            |   28 +-
 src/Intlevel3d.c                          |   46 +-
 src/Intntime.c                            |   24 +-
 src/Inttime.c                             |   22 +-
 src/Intyear.c                             |    8 +-
 src/Invert.c                              |   28 +-
 src/Invertlev.c                           |   18 +-
 src/Isosurface.c                          |   12 +-
 src/Maggraph.c                            |   42 +-
 src/Magplot.c                             |   14 +-
 src/Magvector.c                           |    8 +-
 src/Makefile.am                           |   22 +-
 src/Makefile.in                           | 4617 ++++++++++++------------
 src/Maskbox.c                             |   14 +-
 src/Mastrfu.c                             |   16 +-
 src/Math.c                                |    6 +-
 src/Merge.c                               |   10 +-
 src/Mergegrid.c                           |   18 +-
 src/Mergetime.c                           |    4 +-
 src/Merstat.c                             |    6 +-
 src/Monarith.c                            |   12 +-
 src/Mrotuv.c                              |   28 +-
 src/Mrotuvb.c                             |   28 +-
 src/Output.c                              |    8 +-
 src/Outputgmt.c                           |   34 +-
 src/Pack.c                                |    6 +-
 src/Pinfo.c                               |    4 +-
 src/Pressure.c                            |   24 +-
 src/Regres.c                              |    8 +-
 src/Remap.c                               |  671 ++--
 src/Remapeta.c                            |  158 +-
 src/Replace.c                             |   18 +-
 src/Replacevalues.c                       |    2 +-
 src/Rhopot.c                              |    8 +-
 src/Rotuv.c                               |   16 +-
 src/Runpctl.c                             |   10 +-
 src/Runstat.c                             |   18 +-
 src/SSOpar.c                              |   32 +-
 src/Scatter.c                             |   26 +-
 src/Seascount.c                           |    6 +-
 src/Seaspctl.c                            |   12 +-
 src/Seasstat.c                            |   10 +-
 src/Selbox.c                              |   92 +-
 src/Select.c                              |   47 +-
 src/Seloperator.c                         |    2 +-
 src/Seltime.c                             |   48 +-
 src/Selvar.c                              |    4 +-
 src/Set.c                                 |    9 +-
 src/Setbox.c                              |    4 +-
 src/Setgatt.c                             |    2 +-
 src/Setgrid.c                             |   16 +-
 src/Sethalo.c                             |   54 +-
 src/Setmiss.c                             |    2 +-
 src/Setpartab.c                           |   68 +-
 src/Setrcaname.c                          |    2 +-
 src/Settime.c                             |    2 +-
 src/Setzaxis.c                            |    2 +-
 src/Sinfo.c                               |  220 +-
 src/Smooth9.c                             |    8 +-
 src/Sort.c                                |    8 +-
 src/Sorttimestamp.c                       |   10 +-
 src/Specinfo.c                            |    2 +-
 src/Spectral.c                            |    8 +-
 src/Spectrum.c                            |   39 +-
 src/Split.c                               |   42 +-
 src/Splitrec.c                            |    2 +-
 src/Splitsel.c                            |    8 +-
 src/Splittime.c                           |    8 +-
 src/Splityear.c                           |    2 +-
 src/StringUtilities.c                     |    2 +-
 src/Subtrend.c                            |    4 +-
 src/Tee.c                                 |    2 +-
 src/Templates.c                           |    4 +-
 src/Test.c                                |   10 +-
 src/Tests.c                               |    4 +-
 src/Timcount.c                            |    6 +-
 src/Timpctl.c                             |    6 +-
 src/Timselpctl.c                          |    6 +-
 src/Timselstat.c                          |   10 +-
 src/Timsort.c                             |   12 +-
 src/Timstat.c                             |   13 +-
 src/Timstat2.c                            |   23 +-
 src/Timstat3.c                            |   21 +-
 src/Tinfo.c                               |   50 +-
 src/Tocomplex.c                           |    4 +-
 src/Transpose.c                           |    8 +-
 src/Trend.c                               |    8 +-
 src/Trms.c                                |   12 +-
 src/Tstepcount.c                          |    8 +-
 src/Vardup.c                              |   14 +-
 src/Vargen.c                              |   69 +-
 src/Varrms.c                              |   10 +-
 src/Vertint.c                             |  177 +-
 src/Vertstat.c                            |   16 +-
 src/Vertwind.c                            |   18 +-
 src/Wct.c                                 |    4 +-
 src/Wind.c                                |   10 +-
 src/Writegrid.c                           |    2 +-
 src/Writerandom.c                         |   12 +-
 src/YAR.c                                 |  129 +-
 src/Ydayarith.c                           |   12 +-
 src/Ydaypctl.c                            |    6 +-
 src/Ydaystat.c                            |   10 +-
 src/Ydrunpctl.c                           |   10 +-
 src/Ydrunstat.c                           |   12 +-
 src/Yearmonstat.c                         |   10 +-
 src/Yhourarith.c                          |   12 +-
 src/Yhourstat.c                           |   10 +-
 src/Ymonarith.c                           |   12 +-
 src/Ymonpctl.c                            |    6 +-
 src/Ymonstat.c                            |   17 +-
 src/Yseaspctl.c                           |    6 +-
 src/Yseasstat.c                           |   10 +-
 src/Zonstat.c                             |   26 +-
 src/cdo.c                                 |  542 ++-
 src/cdo.h                                 |   16 +-
 src/cdo_getopt.c                          |  248 ++
 src/cdo_getopt.h                          |   43 +
 src/cdo_int.h                             |    6 +-
 src/cdo_vlist.c                           |  160 +-
 src/cdotest.c                             |    6 +-
 src/clipping/area.c                       |  293 +-
 src/clipping/clipping.c                   |  904 +++--
 src/clipping/clipping.h                   |   13 +-
 src/clipping/geometry.h                   |  114 +-
 src/clipping/geometry_tools.c             |  159 +-
 src/clipping/grid.h                       |   14 +-
 src/clipping/grid_cell.c                  |   84 +-
 src/clipping/grid_cell.h                  |    7 +
 src/clipping/intersection.c               |  838 ++++-
 src/clipping/utils.c                      |    4 +
 src/clipping/utils.h                      |   41 +-
 src/color.c                               |    6 +-
 src/config.h.in                           |    3 -
 src/const.h                               |   14 +-
 src/dmemory.h                             |   16 +-
 src/ecacore.c                             |  120 +-
 src/exception.c                           |   16 +
 src/expr.c                                |   28 +-
 src/expr_yacc.c                           |    8 +-
 src/features.c                            |    3 +
 src/field.c                               |    2 +-
 src/field2.c                              |    2 +-
 src/fieldmem.c                            |    8 +-
 src/fieldmer.c                            |    2 +-
 src/fieldzon.c                            |    2 +-
 src/fouriertrans.c                        |   12 +-
 src/grid.c                                |   96 +-
 src/grid_area.c                           |   10 +-
 src/grid_gme.c                            |   26 +-
 src/grid_rot.c                            |   20 +-
 src/griddes.c                             |   68 +-
 src/griddes_h5.c                          |   12 +-
 src/griddes_nc.c                          |   12 +-
 src/hetaeta.c                             |  222 +-
 src/history.c                             |   47 +-
 src/interpol.c                            |  147 +-
 src/job.c                                 |    8 +-
 src/kvlist.c                              |    8 +-
 src/list.c                                |    6 +-
 src/magics_template_parser.c              |    4 +-
 src/merge_sort2.c                         |    4 +-
 src/modules.c                             |   19 +-
 src/namelist.c                            |  101 +-
 src/operator_help.h                       |  222 +-
 src/par_io.c                              |    1 +
 src/percentiles.c                         |   16 +-
 src/pipe.c                                |   24 +-
 src/printinfo.h                           |  371 +-
 src/process.c                             |   82 +-
 src/pstream.c                             |   67 +-
 src/pstream.h                             |    2 +
 src/remap.h                               |   89 +-
 src/remap_bicubic_scrip.c                 |  420 +++
 src/remap_bilinear_scrip.c                |  494 +++
 src/remap_conserv.c                       |  945 +++++
 src/remap_conserv_scrip.c                 | 1945 ++++++++++
 src/remap_distwgt_scrip.c                 |  597 ++++
 src/remap_scrip_io.c                      |   26 +-
 src/remap_search_latbins.c                |  362 +-
 src/remap_search_reg2d.c                  |  185 +
 src/remap_store_link.c                    |  290 ++
 src/remap_store_link.h                    |   35 +
 src/remaplib.c                            | 4792 +------------------------
 src/remapsort.c                           |   12 +-
 src/specspace.c                           |   60 +-
 src/statistic.c                           |   95 +-
 src/statistic.h                           |    4 +-
 src/stdnametable.c                        |   27 +-
 src/stdnametable.h                        |   14 +
 src/table.c                               |    2 +-
 src/text.c                                |   30 +
 src/text.h                                |   28 +
 src/userlog.c                             |   14 +-
 src/util.c                                |   38 +-
 src/util.h                                |    2 +-
 src/zaxis.c                               |   58 +-
 test/Cat.test.in                          |   43 +
 test/Detrend.test.in                      |   72 +
 test/Genweights.test.in                   |   60 +
 test/Gridarea.test.in                     |   37 +
 test/Makefile.am                          |   24 +-
 test/Makefile.in                          |  628 +++-
 test/Remap.test.in                        |   53 +
 test/Select.test.in                       |   53 +
 test/Spectral.test.in                     |   99 +
 test/Timstat.test.in                      |   42 +
 test/Vertint.test.in                      |   37 +
 test/data/Makefile.am                     |    8 +-
 test/data/Makefile.in                     |  126 +-
 test/data/detrend_data                    |  Bin 0 -> 5200 bytes
 test/data/detrend_ref                     |  Bin 0 -> 5200 bytes
 test/data/n16_ycon_ref                    |  Bin 0 -> 8240 bytes
 test/data/n32_ycon_ref                    |  Bin 0 -> 32816 bytes
 test/testStreams.py                       |   46 -
 test/test_Cat.sh                          |   42 -
 test/test_Gridarea.sh                     |   27 -
 test/test_Select.sh                       |   55 -
 test/test_Spectral.sh                     |   65 -
 test/test_Timstat.sh                      |   32 -
 test/test_Vertint.sh                      |   30 -
 429 files changed, 33613 insertions(+), 23390 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