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

johanvdw-guest pushed a commit to branch ubuntu
in repository saga.

commit aaf009ebe3c8fef4881769bb5dc5f080cb06431f
Merge: 32319f3 9e4a871
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date:   Thu Aug 27 08:27:10 2015 +0200

    Trusty build of current master
    
    Conflicts:
        debian/changelog

 ChangeLog                                          | 11700 +------------------
 README                                             |     2 +-
 configure                                          |    23 +-
 configure.ac                                       |     7 +-
 debian/changelog                                   |    48 +-
 debian/control                                     |    15 +-
 debian/copyright                                   |   468 +-
 debian/gbp.conf                                    |     2 +-
 .../0001-Remove-references-to-libfire.patch        |     6 +-
 debian/patches/0005-0099-no-hdf5.patch             |    20 +
 debian/patches/0006-Fix-vigra-path.patch           |    21 +
 debian/patches/0007-Fix-opencv-module.patch        |    81 +
 debian/patches/series                              |     3 +
 debian/rules                                       |     5 +-
 debian/watch                                       |     2 +-
 .../climate/climate_tools/MLB_Interface.cpp        |     5 +-
 src/modules/climate/climate_tools/Makefile.in      |    15 +-
 .../climate/climate_tools/etp_hargreave.cpp        |   293 +-
 src/modules/climate/climate_tools/etp_hargreave.h  |    38 +-
 src/modules/contrib/contrib_peregro/Makefile.in    |    15 +-
 src/modules/db/db_odbc/Makefile.in                 |    15 +-
 src/modules/db/db_pgsql/Makefile.in                |    15 +-
 src/modules/db/db_pgsql/db_pgsql.cpp               |     2 +-
 src/modules/docs/docs_html/CreateWebContent.cpp    |     2 +-
 src/modules/docs/docs_html/Makefile.in             |    15 +-
 src/modules/docs/docs_pdf/Makefile.in              |    15 +-
 src/modules/docs/docs_pdf/Shapes_Summary.cpp       |     2 +-
 .../garden_3d_viewer/3d_viewer_globe_grid.cpp      |    31 +-
 .../garden/garden_3d_viewer/3d_viewer_shapes.cpp   |     4 +-
 src/modules/garden/garden_3d_viewer/Makefile.in    |    15 +-
 src/modules/garden/garden_fractals/Makefile.in     |    15 +-
 src/modules/garden/garden_games/Makefile.in        |    15 +-
 .../garden/garden_learn_to_program/Makefile.in     |    15 +-
 src/modules/garden/garden_webservices/Makefile.in  |    15 +-
 .../garden/garden_webservices/osm_import.cpp       |    10 +-
 .../garden/garden_webservices/wms_import.cpp       |    21 +-
 .../grid_analysis/Grid_Accumulation_Functions.cpp  |     4 +-
 src/modules/grid/grid_analysis/MLB_Interface.cpp   |     3 +-
 src/modules/grid/grid_analysis/Makefile.in         |    15 +-
 src/modules/grid/grid_analysis/Soil_Texture.cpp    |   436 +-
 src/modules/grid/grid_analysis/Soil_Texture.h      |    21 +-
 src/modules/grid/grid_calculus/Grid_Calculator.cpp |   183 +-
 src/modules/grid/grid_calculus/Grid_Calculator.h   |     5 +-
 .../grid/grid_calculus/Grid_Random_Terrain.cpp     |   244 +-
 .../grid/grid_calculus/Grid_Random_Terrain.h       |    53 +-
 src/modules/grid/grid_calculus/Makefile.in         |    95 +-
 src/modules/grid/grid_calculus_bsl/Makefile.in     |    15 +-
 src/modules/grid/grid_calculus_bsl/ausdruck.cpp    |     3 +-
 src/modules/grid/grid_calculus_bsl/basistypen.cpp  |     3 +-
 src/modules/grid/grid_filter/Filter_Majority.cpp   |    77 +-
 src/modules/grid/grid_filter/Filter_Majority.h     |     8 +-
 src/modules/grid/grid_filter/Filter_Rank.cpp       |    33 +-
 src/modules/grid/grid_filter/Makefile.in           |    99 +-
 .../grid/grid_filter/geodesic_morph_rec/geovinc.c  |    13 +-
 src/modules/grid/grid_filter/geomrec.cpp           |     8 +-
 src/modules/grid/grid_gridding/Interpolation.cpp   |    16 +-
 src/modules/grid/grid_gridding/Interpolation.h     |     5 +-
 .../Interpolation_AngularDistance.cpp              |   184 +-
 .../grid_gridding/Interpolation_AngularDistance.h  |    14 +-
 .../Interpolation_InverseDistance.cpp              |   190 +-
 .../grid_gridding/Interpolation_InverseDistance.h  |    16 +-
 .../Interpolation_NaturalNeighbour.cpp             |     4 +-
 .../Interpolation_NearestNeighbour.cpp             |    21 +-
 .../grid_gridding/Interpolation_NearestNeighbour.h |    12 +-
 src/modules/grid/grid_gridding/Makefile.in         |   131 +-
 src/modules/grid/grid_gridding/Shapes2Grid.cpp     |     8 +-
 src/modules/grid/grid_gridding/kernel_density.cpp  |     4 +-
 .../grid/grid_spline/Gridding_Spline_Base.cpp      |    12 +-
 .../grid/grid_spline/Gridding_Spline_CSA.cpp       |    24 +-
 src/modules/grid/grid_spline/Gridding_Spline_CSA.h |     4 +-
 .../grid/grid_spline/Gridding_Spline_TPS_Local.cpp |   180 +-
 .../grid/grid_spline/Gridding_Spline_TPS_Local.h   |    21 +-
 .../grid/grid_spline/Gridding_Spline_TPS_TIN.cpp   |   125 +-
 .../grid/grid_spline/Gridding_Spline_TPS_TIN.h     |    11 +-
 .../MBASpline_for_Categories.cpp}                  |   190 +-
 ...ine_TPS_Global.h => MBASpline_for_Categories.h} |    39 +-
 src/modules/grid/grid_spline/MLB_Interface.cpp     |    13 +-
 src/modules/grid/grid_spline/Makefile.am           |     6 +-
 src/modules/grid/grid_spline/Makefile.in           |    42 +-
 src/modules/grid/grid_tools/Grid_Fill.cpp          |     4 +-
 src/modules/grid/grid_tools/Grid_Merge.cpp         |    20 +-
 src/modules/grid/grid_tools/Grid_Resample.cpp      |   112 +-
 src/modules/grid/grid_tools/Grid_SortRaster.cpp    |     4 +-
 .../grid_tools/Grid_Support_Tool_Chains.cpp}       |   101 +-
 .../Grid_Support_Tool_Chains.h}                    |    34 +-
 src/modules/grid/grid_tools/MLB_Interface.cpp      |     5 +-
 src/modules/grid/grid_tools/Makefile.am            |     4 +-
 src/modules/grid/grid_tools/Makefile.in            |    29 +-
 .../grid_visualisation/Grid_LUT_Assign.cpp}        |    73 +-
 .../Grid_LUT_Assign.h}                             |    32 +-
 .../grid/grid_visualisation/Grid_RGB_Composite.cpp |     3 +-
 .../grid/grid_visualisation/Grid_Terrain_Map.cpp   |     7 +-
 .../grid/grid_visualisation/MLB_Interface.cpp      |     8 +-
 src/modules/grid/grid_visualisation/Makefile.am    |     4 +-
 src/modules/grid/grid_visualisation/Makefile.in    |    24 +-
 src/modules/imagery/Makefile.am                    |     2 +-
 src/modules/imagery/Makefile.in                    |     2 +-
 .../imagery_classification/MLB_Interface.cpp       |     8 +-
 .../imagery/imagery_classification/Makefile.in     |    15 +-
 .../classify_cluster_analysis.cpp                  |     3 +-
 .../imagery_classification/classify_supervised.cpp |   483 +-
 .../imagery_classification/classify_supervised.h   |    17 +-
 .../classify_supervised_polygons.cpp               |   470 +-
 .../classify_supervised_polygons.h                 |    24 +-
 .../imagery_maxent}/MLB_Interface.cpp              |   265 +-
 .../imagery_maxent}/MLB_Interface.h                |   106 +-
 src/modules/imagery/imagery_maxent/Makefile.am     |    30 +
 .../{imagery_svm => imagery_maxent}/Makefile.in    |    68 +-
 .../imagery/imagery_maxent/classify_grid.cpp       |   771 ++
 .../imagery_maxent/classify_grid.h}                |   288 +-
 src/modules/imagery/imagery_maxent/lbfgs.cpp       |   110 +
 src/modules/imagery/imagery_maxent/lbfgs.h         |    21 +
 src/modules/imagery/imagery_maxent/mathvec.h       |    97 +
 src/modules/imagery/imagery_maxent/maxent.cpp      |   698 ++
 src/modules/imagery/imagery_maxent/maxent.h        |   396 +
 src/modules/imagery/imagery_maxent/me.cpp          |   274 +
 src/modules/imagery/imagery_maxent/me.h            |   203 +
 src/modules/imagery/imagery_maxent/owlqn.cpp       |   136 +
 .../imagery/imagery_maxent/presence_prediction.cpp |   641 +
 .../imagery_maxent/presence_prediction.h}          |   286 +-
 src/modules/imagery/imagery_maxent/sgd.cpp         |   179 +
 src/modules/imagery/imagery_opencv/Makefile.in     |    15 +-
 .../imagery/imagery_opencv/opencv_fourier.cpp      |     1 -
 .../imagery/imagery_photogrammetry/Makefile.in     |    15 +-
 .../imagery/imagery_segmentation/Makefile.in       |    15 +-
 .../imagery_segmentation/skeletonization.cpp       |    14 +-
 src/modules/imagery/imagery_svm/Makefile.in        |    15 +-
 src/modules/imagery/imagery_tools/Makefile.in      |    15 +-
 .../imagery/imagery_tools/landsat_import.cpp       |     4 +-
 .../imagery/imagery_tools/landsat_toar_core.cpp    |     6 +-
 .../imagery/imagery_tools/pansharpening.cpp        |   134 +-
 .../imagery/imagery_vigra/MLB_Interface.cpp        |     5 +-
 src/modules/imagery/imagery_vigra/Makefile.in      |    15 +-
 .../imagery/imagery_vigra/vigra_random_forest.cpp  |   764 +-
 .../imagery/imagery_vigra/vigra_random_forest.h    |    33 +
 src/modules/io/io_esri_e00/Makefile.in             |   106 +-
 src/modules/io/io_gdal/Makefile.in                 |    15 +-
 src/modules/io/io_gdal/gdal_driver.cpp             |   141 +-
 src/modules/io/io_gdal/gdal_driver.h               |     7 +-
 src/modules/io/io_gdal/gdal_import.cpp             |   166 +-
 src/modules/io/io_gdal/gdal_import.h               |     2 -
 src/modules/io/io_gdal/gdal_import_netcdf.cpp      |    46 +
 src/modules/io/io_gdal/ogr_driver.cpp              |    78 +-
 src/modules/io/io_gdal/ogr_driver.h                |    20 +-
 src/modules/io/io_gps/Makefile.in                  |    15 +-
 src/modules/io/io_grid/MLB_Interface.cpp           |    26 +-
 src/modules/io/io_grid/Makefile.am                 |     2 +
 src/modules/io/io_grid/Makefile.in                 |    23 +-
 .../io_grid/import_clip_resample.cpp}              |   342 +-
 .../io_grid/import_clip_resample.h}                |    36 +-
 src/modules/io/io_grid/raw.cpp                     |     2 +-
 src/modules/io/io_grid/wrf.cpp                     |     4 +-
 src/modules/io/io_grid_grib2/Makefile.in           |   564 +-
 src/modules/io/io_grid_image/Makefile.in           |    15 +-
 src/modules/io/io_grid_image/grid_export.cpp       |    68 +-
 src/modules/io/io_grid_image/grid_to_kml.cpp       |   154 +-
 src/modules/io/io_shapes/Makefile.in               |    15 +-
 src/modules/io/io_shapes_dxf/Makefile.in           |    55 +-
 src/modules/io/io_shapes_las/Makefile.in           |    15 +-
 src/modules/io/io_shapes_las/las_export.cpp        |     1 +
 src/modules/io/io_table/Makefile.in                |    15 +-
 src/modules/io/io_table/io_table_txt.cpp           |   184 +-
 src/modules/io/io_virtual/MLB_Interface.cpp        |     4 +-
 src/modules/io/io_virtual/Makefile.am              |     6 +-
 src/modules/io/io_virtual/Makefile.in              |    25 +-
 src/modules/io/io_virtual/pc_create_spcvf.cpp      |    99 +-
 src/modules/io/io_virtual/pc_get_grid_spcvf.cpp    |   203 +-
 src/modules/io/io_virtual/pc_get_grid_spcvf.h      |    13 +-
 src/modules/io/io_virtual/pc_get_subset_spcvf.cpp  |   424 +-
 src/modules/io/io_virtual/pc_get_subset_spcvf.h    |    20 +-
 ..._spcvf.cpp => pc_remove_overlap_from_spcvf.cpp} |   131 +-
 .../io_virtual/pc_remove_overlap_from_spcvf.h}     |    47 +-
 .../io/io_virtual/pc_tileshape_from_spcvf.cpp      |    81 +-
 .../pointcloud/pointcloud_tools/Makefile.in        |    15 +-
 src/modules/pointcloud/pointcloud_tools/pc_cut.cpp |   162 +-
 src/modules/pointcloud/pointcloud_tools/pc_cut.h   |    14 +-
 .../pointcloud/pointcloud_viewer/Makefile.in       |    15 +-
 .../projection/pj_georeference/MLB_Interface.cpp   |     1 +
 src/modules/projection/pj_georeference/Makefile.in |    15 +-
 .../pj_georeference/direct_georeferencing.cpp      |   399 +-
 .../pj_georeference/direct_georeferencing.h        |    57 +-
 src/modules/projection/pj_proj4/MLB_Interface.cpp  |    42 +-
 src/modules/projection/pj_proj4/Makefile.am        |     4 +-
 src/modules/projection/pj_proj4/Makefile.in        |    29 +-
 src/modules/projection/pj_proj4/PROJ4_Grid.cpp     |     4 +-
 src/modules/projection/pj_proj4/crs_base.cpp       |    40 +-
 src/modules/projection/pj_proj4/crs_distance.cpp   |   524 +
 .../pj_proj4/crs_distance.h}                       |   131 +-
 .../shapes/shapes_grid/Grid_Polygon_Clip.cpp       |     4 +-
 .../shapes_grid/Grid_Statistics_AddTo_Polygon.cpp  |   274 +-
 .../shapes_grid/Grid_Statistics_AddTo_Polygon.h    |    10 +-
 .../shapes_grid/Grid_Statistics_For_Points.cpp     |   338 +
 .../shapes_grid/Grid_Statistics_For_Points.h}      |    30 +-
 src/modules/shapes/shapes_grid/Grid_To_Contour.cpp |   707 +-
 src/modules/shapes/shapes_grid/Grid_To_Contour.h   |    27 +-
 src/modules/shapes/shapes_grid/MLB_Interface.cpp   |     7 +-
 src/modules/shapes/shapes_grid/Makefile.am         |     4 +-
 src/modules/shapes/shapes_grid/Makefile.in         |    28 +-
 src/modules/shapes/shapes_lines/MLB_Interface.cpp  |    10 +-
 src/modules/shapes/shapes_lines/Makefile.am        |     2 +
 src/modules/shapes/shapes_lines/Makefile.in        |    20 +-
 src/modules/shapes/shapes_lines/line_smoothing.cpp |   729 ++
 .../shapes_lines/line_smoothing.h}                 |    52 +-
 src/modules/shapes/shapes_points/Makefile.in       |    15 +-
 .../shapes/shapes_points/Points_From_Lines.cpp     |    38 +-
 .../shapes/shapes_points/remove_duplicates.cpp     |     6 +-
 src/modules/shapes/shapes_polygons/Makefile.in     |    15 +-
 .../shapes/shapes_tools/CreateChartLayer.cpp       |    32 +-
 src/modules/shapes/shapes_tools/CreateChartLayer.h |     6 +-
 .../shapes/shapes_tools/LandUse_Scenario.cpp       |   433 +
 .../shapes_tools/LandUse_Scenario.h}               |    81 +-
 src/modules/shapes/shapes_tools/MLB_Interface.cpp  |     6 +-
 src/modules/shapes/shapes_tools/Makefile.am        |     4 +-
 src/modules/shapes/shapes_tools/Makefile.in        |    22 +-
 .../shapes/shapes_tools/Shapes_Create_Empty.cpp    |    72 +-
 .../shapes/shapes_tools/TransformShapes.cpp        |   167 +-
 src/modules/shapes/shapes_tools/TransformShapes.h  |     3 +-
 src/modules/shapes/shapes_transect/Makefile.in     |    15 +-
 .../simulation/sim_cellular_automata/Makefile.in   |    15 +-
 .../simulation/sim_ecosystems_hugget/Makefile.in   |    15 +-
 .../simulation/sim_erosion/MLB_Interface.cpp       |     6 +-
 src/modules/simulation/sim_erosion/MLB_Interface.h |     2 +-
 src/modules/simulation/sim_erosion/MMF_SAGA.cpp    |   338 +-
 src/modules/simulation/sim_erosion/MMF_SAGA.h      |     5 +-
 src/modules/simulation/sim_erosion/Makefile.in     |    15 +-
 .../simulation/sim_hydrology/MLB_Interface.cpp     |    38 +-
 src/modules/simulation/sim_hydrology/Makefile.am   |     2 +
 src/modules/simulation/sim_hydrology/Makefile.in   |    24 +-
 .../sim_hydrology/diffuse_pollution_risk.cpp       |   495 +
 .../sim_hydrology/diffuse_pollution_risk.h}        |   232 +-
 src/modules/simulation/sim_ihacres/Makefile.in     |    15 +-
 src/modules/simulation/sim_ihacres/ihacres_eq.cpp  |    12 +-
 src/modules/statistics/statistics_grid/Makefile.in |    15 +-
 .../statistics_kriging/MLB_Interface.cpp           |    27 +-
 .../statistics/statistics_kriging/Makefile.am      |    18 +-
 .../statistics/statistics_kriging/Makefile.in      |    52 +-
 .../statistics_kriging/_kriging_base.cpp           |   522 -
 .../statistics/statistics_kriging/_kriging_base.h  |   142 -
 .../statistics_kriging/_kriging_ordinary.cpp       |   236 -
 .../_kriging_ordinary_global.cpp                   |   226 -
 .../statistics_kriging/_kriging_universal.cpp      |   260 -
 .../statistics_kriging/_kriging_universal.h        |   118 -
 .../_kriging_universal_global.cpp                  |   282 -
 .../statistics_kriging/_kriging_universal_global.h |   118 -
 .../statistics/statistics_kriging/kriging_base.cpp |   131 +-
 .../statistics/statistics_kriging/kriging_base.h   |    53 +-
 .../statistics_kriging/kriging_ordinary.cpp        |   160 +-
 .../statistics_kriging/kriging_ordinary.h          |    19 +-
 .../statistics_kriging/kriging_regression.cpp      |   405 +
 ...ging_ordinary_global.h => kriging_regression.h} |    34 +-
 ...ging_ordinary_global.cpp => kriging_simple.cpp} |   111 +-
 ...{kriging_ordinary_global.h => kriging_simple.h} |    31 +-
 .../statistics_kriging/kriging_universal.cpp       |   201 +-
 .../statistics_kriging/kriging_universal.h         |    16 +-
 .../statistics_kriging/kriging_universal_global.h  |   125 -
 .../statistics_kriging/semivariogram.cpp           |    10 +-
 .../statistics_kriging/variogram_dialog.cpp        |    15 +-
 .../statistics_kriging/variogram_dialog.h          |     4 +-
 .../statistics/statistics_points/Makefile.in       |    15 +-
 .../statistics_regression/MLB_Interface.cpp        |    41 +
 .../statistics_regression/MLB_Interface.h          |    24 +
 .../statistics/statistics_regression/Makefile.am   |     2 +
 .../statistics/statistics_regression/Makefile.in   |    22 +-
 .../grid_multi_grid_regression.cpp                 |    94 +-
 .../grid_multi_grid_regression.h                   |     8 +-
 .../statistics_regression/gw_multi_regression.cpp  |   277 +-
 .../statistics_regression/gw_multi_regression.h    |    37 +-
 .../gw_multi_regression_grid.cpp                   |   302 +-
 .../gw_multi_regression_grid.h                     |    37 +-
 .../gw_multi_regression_points.cpp                 |   279 +-
 .../gw_multi_regression_points.h                   |    33 +-
 .../statistics_regression/gw_regression.cpp        |   212 +-
 .../statistics_regression/gw_regression.h          |    30 +-
 .../statistics_regression/gw_regression_grid.cpp   |   263 +-
 .../statistics_regression/gw_regression_grid.h     |    27 +-
 .../statistics_regression/gwr_grid_downscaling.cpp |   138 +-
 .../statistics_regression/gwr_grid_downscaling.h   |    21 +-
 .../point_grid_regression.cpp                      |    22 +-
 .../point_multi_grid_regression.cpp                |   185 +-
 .../point_multi_grid_regression.h                  |     4 +-
 .../statistics_regression/point_trend_surface.cpp  |     6 +-
 .../point_zonal_multi_grid_regression.cpp          |   368 +
 .../point_zonal_multi_grid_regression.h}           |    42 +-
 .../table_regression_multiple.cpp                  |    26 +-
 src/modules/table/table_calculus/Fit.cpp           |     4 +-
 src/modules/table/table_calculus/MLB_Interface.cpp |    11 +-
 src/modules/table/table_calculus/Makefile.am       |     4 +-
 src/modules/table/table_calculus/Makefile.in       |    25 +-
 .../table_calculus/table_cluster_analysis.cpp      |    10 +-
 .../table_calculus/table_field_statistics.cpp}     |   181 +-
 .../table_calculus/table_field_statistics.h}       |    63 +-
 src/modules/table/table_tools/Join_Tables.cpp      |     6 +-
 src/modules/table/table_tools/Join_Tables.h        |     4 +-
 src/modules/table/table_tools/MLB_Interface.cpp    |     9 +-
 src/modules/table/table_tools/Makefile.am          |     4 +-
 src/modules/table/table_tools/Makefile.in          |    29 +-
 .../table/table_tools/Table_Create_Empty.cpp       |    74 +-
 .../table_categories_to_indicators.cpp}            |   237 +-
 ...replacer.h => table_categories_to_indicators.h} |    23 +-
 .../table/table_tools/table_text_replacer.cpp      |    11 +-
 .../table/table_tools/table_text_replacer.h        |     2 +-
 .../ta_channels/ChannelNetwork.cpp                 |     2 +-
 .../terrain_analysis/ta_channels/ChannelNetwork.h  |     2 +-
 .../ta_channels/ChannelNetwork_Altitude.cpp        |     4 +-
 .../ta_channels/ChannelNetwork_Altitude.h          |     2 +-
 .../ta_channels/ChannelNetwork_Distance.cpp        |     2 +-
 .../ta_channels/ChannelNetwork_Distance.h          |     2 +-
 .../ta_channels/D8_Flow_Analysis.cpp               |     2 +-
 .../ta_channels/D8_Flow_Analysis.h                 |     2 +-
 .../terrain_analysis/ta_channels/MLB_Interface.cpp |     6 +-
 .../terrain_analysis/ta_channels/MLB_Interface.h   |     2 +-
 .../terrain_analysis/ta_channels/Makefile.in       |    15 +-
 .../terrain_analysis/ta_channels/Strahler.cpp      |     2 +-
 .../terrain_analysis/ta_channels/Strahler.h        |     2 +-
 .../terrain_analysis/ta_channels/Watersheds.cpp    |     4 +-
 .../terrain_analysis/ta_channels/Watersheds.h      |     2 +-
 .../ta_channels/Watersheds_ext.cpp                 |     2 +-
 .../terrain_analysis/ta_channels/Watersheds_ext.h  |     2 +-
 .../terrain_analysis/ta_compound/Makefile.in       |    15 +-
 .../terrain_analysis/ta_compound/TA_Standard.cpp   |     2 +-
 .../ta_hydrology/EdgeContamination.h               |     2 +-
 src/modules/terrain_analysis/ta_hydrology/Flow.cpp |    28 +-
 src/modules/terrain_analysis/ta_hydrology/Flow.h   |     4 +-
 .../ta_hydrology/Flow_AreaDownslope.h              |     2 +-
 .../ta_hydrology/Flow_AreaUpslope.h                |     4 +-
 .../terrain_analysis/ta_hydrology/Flow_Distance.h  |     2 +-
 .../ta_hydrology/Flow_Parallel.cpp                 |    22 +-
 .../ta_hydrology/Flow_RecursiveDown.cpp            |     2 +-
 .../ta_hydrology/Flow_RecursiveUp.cpp              |    48 +-
 .../terrain_analysis/ta_hydrology/Helper.cpp       |    13 +
 src/modules/terrain_analysis/ta_hydrology/Helper.h |     1 +
 .../ta_hydrology/IsochronesConst.cpp               |   169 +-
 .../ta_hydrology/IsochronesConst.h                 |     6 +-
 .../ta_hydrology/IsochronesVar.cpp                 |   310 +-
 .../terrain_analysis/ta_hydrology/IsochronesVar.h  |     6 +-
 .../terrain_analysis/ta_hydrology/Makefile.in      |    15 +-
 .../ta_hydrology/SAGA_Wetness_Index.cpp            |   129 +-
 .../terrain_analysis/ta_hydrology/flow_by_slope.h  |     2 +-
 .../ta_hydrology/flow_massflux.cpp                 |     4 +-
 .../terrain_analysis/ta_hydrology/flow_massflux.h  |     2 +-
 .../terrain_analysis/ta_hydrology/flow_width.h     |     2 +-
 .../terrain_analysis/ta_lighting/Makefile.in       |    15 +-
 .../ta_morphometry/Curvature_UpDownSlope.cpp       |   331 +
 .../Curvature_UpDownSlope.h}                       |   235 +-
 .../ta_morphometry/MLB_Interface.cpp               |    26 +-
 .../terrain_analysis/ta_morphometry/Makefile.am    |     2 +
 .../terrain_analysis/ta_morphometry/Makefile.in    |    26 +-
 .../ta_morphometry/param_scale.cpp                 |     6 +-
 .../terrain_analysis/ta_morphometry/param_scale.h  |   230 +-
 .../ta_morphometry/relative_heights.cpp            |   264 +-
 .../terrain_analysis/ta_preprocessor/Makefile.in   |    15 +-
 .../ta_preprocessor/Pit_Eliminator.cpp             |     3 +-
 .../terrain_analysis/ta_profiles/Makefile.in       |    15 +-
 .../ta_slope_stability/Makefile.in                 |    15 +-
 src/modules/tin/tin_tools/Makefile.in              |    15 +-
 src/modules/tin/tin_viewer/Makefile.in             |    15 +-
 src/saga_core/saga_api/Makefile.am                 |     3 +-
 src/saga_core/saga_api/Makefile.in                 |    48 +-
 src/saga_core/saga_api/api_callback.cpp            |    22 +-
 src/saga_core/saga_api/api_core.h                  |    11 +-
 src/saga_core/saga_api/api_file.cpp                |    33 +-
 src/saga_core/saga_api/geo_tools.h                 |     9 +-
 src/saga_core/saga_api/grid.cpp                    |   139 +-
 src/saga_core/saga_api/grid.h                      |    12 +-
 src/saga_core/saga_api/grid_system.cpp             |   121 +-
 src/saga_core/saga_api/mat_formula.cpp             |    72 +-
 src/saga_core/saga_api/mat_matrix.cpp              |   153 +-
 src/saga_core/saga_api/mat_regression_weighted.cpp |   332 +
 src/saga_core/saga_api/mat_tools.cpp               |   734 +-
 src/saga_core/saga_api/mat_tools.h                 |   150 +-
 src/saga_core/saga_api/module.cpp                  |    62 +-
 src/saga_core/saga_api/module.h                    |    15 +-
 src/saga_core/saga_api/module_chain.cpp            |   347 +-
 src/saga_core/saga_api/module_chain.h              |    10 +-
 src/saga_core/saga_api/module_library.cpp          |    66 +-
 src/saga_core/saga_api/module_library.h            |    22 +-
 .../saga_api/module_library_interface.cpp          |    26 +-
 src/saga_core/saga_api/parameter.cpp               |   106 +-
 src/saga_core/saga_api/parameter_data.cpp          |     7 +-
 src/saga_core/saga_api/parameters.cpp              |    33 +-
 src/saga_core/saga_api/parameters.h                |    14 +-
 src/saga_core/saga_api/pointcloud.cpp              |    96 +-
 src/saga_core/saga_api/quadtree.cpp                |   287 +-
 src/saga_core/saga_api/saga_api.h                  |     6 +-
 src/saga_core/saga_api/shape_points.cpp            |    28 +-
 src/saga_core/saga_api/shapes.h                    |    60 +-
 src/saga_core/saga_api/table.h                     |     8 +-
 src/saga_core/saga_api/table_record.cpp            |    36 +-
 src/saga_core/saga_api/table_value.h               |   122 +-
 src/saga_core/saga_cmd/Makefile.in                 |    15 +-
 src/saga_core/saga_cmd/module_library.cpp          |    47 +-
 src/saga_core/saga_cmd/saga_cmd.cpp                |    18 +-
 src/saga_core/saga_gdi/3d_view_canvas.cpp          |     6 +-
 src/saga_core/saga_gdi/3d_view_panel.cpp           |    14 +-
 src/saga_core/saga_gdi/3d_view_projector.cpp       |    18 +-
 src/saga_core/saga_gdi/3d_view_tools.h             |     8 +-
 src/saga_core/saga_gdi/Makefile.in                 |    15 +-
 src/saga_core/saga_gui/Makefile.in                 |    15 +-
 src/saga_core/saga_gui/dlg_about.cpp               |    10 +-
 src/saga_core/saga_gui/dlg_list_base.cpp           |     4 +-
 src/saga_core/saga_gui/helper.cpp                  |    70 +-
 src/saga_core/saga_gui/info_messages.cpp           |    53 +-
 src/saga_core/saga_gui/info_messages.h             |    10 +-
 src/saga_core/saga_gui/project.cpp                 |    80 +-
 src/saga_core/saga_gui/res/tool_menus.xml          |   734 ++
 src/saga_core/saga_gui/res/tool_menus_example.xml  |   120 +
 src/saga_core/saga_gui/res_commands.cpp            |     6 +-
 src/saga_core/saga_gui/res_commands.h              |     4 +-
 src/saga_core/saga_gui/res_dialogs.cpp             |    65 +-
 src/saga_core/saga_gui/saga.cpp                    |    40 +-
 src/saga_core/saga_gui/saga_frame.cpp              |     4 +-
 src/saga_core/saga_gui/view_histogram.cpp          |     8 +-
 src/saga_core/saga_gui/view_map_3d.cpp             |    67 +-
 src/saga_core/saga_gui/view_map_control.cpp        |    77 +-
 src/saga_core/saga_gui/view_table_control.cpp      |  2429 ++--
 src/saga_core/saga_gui/wksp.cpp                    |     3 +-
 src/saga_core/saga_gui/wksp_base_control.cpp       |    33 +-
 src/saga_core/saga_gui/wksp_base_item.cpp          |     6 +-
 src/saga_core/saga_gui/wksp_data_manager.cpp       |   115 +-
 src/saga_core/saga_gui/wksp_data_manager.h         |     4 +-
 src/saga_core/saga_gui/wksp_data_menu_file.cpp     |     3 +-
 src/saga_core/saga_gui/wksp_grid.cpp               |   183 +-
 src/saga_core/saga_gui/wksp_grid.h                 |    10 +-
 src/saga_core/saga_gui/wksp_layer_classify.cpp     |    30 +-
 src/saga_core/saga_gui/wksp_layer_classify.h       |     8 +-
 src/saga_core/saga_gui/wksp_map.cpp                |    30 +-
 src/saga_core/saga_gui/wksp_map_layer.cpp          |    11 +-
 src/saga_core/saga_gui/wksp_module.cpp             |   461 +-
 src/saga_core/saga_gui/wksp_module.h               |    16 +-
 src/saga_core/saga_gui/wksp_module_library.cpp     |     7 +-
 src/saga_core/saga_gui/wksp_module_manager.cpp     |    58 +-
 src/saga_core/saga_gui/wksp_module_menu.cpp        |   111 +-
 src/saga_core/saga_gui/wksp_module_menu.h          |     4 +-
 src/saga_core/saga_gui/wksp_shapes.cpp             |    18 +-
 434 files changed, 23663 insertions(+), 24843 deletions(-)

diff --cc debian/changelog
index df61ccc,09f1d17..e657928
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,40 +1,47 @@@
- saga (2.1.4+dfsg-1~utopic) utopic; urgency=medium
++saga (2.2.0+dfsg-2~ubuntugis~trusty) trusty; urgency=medium
 +
-   * Utopic build 
++  * Trusty build 
 +
-  -- Johan Van de Wauw <johan.vandew...@gmail.com>  Tue, 03 Mar 2015 01:39:15 
+0100
++ -- Johan Van de Wauw <johan.vandew...@gmail.com>  Thu, 27 Aug 2015 08:26:04 
+0200
 +
- saga (2.1.4+dfsg-1~trusty) trusty; urgency=medium
+ saga (2.2.0+dfsg-2) UNRELEASED; urgency=medium
  
-   * Trusty build 
+   * Fix opencv module
+ 
+  -- Johan Van de Wauw <johan.vandew...@gmail.com>  Tue, 25 Aug 2015 01:13:59 
+0200
+ 
+ saga (2.2.0+dfsg-1) unstable; urgency=medium
+ 
+   [ Johan Van de Wauw ]
+   * Enable parallel building
+   * Add patch to work with recent versions of libvigraimpex
+     Patch provided by Adam Conrad (closes: #792696)
+ 
+   [ Bas Couwenberg ]
+   * Add repacksuffix in watch file to use +dfsg in version.
+   * Remove trailing space after . control statement.
+ 
+   [ Johan Van de Wauw ]
+   * Fix manpages build
+   * Remove B/D on liblas
+   * Imported Upstream version 2.2.0+dfsg
+   * Fix manfile generation once more
+   * Add opencv module
+ 
+   [ Bas Couwenberg ]
+   * Update copyright file, changes:
+     - Add differently licensed files
+     - Change Boost license to SPDX compatible BSL-1.0 shortname
+     - Correct dxflib license to GPL-2 or dxf-Commercial
+     - Align copyrght holders
+     - Remove trailing whitespace
+   * Add build dependencies for missing headers:
+     - libcv-dev             opencv/cv.h
+     - libopencv-photo-dev   opencv2/photo/photo.hpp
+     - libopencv-contrib-dev opencv2/contrib/contrib.hpp
  
-  -- Johan Van de Wauw <johan.vandew...@gmail.com>  Mon, 01 Dec 2014 00:02:43 
+0100
+  -- Johan Van de Wauw <johan.vandew...@gmail.com>  Fri, 17 Jul 2015 18:07:41 
+0200
++>>>>>>> master
  
  saga (2.1.4+dfsg-1) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/saga.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to