[cmor] branch debian/master updated (7d132f9 -> daa4171)

Alastair McKinstry mckinstry at moszumanska.debian.org
Mon Jul 31 06:35:49 UTC 2017


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

mckinstry pushed a change to branch debian/master
in repository cmor.

      from  7d132f9   S-V: 4.0.0; no changes required
       new  bbbaa81   Add watch file
      adds  cfc7394   new upstream 3.2.5
       new  c97cd43   Merge tag 'upstream/3.2.5' into debian/master
       new  5e4a1fb   change version number
       new  c3a815e   libcmor-dev now Multi-Arch: same
       new  5bcd601   refresh patches
       new  b989dd8   update rules to include multiple PY3 versions
       new  3adc267   fixes for python3 patch
       new  d999949   PrePARE.py now PrePARE
       new  2d5cc40   Fix script name for PrePARE
       new  daa4171   prep release of 3.2.5-1

The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 INSTALL                                            |    4 +-
 LibCV/PrePARE/PrePARE.py                           |   27 +-
 Makefile.in                                        |    5 +-
 README.md                                          |    4 +-
 RELEASE-NOTES                                      |    1 +
 Src/_controlvocabulary.c                           |  680 +--
 Src/cmor.c                                         |  452 +-
 Src/cmor_CV.c                                      |  129 +-
 Src/cmor_axes.c                                    |  111 +-
 Src/cmor_grids.c                                   |   90 +-
 Src/cmor_tables.c                                  |   91 +-
 Src/cmor_variables.c                               |  226 +-
 Test/climatology_test.c                            |   81 +-
 Test/cmor_speed_and_compression_03.py              |    2 +-
 Test/common_user_input.json                        |    2 +-
 Test/common_user_input_NOID.json                   |    2 +-
 Test/ipcc_test_code.c                              |  647 +--
 Test/test_grid.c                                   |  335 +-
 Test/test_lots_of_variables.c                      |  553 ++-
 Test/test_python_CMIP6_CV_badgridgr.py             |    2 +-
 Test/test_python_CMIP6_CV_badgridlabel.py          |    2 +-
 Test/test_python_CMIP6_CV_badgridresolution.py     |    2 +-
 ...est_python_CMIP6_CV_badinstitutionIDNotSet.json |    2 +-
 ...t_python_jamie_6.py => test_python_jamie_11.py} |   28 +-
 Test/test_python_joerg_3.py                        |    5 +-
 Test/test_python_joerg_4.py                        |    8 +-
 Test/test_python_sos_psu_units.py                  |  106 +
 Test/test_python_toomany_tables.py                 |   16 -
 Test/test_unit_cat_unique.c                        |  262 +-
 TestTables/CMIP6_3hr.json                          |    4 +-
 TestTables/CMIP6_6hrLev.json                       |   10 +-
 TestTables/CMIP6_6hrPlev.json                      |    4 +-
 TestTables/CMIP6_6hrPlevPt.json                    |    6 +-
 TestTables/CMIP6_AERday.json                       |    8 +-
 TestTables/CMIP6_AERhr.json                        |    4 +-
 TestTables/CMIP6_AERmon.json                       |   56 +-
 TestTables/CMIP6_AERmonZ.json                      |    6 +-
 TestTables/CMIP6_Amon.json                         |    4 +-
 TestTables/CMIP6_CF3hr.json                        |  580 ++-
 TestTables/CMIP6_CFday.json                        |    4 +-
 TestTables/CMIP6_CFmon.json                        |   10 +-
 TestTables/CMIP6_CFsubhr.json                      |    8 +-
 TestTables/CMIP6_CFsubhrOff.json                   |   24 +-
 TestTables/CMIP6_CV.json                           |  163 +-
 TestTables/CMIP6_E1hr.json                         |    4 +-
 TestTables/CMIP6_E1hrClimMon.json                  |    4 +-
 TestTables/CMIP6_E3hr.json                         |    4 +-
 TestTables/CMIP6_E3hrPt.json                       |   64 +-
 TestTables/CMIP6_E6hrZ.json                        |    4 +-
 TestTables/CMIP6_Eday.json                         |   30 +-
 TestTables/CMIP6_EdayZ.json                        |   10 +-
 TestTables/CMIP6_Efx.json                          |    4 +-
 TestTables/CMIP6_Emon.json                         |   40 +-
 TestTables/CMIP6_EmonZ.json                        |    8 +-
 TestTables/CMIP6_Esubhr.json                       |    6 +-
 TestTables/CMIP6_Eyr.json                          |    8 +-
 TestTables/CMIP6_IfxAnt.json                       |    4 +-
 TestTables/CMIP6_IfxGre.json                       |    4 +-
 TestTables/CMIP6_ImonAnt.json                      |    4 +-
 TestTables/CMIP6_ImonGre.json                      |    4 +-
 TestTables/CMIP6_IyrAnt.json                       |    4 +-
 TestTables/CMIP6_IyrGre.json                       |    4 +-
 TestTables/CMIP6_LImon.json                        |    4 +-
 TestTables/CMIP6_Lmon.json                         |    6 +-
 TestTables/CMIP6_Oclim.json                        |   12 +-
 TestTables/CMIP6_Oday.json                         |    8 +-
 TestTables/CMIP6_Odec.json                         |    8 +-
 TestTables/CMIP6_Ofx.json                          |    6 +-
 TestTables/CMIP6_Omon.json                         |   10 +-
 TestTables/CMIP6_Omonbad.json                      |   19 +
 .../{CMIP6_Omonbad.json => CMIP6_Omonmissing.json} |   23 +-
 TestTables/CMIP6_Oyr.json                          |    8 +-
 TestTables/CMIP6_SIday.json                        |    4 +-
 TestTables/CMIP6_SImon.json                        |   10 +-
 TestTables/CMIP6_cf3hr_0.json                      |    2 +-
 TestTables/CMIP6_cf3hr_1.json                      |    2 +-
 TestTables/CMIP6_cf3hr_2.json                      |    2 +-
 TestTables/CMIP6_chunking.json                     |    2 +-
 TestTables/CMIP6_coordinate.json                   |    8 +-
 TestTables/CMIP6_day.json                          |    4 +-
 TestTables/CMIP6_formula_terms.json                |   46 +-
 TestTables/CMIP6_fx.json                           |    4 +-
 TestTables/CMIP6_grids.json                        |    4 +-
 TestTables/python_test_table_A                     |    2 +-
 configure                                          |   18 +-
 configure.ac                                       |    2 +-
 debian/changelog                                   |    6 +-
 debian/control                                     |    1 +
 debian/libcmor-dev.install                         |    2 +-
 debian/patches/cmor_ver.patch                      |   10 +-
 debian/patches/destdir.patch                       |   12 +-
 debian/patches/disable_tests.patch                 |   37 +-
 debian/patches/makefile-fix.patch                  |   17 +-
 debian/patches/pkgconfig.patch                     |   12 +-
 debian/patches/prepare-name.patch                  |   10 +
 debian/patches/python3.patch                       | 5049 +++++++++-----------
 debian/patches/series                              |    1 +
 debian/patches/shlib-link.patch                    |   30 +-
 debian/rules                                       |    8 +-
 debian/watch                                       |    3 +
 include/cmor.h                                     |   19 +-
 include/cmor_func_def.h                            |    4 +
 scripts/CMIP6_CV_cron_github.sh                    |   22 +
 scripts/createCMIP6CV.py                           |    8 +-
 setup.py.in                                        |    9 +-
 105 files changed, 5663 insertions(+), 4787 deletions(-)
 copy Test/{test_python_jamie_6.py => test_python_jamie_11.py} (86%)
 create mode 100644 Test/test_python_sos_psu_units.py
 copy TestTables/{CMIP6_Omonbad.json => CMIP6_Omonmissing.json} (99%)
 create mode 100644 debian/patches/prepare-name.patch
 create mode 100644 debian/watch
 create mode 100755 scripts/CMIP6_CV_cron_github.sh

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



More information about the debian-science-commits mailing list