[pyferret] 52/110: Merge branch 'debian/master' into dev-python3 (1.2.0)
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 08:42:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository pyferret.
commit 0777caae71b5087414e3d91d6821ddc7f8960946
Merge: f437385 b667527
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Aug 9 10:15:58 2016 +0100
Merge branch 'debian/master' into dev-python3 (1.2.0)
Makefile | 29 +-
bench/39839D6273F1749BABAD6C1441B2BBDD_netcdf.nc | Bin 0 -> 13504 bytes
bench/RUN_TESTS.sh | 13 +-
bench/TEST_SCRIPTS | 21 +
bench/TRASH_FILES | 4 +
bench/ansley_official.linux_err | 1607 +-
bench/ansley_official.linux_log | 12684 ++-
bench/ansley_official.rhel6-32_err | 3676 -
bench/ansley_official.rhel6-32_log | 78481 -------------------
bench/ansley_official.rhel6-64_err | 1592 +-
bench/ansley_official.rhel6-64_log | 12731 ++-
bench/ansley_official.x86_64-linux_err | 1565 +-
bench/ansley_official.x86_64-linux_log | 7638 +-
bench/bn691_bug_fixes.jnl | 3 +
bench/bn694_bug_fixes.jnl | 108 +
bench/bn695_bug_fixes.jnl | 11 +
bench/bn696_bug_fixes.jnl | 8 +
bench/bn_DQ.jnl | 240 +
bench/bn_DQ.sub | 5 +
bench/bn_aggregate_e.jnl | 2 +-
bench/bn_all.jnl | 66 +-
bench/bn_annotate.jnl | 217 +
bench/bn_auxiliary.jnl | 403 +
bench/bn_auxiliary.sub | 152 +
bench/bn_axis_viewports.jnl | 16 +-
bench/bn_bin_regrid.jnl | 8 +
bench/bn_bin_regrid.sub | 22 +
bench/bn_can_var_noerr.jnl | 32 +
bench/bn_dots.jnl | 1 -
bench/bn_f_tax_fcns.jnl | 52 +
bench/bn_floatstr_extended.jnl | 60 +
bench/bn_flowlines.jnl | 2 -
bench/bn_fmrc.jnl | 18 +
bench/bn_gif.jnl | 20 +-
bench/bn_graticules.jnl | 1 -
bench/bn_grave.jnl | 2 +-
bench/bn_if.sub | 57 +
bench/bn_labwid.jnl | 19 +-
bench/bn_legend_labels.jnl | 20 +
bench/bn_lon_lat_time_string.jnl | 19 +
bench/bn_mode_logo_lab.jnl | 2 +-
bench/bn_multi_decade.jnl | 2 +-
bench/bn_odd_variable_name.jnl | 5 +-
bench/bn_outline_poly.jnl | 4 +
bench/bn_permute_ascii.jnl | 79 +
bench/bn_plot.jnl | 20 +-
bench/bn_plot_ribbon_gaploc.jnl | 38 +
bench/bn_ps.jnl | 16 +-
bench/bn_return_defined.jnl | 15 +
bench/bn_save_justdim.jnl | 24 +
bench/bn_strings.jnl | 5 +
bench/bn_time2d.jnl | 19 +
bench/bn_time_short_axes.jnl | 27 +
bench/bn_vec_curv.jnl | 2 +-
bench/bn_vtree.jnl | 5 +
bench/bn_vtree_regrid.jnl | 178 +
bench/check_pdf_ImageMagick | 52 +
bench/edge.nc | Bin 0 -> 2492 bytes
bench/err570_shakeylab.jnl | 4 +-
bench/err580_def_view_axes.jnl | 2 +-
bench/err600_reset_redefine_axis.jnl | 14 +-
bench/err684_axticlab.jnl | 6 +-
bench/err691_pt_in_poly.jnl | 29 +
bench/err691_substring_arg.jnl | 9 +
bench/err693_attr_in_gcfcn.jnl | 21 +
bench/err693_check_edges.jnl | 23 +
bench/err693_edit_useratt.jnl | 26 +
bench/err693_ef_axis_precision.jnl | 13 +
bench/err693_fcn_of_attvar.jnl | 11 +
bench/err693_frame_types.jnl | 20 +
bench/err693_if_then_flow_1368.jnl | 30 +
bench/err693_if_then_flow_1446.jnl | 14 +
bench/err693_if_then_flow_1681.jnl | 29 +
bench/err693_if_then_flow_1706.jnl | 11 +
bench/err693_if_then_flow_1860.jnl | 41 +
bench/err693_if_then_flow_2211.jnl | 17 +
bench/err693_if_then_flow_2214.jnl | 23 +
bench/err693_inconsistent_quote.jnl | 10 +
bench/err693_isize_and_gcfcn.jnl | 26 +
bench/err693_isready_dyn_grid_crash.jnl | 5 +
bench/err693_isready_hang.jnl | 12 +
bench/err693_lev_nv_over.jnl | 15 +
bench/err693_line_over_axis.jnl | 12 +
bench/err693_list_missing.jnl | 10 +
bench/err693_parse_curly.jnl | 14 +
bench/err693_parse_curly.sub | 39 +
bench/err693_redef_rec_axis.jnl | 20 +
bench/err693_repeat_err.jnl | 11 +
bench/err693_ribbon_scale.jnl | 10 +
bench/err693_ribbon_start_missing.jnl | 40 +
bench/err693_save_packed.jnl | 7 +
bench/err693_save_packed.nc | Bin 0 -> 1716 bytes
bench/err693_scalar_grids.jnl | 35 +
bench/err693_shape.jnl | 16 +
bench/err693_shf_subscr.jnl | 22 +
bench/err693_shift_w_region.jnl | 12 +
bench/err693_std4d.jnl | 28 +
bench/err693_string_results.jnl | 13 +
bench/err693_subspan_trans.jnl | 34 +
bench/err693_undetected_regrid_dset.jnl | 15 +
bench/err693_upcase_quoted_name.jnl | 16 +
bench/err694_longname_showdat.jnl | 20 +
bench/err694_shf_missing.jnl | 11 +
bench/err695_bounds_match_axis.jnl | 12 +
bench/err695_show_dat_nodata.jnl | 18 +
bench/err69_isready_bugs.jnl | 6 +
bench/ferret_startup | 5 +-
bench/fxdata.dat | 8 +
bench/levitus_3d_subset.nc | Bin 0 -> 1936 bytes
bench/run1.nc | Bin 0 -> 5384 bytes
bench/run2.nc | Bin 0 -> 5384 bytes
bench/run3.nc | Bin 0 -> 5384 bytes
bench/run4.nc | Bin 0 -> 5384 bytes
bench/run_all | 9 +-
bench/shorttemp.nc | Bin 0 -> 1624 bytes
bench/test_results/axticlabel.pdf | Bin 7166 -> 7176 bytes
bench/test_results/bnplot.pdf | Bin 183735 -> 171732 bytes
bench/test_results/closed_lev.pdf | Bin 38600 -> 36893 bytes
bench/test_results/dashbug.pdf | Bin 10364 -> 10056 bytes
bench/test_results/degC_axlab.pdf | Bin 6880 -> 6866 bytes
bench/test_results/dots.pdf | Bin 5269 -> 5215 bytes
bench/test_results/ferret_run_tests_err | 1087 +-
bench/test_results/ferret_run_tests_log | 10619 ++-
bench/test_results/ferret_run_tests_ncdump | 227 +-
bench/test_results/flowlines.pdf | Bin 55588 -> 54060 bytes
bench/test_results/graticules.pdf | 143 +-
bench/test_results/linecolors.pdf | Bin 16442 -> 16412 bytes
bench/test_results/multi_line_labels.pdf | Bin 30894 -> 31257 bytes
bench/test_results/outline_poly.pdf | Bin 0 -> 8601 bytes
bench/test_results/polygon_plot.pdf | Bin 16172 -> 12323 bytes
bench/test_results/pyferret_run_tests_err | 1237 +-
bench/test_results/pyferret_run_tests_log | 11487 ++-
bench/test_results/pyferret_run_tests_ncdump | 228 +-
bench/test_results/startup_tests2.pdf | Bin 11570 -> 8921 bytes
bench/test_results/timetics.pdf | Bin 15977 -> 14977 bytes
bench/test_results/timetics2.pdf | Bin 27383 -> 27634 bytes
bench/test_results/vec_curv.pdf | Bin 14410 -> 14648 bytes
bench/test_results/vec_curv2.pdf | Bin 29018 -> 28938 bytes
bench/test_results/viewaxes.pdf | Bin 8091 -> 8105 bytes
bench/timesec.nc | Bin 0 -> 2276 bytes
bench/twodtime.nc | Bin 0 -> 1076 bytes
bin/ferret_paths_template.csh | 2 +
bin/ferret_paths_template.sh | 2 +
bin/make_environment_tar | 3 +-
bin/make_executable_tar | 18 +-
bin/make_source_tar | 2 +-
debian/changelog | 15 +
debian/control | 2 +-
debian/patches/automate-tests.parch | 24 +-
debian/patches/reproducible.patch | 24 +
debian/patches/series | 1 +
debian/platform_specific.mk.debian | 1 +
debian/rules | 4 +
debian/site_specific.mk.in | 2 +-
external_functions/ef_utility/site_specific.mk | 7 +-
external_functions/fft/Makefile | 2 +-
external_functions/gridding/Makefile | 4 +-
.../gridding/fco2_xyt_stats_year.jnl | 84 -
external_functions/gridding/nobsxytv.F | 79 +-
.../gridding/scat2grid_mask_bin_xyt.F | 7 +-
external_functions/gridding/socat_decadal.jnl | 99 -
.../gridding/socat_monthly_climatology.jnl | 96 -
external_functions/gridding/socat_yearly.jnl | 93 -
.../gridding/test_tracks2grid_var_xyt.jnl | 64 -
.../gridding/tracks2grid_ave_fco2_xyt_stats.jnl | 57 -
.../gridding/tracks2grid_mask_ave_xyt.F | 168 +-
external_functions/gridding/tracks2grid_std_xyt.F | 186 +-
external_functions/las/Makefile | 2 +-
external_functions/las/lon_lat_time_string.F | 238 +
external_functions/zaxr/Makefile | 2 +-
fer/ccr/EF_InternalUtil.c | 356 +-
fer/ccr/SOURCE_FILES | 5 +
.../tm_switch_nan.c => fer/ccr/cache_full_array.c | 56 +-
fer/ccr/create_utf8_string.c | 80 +
.../free_cached_full_array.c} | 50 +-
.../recover_cached_full_array.c} | 47 +-
fer/ccr/text_to_utf8.c | 67 +
fer/ccr/utf8str.h | 5 +
fer/cferbind/cairoCFerBind.h | 40 +-
fer/cferbind/cairoCFerBind_clipView.c | 8 +-
fer/cferbind/cairoCFerBind_createBrush.c | 2 +-
fer/cferbind/cairoCFerBind_createColor.c | 2 +-
fer/cferbind/cairoCFerBind_createFont.c | 104 +-
fer/cferbind/cairoCFerBind_createPen.c | 2 +-
fer/cferbind/cairoCFerBind_createSurface.c | 62 +-
fer/cferbind/cairoCFerBind_createWindow.c | 17 +-
fer/cferbind/cairoCFerBind_deleteFont.c | 35 +-
fer/cferbind/cairoCFerBind_drawMultiline.c | 12 +-
fer/cferbind/cairoCFerBind_drawPoints.c | 12 +-
fer/cferbind/cairoCFerBind_drawPolygon.c | 51 +-
fer/cferbind/cairoCFerBind_drawRectangle.c | 51 +-
fer/cferbind/cairoCFerBind_drawText.c | 92 +-
fer/cferbind/cairoCFerBind_saveWindow.c | 159 +-
fer/cferbind/cairoCFerBind_setWidthFactor.c | 2 +-
...tWidthFactor.c => cairoCFerBind_setWindowDpi.c} | 22 +-
fer/cferbind/cairoCFerBind_textSize.c | 110 +
fer/cferbind/cairoCFerBind_windowScreenInfo.c | 14 +-
fer/cferbind/cferbind.h | 10 +-
fer/cferbind/cferbind_createWindow.c | 7 +-
fer/cferbind/pyqtcairoCFerBind_createWindow.c | 18 +-
fer/cferbind/pyqtcairoCFerBind_updateWindow.c | 8 +-
fer/common/ferret.parm | 70 +-
fer/common/fgrdel.cmn | 5 +-
fer/common/interp_stack.parm | 9 +-
fer/common/rpn.parm | 5 +-
fer/common/slash.parm | 83 +-
fer/common/xcommand.cmn | 34 +-
fer/common/xcontext.cmn | 17 +-
fer/common/xcontrol.cmn | 10 +-
fer/common/xdependency_tree.cmn | 4 +
fer/common/xprog_state.cmn | 78 +-
fer/common/xrisc.cmn | 9 +-
fer/common/xvariables.cmn | 15 +-
fer/ctx/apply_auto_curv.F | 90 +-
fer/ctx/apply_context_mods.F | 5 +-
fer/ctx/complete_missing_limits.F | 7 +-
fer/ctx/cs_set_context.F | 11 +-
fer/ctx/del_cx_dim.F | 5 +-
fer/ctx/flesh_out_axis.F | 30 +-
fer/ctx/get_auto_aux_vars.F | 21 +-
fer/ctx/get_aux_var_context.F | 25 +-
fer/ctx/get_context_bad_flag.F | 7 +-
fer/ctx/get_context_grid.F | 59 +-
fer/ctx/get_var_context.F | 31 +-
fer/ctx/init_context_mods.F | 3 +-
fer/ctx/init_empty_context.F | 5 +-
fer/ctx/known_data_type.F | 8 +-
fer/ctx/merge_axis_with_offsets.F | 5 +-
fer/ctx/merge_grid.F | 37 +-
fer/ctx/parse_var_name.F | 33 +-
fer/ctx/pseudo_var_context.F | 6 +-
fer/dat/SOURCE_FILES | 1 -
fer/dat/xalgebra_data.F | 64 +-
fer/dat/xcommand_data.F | 146 +-
fer/dat/xfgrdel_data.F | 3 +
fer/dat/xprog_state_data.F | 45 +-
fer/dat/xrevision_data.F | 12 +-
fer/dat/xvariables_data.F | 2 +
fer/doo/SOURCE_FILES | 11 +-
fer/doo/ave_regrid_1_axis.F | 15 +-
fer/doo/bin_regrid_1_axis.F | 495 +
fer/doo/convolve_p.F | 390 +
fer/doo/dd1step.F | 2 +-
fer/doo/diag_op.F | 16 +-
fer/doo/{do_stddev.F => do_4d_std.F} | 35 +-
fer/doo/do_4d_trans.F | 18 +-
..._regrid_line_ave.F => do_aux_regrid_line_ave.F} | 60 +-
..._regrid_line_lin.F => do_aux_regrid_line_lin.F} | 2 +-
fer/doo/do_aux_var_regrid.F | 73 +-
fer/doo/do_aux_var_regrid_1d.F | 225 +-
fer/doo/do_aux_var_regrid_1d_t.F | 233 +
fer/doo/do_aux_var_regrid_2d_tf.F | 286 +
.../decrement_plot_grid.F => doo/do_bin_regrid.F} | 32 +-
fer/doo/{do_stddev.F => do_smth_box_p.F} | 52 +-
fer/doo/do_stddev.F | 0
fer/doo/regrid_comments.F | 86 +-
fer/ef_utility/SOURCE_FILES | 3 +-
fer/ef_utility/ef_get_axis_dates.F | 110 +-
.../{ef_get_axis_dates.F => ef_get_date_tstep.F} | 65 +-
fer/efi/SOURCE_FILES | 12 +
fer/efi/bin_index_wt.F | 14 +-
fer/efi/curv_to_rect.F | 95 +-
fer/efi/{curv_to_rect.F => curv_to_rect_fsu.F} | 228 +-
fer/efi/curv_to_rect_subs.F | 94 +
fer/efi/expndi_by_m_counts.F | 3 +-
fer/efi/expndi_by_z_counts.F | 3 +-
fer/efi/floatstr.F | 73 +-
fer/efi/ft_to_orthogonal.F | 259 +
fer/efi/labwid.F | 49 +-
fer/efi/lon_lat_time_string.F | 298 +
fer/efi/piecewise3.F | 479 +
fer/efi/piecewise_subs.F | 511 +
fer/efi/pt_in_poly.F | 88 +-
fer/efi/sample_fast_i.F | 167 +
fer/efi/sample_fast_i_str.F | 178 +
fer/efi/{samplet_date.F => samplef_date.F} | 188 +-
fer/efi/samplet_date.F | 5 +-
fer/efi/samplexyt_nrst.F | 19 +-
fer/efi/scat2grid_bin_xyt.F | 6 +-
fer/efi/scat2grid_nbin_xyt.F | 6 +-
fer/efi/separate_str.F | 256 +
fer/efi/tax_datestring.F | 287 +-
fer/efi/tax_day.F | 180 +-
fer/efi/tax_dayfrac.F | 181 +-
fer/efi/tax_jday.F | 184 +-
fer/efi/tax_jday1900.F | 175 +-
fer/efi/tax_month.F | 141 +-
fer/efi/tax_subs.F | 51 +
fer/efi/tax_times.F | 32 +
fer/efi/tax_tstep.F | 161 +-
fer/efi/tax_units.F | 49 +-
fer/efi/tax_year.F | 170 +-
fer/efi/tax_yearfrac.F | 189 +-
fer/efi/{tax_units.F => time_reformat.F} | 152 +-
fer/efi/write_webrow_gwt.F | 272 +
fer/fmt/SOURCE_FILES | 1 +
fer/fmt/ascii_limits.F | 20 +-
.../get_context_bad_flag.F => fmt/aux_var_units.F} | 60 +-
fer/fmt/ax_title.F | 19 +-
fer/fmt/var_title.F | 3 +-
fer/fmt/var_title_mod.F | 13 +-
fer/fmt/var_units.F | 3 +-
fer/gnl/SOURCE_FILES | 1 +
fer/gnl/all_1_arg.F | 15 +
fer/gnl/atom_pos.F | 21 +-
fer/gnl/cancel_data_set.F | 23 +-
fer/gnl/cdf_list.F | 57 +-
fer/gnl/cdf_list_global_atts.F | 6 +-
fer/gnl/check_member_sets.F | 16 +-
fer/gnl/create_agg_axis.F | 26 +-
fer/gnl/create_agg_dset.F | 4 +-
fer/gnl/define_aggregate_grid.F | 314 +-
fer/gnl/dollar_arg.F | 60 +-
fer/gnl/edit_attribute.F | 2 +
fer/gnl/equal_permute.F | 18 +-
fer/gnl/equal_str_lc.F | 16 +-
fer/gnl/equal_string.F | 16 +-
fer/gnl/float2string_for_xml.F | 14 +-
fer/gnl/get_context_mods.F | 231 +-
fer/gnl/get_fer_command.F | 189 +-
fer/gnl/get_fvars_list_by_attname_and_val.F | 5 +-
fer/gnl/get_uvars_list_by_attname_and_val.F | 5 +-
fer/gnl/init_aggregate_dset.F | 128 +-
fer/gnl/list_cmnd_data.F | 47 +-
fer/gnl/list_multi_sub.F | 4 +-
fer/gnl/parse_comma_list.F | 25 +
fer/gnl/parse_command.F | 332 +-
fer/gnl/pop_cs.F | 25 +-
fer/gnl/process_if.F | 125 +-
fer/gnl/redefine_ax_att.F | 10 +-
fer/gnl/repl_exprns.F | 372 +-
fer/gnl/reset_ax_att.F | 7 +-
fer/gnl/set_var.F | 60 +-
fer/gnl/show_data.F | 13 +-
fer/gnl/show_data_files.F | 2 +
fer/gnl/show_data_set_attrs.F | 9 +-
fer/gnl/show_data_set_vars.F | 7 +-
fer/gnl/show_data_set_vars_xml.F | 14 +
fer/gnl/show_line.F | 4 +-
fer/gnl/show_line_coords.F | 5 +-
fer/gnl/{create_agg_dset.F => show_pytext_group.F} | 102 +-
fer/gnl/translate_limit.F | 13 +
fer/gnl/var_stat.F | 75 +-
fer/grdel/draw.c | 180 +-
fer/grdel/ferdrawtext.F | 107 +
fer/grdel/fertextsize.F | 80 +
fer/grdel/fgd_engine_match.F | 9 +-
fer/grdel/fgd_gfa.F | 55 +-
fer/grdel/fgd_gopwk.F | 6 +-
fer/grdel/fgd_set_engine.F | 14 +-
fer/grdel/fgd_set_outline_width.F | 30 +
fer/grdel/fgd_set_window_dpi.F | 36 +
fer/grdel/font.c | 19 +-
fer/grdel/getTransformValues.c | 46 +
fer/grdel/grdel.h | 8 +-
fer/grdel/window.c | 90 +-
fer/ino/cdf_prep_cache.F | 12 +-
fer/ino/find_dset_number.F | 4 +-
fer/ino/var_ss_lims.F | 7 +-
fer/mem/SOURCE_FILES | 2 +
.../create_full_range_context.F} | 46 +-
fer/mem/delete_user_var_sub.F | 16 +-
fer/mem/erase_dset.F | 13 +-
fer/mem/find_mem_var.F | 14 +-
.../find_mem_var_incl_c_cache.F} | 79 +-
fer/mem/find_var_name.F | 40 +-
fer/mem/purge_mr_axis.F | 11 +-
fer/mem/purge_mr_grid.F | 5 +-
fer/mem/var_code.F | 8 +-
fer/plt/SOURCE_FILES | 7 +
fer/plt/axis_end_syms.F | 5 +-
fer/plt/axis_ends.F | 26 +-
fer/plt/axis_format.F | 45 +-
fer/plt/box_label.F | 44 +-
fer/plt/cancel_pytext_group.F | 176 +
fer/plt/choose_cx_ww.F | 3 +-
fer/plt/disp_init.F | 21 +-
fer/plt/disp_labels.F | 4 +-
fer/plt/disp_prep.F | 39 +-
fer/plt/disp_reset.F | 3 +
fer/plt/disp_set_up.F | 71 +-
fer/plt/equal_color.F | 22 +-
fer/plt/equal_range.F | 33 +-
fmt/src/tm_ww_axlims.F => fer/plt/get_color_name.F | 45 +-
fmt/src/tm_ww_ax_1_n.F => fer/plt/get_color_rgb.F | 62 +-
fer/plt/itsa_modulo_curvi_axis.F | 3 +-
fer/plt/key_loc.F | 3 +-
fer/plt/merged_whoi_date.F | 18 +-
fer/plt/parse_pyfont_color.F | 118 +
fer/plt/plot_set_up.F | 164 +-
fer/plt/polygon_set_up.F | 27 +-
.../create_agg_dset.F => plt/put_annotation.F} | 95 +-
fer/plt/put_label.F | 5 +-
fer/plt/set_annotation.F | 333 +
fer/plt/set_pytext_group.F | 212 +
fer/plt/set_window.F | 70 +-
fer/plt/taxis_style.F | 45 +-
fer/plt/trim_axis_ends.F | 4 +-
fer/plt/window_size_from_opts.F | 21 +-
fer/pyf/get_data_array_time_coords.F | 2 +-
fer/rpn/alg_break_up.F | 136 +-
fer/rpn/alg_class.F | 11 +-
fer/rpn/alg_id.F | 31 +-
fer/rpn/break_varattname.F | 6 +-
fer/rpn/break_varname.F | 2 +
fer/rpn/init_uvar.F | 10 +
fer/rpn/init_uvar_sub.F | 43 +-
fer/special/ferret_dispatch.F | 7 +-
fer/stk/SOURCE_FILES | 2 +
fer/stk/aux_regrid_lims.F | 46 +-
fer/stk/aux_regrid_lims_1d.F | 231 +-
fer/stk/aux_regrid_lims_1d_t.F | 333 +
fer/stk/aux_regrid_lims_2d_tf.F | 318 +
fer/stk/const_var_context.F | 7 +-
fer/stk/get_axis_speed.F | 4 +-
fer/stk/get_prot_cmnd_data.F | 4 +-
fer/stk/interp_stack.F | 43 +-
fer/stk/is_aggregate_gather.F | 81 +-
fer/stk/is_aggregate_grid.F | 9 +-
fer/stk/is_algebra.F | 38 +-
fer/stk/is_attrib_val.F | 66 +-
fer/stk/is_auxvar_regrid.F | 80 +-
fer/stk/is_const_var.F | 7 +-
fer/stk/is_counter_var.F | 5 +-
fer/stk/is_dependencies.F | 48 +-
fer/stk/is_do_gc_fcn.F | 10 +-
fer/stk/is_do_op.F | 23 +-
fer/stk/is_grid_mode.F | 3 +-
fer/stk/is_pseudo.F | 2 +-
fer/stk/is_regrid.F | 8 +
fer/stk/is_string.F | 17 +-
fer/stk/is_strip.F | 118 +-
fer/stk/is_trans.F | 31 +-
fer/stk/is_uvar_grid.F | 19 +-
fer/stk/known_grid.F | 2 +-
fer/stk/offset_ss.F | 7 +-
fer/stk/pass_ambig_lims.F | 5 +-
fer/stk/push_interp_stack.F | 5 +-
fer/stk/rcvd_regrid.F | 6 +-
fer/stk/rqst_regrid.F | 8 +-
fer/utl/SOURCE_FILES | 10 +-
fer/{gnl/all_1_arg.F => utl/all_1_arg_expr.F} | 47 +-
fer/utl/calendar_axis.F | 2 +-
fer/utl/confine_axis.F | 28 +-
fer/utl/copy_agg_into.F | 15 +-
fer/utl/copy_agg_into_sub.F | 52 +-
fer/utl/copy_agg_ptr_into_sub.F | 42 +-
fer/utl/count_number_list.F | 51 +-
fer/utl/decrement_plot_grid.F | 0
fer/utl/display_dependency_sub.F | 66 +-
fer/utl/{extract_dp_line.F => extract_arg1_line.F} | 64 +-
fer/utl/{extract_dp_line.F => extract_arg4_line.F} | 64 +-
fer/utl/extract_dp_line.F | 3 +
fer/utl/extract_dp_line2.F | 4 +
fer/utl/full_scan_indices.F | 142 +
fer/utl/gcf_impose_arg_lim_dflts.F | 4 +-
.../{decrement_plot_grid.F => get_abstract_line.F} | 22 +-
fer/utl/hunt_indices.F | 217 -
fer/utl/inherit_attrs.F | 4 +-
fer/utl/isubscr_cx.F | 3 +-
fmt/src/tm_ww_ax_1_n.F => fer/utl/its_fmrc.F | 47 +-
fer/{ctx/del_cx_dim.F => utl/itsa_1lineif.F} | 60 +-
.../{decrement_plot_grid.F => itsa_const_var.F} | 28 +-
fer/utl/match4.F | 5 +-
fer/utl/match_quoted_name.F | 22 +-
fer/utl/parse_string_list.F | 54 +-
fer/utl/{extract_dp_line.F => put_arg5_line.F} | 66 +-
fer/utl/report_dependency.F | 3 +-
fer/utl/set_auto_curvi_modes.F | 11 +-
fer/utl/store_dependency.F | 81 +-
fmt/src/tm_note.F => fer/utl/sys_ls.F | 63 +-
fer/utl/tdest_world_init.F | 27 +-
fer/utl/transfer_axis.F | 7 +-
fer/utl/update_attributes.F | 4 +-
fer/xeq/SOURCE_FILES | 1 +
fer/xeq/{xeq_else.F => xeq_annotate.F} | 93 +-
fer/xeq/xeq_cancel.F | 80 +-
fer/xeq/xeq_contour.F | 4 +
fer/xeq/xeq_define.F | 153 +-
fer/xeq/xeq_elif.F | 2 +
fer/xeq/xeq_else.F | 2 +
fer/xeq/xeq_exit.F | 11 +
fer/xeq/xeq_frame.F | 2 +
fer/xeq/xeq_if.F | 80 +-
fer/xeq/xeq_list.F | 5 +-
fer/xeq/xeq_plot.F | 139 +-
fer/xeq/xeq_polygon.F | 5 +
fer/xeq/xeq_repeat.F | 7 +-
fer/xeq/xeq_set.F | 79 +-
fer/xeq/xeq_shade.F | 5 +
fer/xeq/xeq_show.F | 150 +-
fer/xeq/xeq_vector.F | 8 +-
fmt/cmn/xdset_info.cmn_text | 10 +-
fmt/cmn/xrisc_buff.cmn | 6 +-
fmt/cmn/xtm_grid.cmn_text | 8 +-
fmt/src/NCF_Util.c | 140 +-
fmt/src/SOURCE_FILES | 6 +
.../{tm_make_basic_axis.F => cd_1d_line_from_2d.F} | 113 +-
fmt/src/cd_add_var.F | 5 +-
fmt/src/cd_clean_grids.F | 26 +-
fmt/src/cd_dim_only.F | 0
fmt/src/cd_get_1_axis.F | 121 +-
fmt/src/cd_get_1_dep_var.F | 8 +-
...tm_deallo_dyn_grid.F => cd_get_calendar_name.F} | 76 +-
fmt/src/cd_get_generic_bounds.F | 10 +
fmt/src/cd_get_line_direction.F | 10 +-
fmt/src/cd_get_var_att_id.F | 3 +-
fmt/src/cd_get_var_id.F | 11 +-
fmt/src/cd_get_var_info.F | 3 -
fmt/src/cd_init_dset.F | 14 +-
fmt/src/cd_make_fmrc_axes.F | 369 +
fmt/src/cd_make_fmrc_fcal_axis.F | 152 +
.../{cd_transfer_attribute.F => cd_rename_dim.F} | 53 +-
fmt/src/cd_scan_aux_coords.F | 173 +
fmt/src/cd_scan_vars.F | 46 +-
fmt/src/cd_transfer_attribute.F | 2 -
fmt/src/cd_write_attrib.F | 16 +-
fmt/src/cd_write_axis.F | 13 +-
fmt/src/cd_write_var.F | 36 +-
fmt/src/ez_init_dset.F | 8 +-
fmt/src/ez_permuted_index.F | 43 +-
fmt/src/ez_read.F | 3 +-
fmt/src/nc_get_attrib.F | 24 +-
fmt/src/nc_get_attrib_string.F | 16 +-
fmt/src/string_array_find_quoted.c | 37 +-
fmt/src/tm_allo_tmp_line.F | 3 +
fmt/src/tm_check_bnds.F | 89 +-
fmt/src/tm_check_bnds_centered.F | 27 +-
fmt/src/tm_deallo_dyn_grid.F | 7 +-
fmt/src/tm_fmt.F | 36 +-
fmt/src/tm_init_dset.F | 3 +-
fmt/src/tm_loc_string.F | 10 +-
fmt/src/tm_make_basic_axis.F | 4 +
fmt/src/tm_note.F | 10 +-
fmt/src/tm_switch_nan.c | 9 +-
fmt/src/tm_ww_ax_1_n.F | 8 +-
fmt/src/tm_ww_axlims.F | 8 +-
fmt/src/xdset_info_data.F | 2 +
jnls/go/focean.jnl | 12 +-
jnls/go/mp_grid.jnl | 1 +
jnls/go/mp_land.jnl | 5 +-
palettes/QQC_V3_by_level.spk | 16 +
palettes/blue_gold.spk | 9 +
palettes/blue_green_gold.spk | 10 +
palettes/blue_purple_orange.spk | 12 +
palettes/bluegrayscale.spk | 3 +
palettes/coralreefwatch_dhw_value_white.spk | 20 +
palettes/green_soft.spk | 12 +
palettes/inverse_medium_rainbow.spk | 10 +
palettes/koppen.spk | 18 +
palettes/lightgray_bottom0.spk | 16 +
palettes/medium_rainbow.spk | 10 +
palettes/woce2.spk | 7 +
platform_specific.mk.i386-linux | 10 +
platform_specific.mk.i386-linux-gnu | 10 +
platform_specific.mk.intel-mac | 3 +-
platform_specific.mk.x86_64-linux | 11 +
platform_specific.mk.x86_64-linux-gnu | 11 +
ppl/complot/SOURCE_FILES | 3 +
ppl/complot/gksmv.F | 48 +-
ppl/complot/special_sym_code.F | 278 +
ppl/complot/symbel.F | 874 +-
ppl/complot/{symbel.F => symbel_hershey.F} | 44 +-
.../decrement_plot_grid.F => ppl/complot/symwid.F | 26 +-
ppl/include/AXISL.INC | 9 +-
ppl/include/CONT.INC | 8 +-
ppl/include/LINES.INC | 10 +-
ppl/include/TAXIS.INC | 7 +-
ppl/plot/daxis.F | 107 +-
ppl/plot/daxis2.F | 17 +-
ppl/plot/labdrw.F | 32 +-
ppl/plot/lev.F | 5 -
ppl/plot/linfit.F | 18 +-
ppl/plot/opnppl.F | 23 +-
ppl/plot/plotxy.F | 18 +
ppl/plot/plotxy_ribbon.F | 47 +-
ppl/plot/plotz.F | 22 +
ppl/plot/pltit.F | 130 +-
ppl/plot/pplcmd_f.F | 292 +-
ppl/plot/ppldata.F | 7 +
ppl/plot/pplldx.F | 152 +-
ppl/plot/ppllist.F | 3 +-
ppl/plot/prmtiv.F | 22 +-
ppl/plot/rdseq.F | 2 +
ppl/plot/redsf.F | 2 +
ppl/plot/setax.F | 117 +-
ppl/plot/setlab.F | 16 +-
ppl/plot/stmnmx.F | 37 +-
ppl/plotlib/SOURCE_FILES | 2 +
ppl/plotlib/contur.F | 26 +-
ppl/plotlib/diff.F | 6 +-
ppl/plotlib/scinot.F | 79 +-
ppl/plotlib/{scinot.F => scinot_d.F} | 6 +-
ppl/plotlib/taxis.F | 10 +-
ppl/plotlib/taxis0.F | 223 +-
ppl/plotlib/taxis1.F | 10 +-
ppl/plotlib/taxis3.F | 32 +-
ppl/plotlib/tayis.F | 13 +-
ppl/plotlib/tayis0.F | 216 +-
ppl/plotlib/tayis1.F | 11 +-
ppl/plotlib/tayis3.F | 12 +-
ppl/plotlib/xaxis1.F | 26 +-
ppl/plotlib/xaxis2.F | 17 +-
ppl/plotlib/yaxis1.F | 26 +-
ppl/plotlib/yaxis2.F | 12 +-
ppl/pplepic/fixtim.F | 14 +
ppl/symlib/parse.F | 17 +-
ppl/symlib/parsex.F | 18 +-
ppl/symlib/setsym.F | 3 +-
ppl/tmap_inc/century.cmn | 8 +-
ppl/tmap_inc/cont_inc.decl | 6 +-
ppl/tmap_inc/gkplot.cmn | 6 +
ppl/tmap_inc/lines_inc.decl | 7 +
ppl/{tmapadds => tmap_inc}/pplmem.h | 5 +-
ppl/tmap_inc/pyfonts.cmn | 41 +
ppl/tmap_inc/taxis_inc.decl | 28 +-
ppl/tmapadds/SOURCE_FILES | 6 +-
ppl/tmapadds/aline_sub.F | 1 -
ppl/tmapadds/compute_mnstd.F | 136 +-
.../tmapadds/get_pyfont_settings.F | 36 +-
ppl/tmapadds/key.F | 98 +-
ppl/tmapadds/line_key.F | 1 -
ppl/tmapadds/pplld_pts_envelope.c | 2 +-
ppl/tmapadds/pplldc_envelope.c | 2 +-
ppl/tmapadds/pplldx_envelope.c | 2 +-
ppl/tmapadds/pyfont_block_data.F | 110 +
ppl/tmapadds/reallo_envelope.c | 2 +-
ppl/tmapadds/reallo_ppl_memory.c | 81 -
ppl/tmapadds/set_levels_shade_fill.F | 48 +-
.../tmapadds/user_to_inch.F | 28 +-
ppl/tmapadds/ws_line_spectrum.F | 46 +-
pviewmod/__init__.py | 32 +-
pviewmod/cmndhelperpq.py | 41 +-
pviewmod/pipedimagerpq.py | 230 +-
pviewmod/pipedviewerpq.py | 162 +-
pviewmod/pyferretbindings.py | 59 +-
pyfermod/.project | 17 +
pyfermod/.pydevproject | 9 +
pyfermod/__init__.py | 19 +-
pyfermod/ferrdataset.py | 24 +
pyfermod/ferrdatavar.py | 22 +
pyfermod/ferrvar.py | 22 +
pyfermod/graphbind/__init__.py | 10 +-
pyfermod/graphbind/abstractpyferretbindings.py | 22 +-
pyfermod/libpyferret.c | 17 +
setup.py | 37 +-
site_specific.mk | 46 +-
647 files changed, 69816 insertions(+), 105205 deletions(-)
diff --cc debian/patches/series
index 687cd30,6d3edee..8d7fbd3
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,3 +1,4 @@@
set-envvars.patch
automate-tests.parch
+python3.patch
+ reproducible.patch
diff --cc debian/rules
index 0963a7e,8cdf9df..41566c1
--- a/debian/rules
+++ b/debian/rules
@@@ -5,8 -5,12 +5,12 @@@ export DH_VERBOSE=
# magic debhelper rule
%:
- dh $@ --with python2
+ dh $@ --with python2,python3
+ # To aid reproducible builds
+ LC_ALL=C
+ export LC_ALL
+
ARCH:=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LIBDIR:=/usr/lib/$(ARCH)
INSTALLDIR:=$(CURDIR)/debian/tmp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyferret.git
More information about the debian-science-commits
mailing list