This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository saga.
commit 6fbf1b077958fbfdb6663b6cdaf5887bee0471b7 Merge: 6d30e4b 0e8f2fc Author: Johan Van de Wauw <jo...@vandewauw.be> Date: Thu Sep 24 15:33:05 2015 +0200 Merge tag 'upstream/2.2.1+dfsg' Upstream version 2.2.1+dfsg README | 2 +- configure | 23 +- configure.ac | 5 +- debian/changelog | 6 + src/modules/grid/grid_analysis/MLB_Interface.cpp | 16 +- src/modules/grid/grid_analysis/Makefile.am | 4 +- src/modules/grid/grid_analysis/Makefile.in | 15 +- .../grid/grid_analysis/diversity_analysis.cpp | 291 ++ .../grid_analysis/diversity_analysis.h} | 39 +- .../grid/grid_calculus/Grid_Random_Terrain.cpp | 4 +- src/modules/grid/grid_filter/MLB_Interface.cpp | 6 +- src/modules/grid/grid_filter/Makefile.am | 4 +- src/modules/grid/grid_filter/Makefile.in | 7 +- src/modules/grid/grid_filter/wombling.cpp | 368 +++ .../grid_to_kml.h => grid/grid_filter/wombling.h} | 38 +- src/modules/grid/grid_gridding/Interpolation.cpp | 4 +- src/modules/grid/grid_gridding/Shapes2Grid.cpp | 11 +- src/modules/grid/grid_gridding/kernel_density.cpp | 4 +- .../grid/grid_spline/Gridding_Spline_Base.cpp | 4 +- .../grid/grid_spline/MBASpline_for_Categories.cpp | 10 +- src/modules/grid/grid_tools/Grid_Cut.cpp | 26 +- src/modules/grid/grid_tools/Grid_Merge.cpp | 4 +- src/modules/grid/grid_tools/Grid_Resample.cpp | 16 +- src/modules/grid/grid_tools/Grid_SortRaster.cpp | 25 +- .../grid_tools/Grid_Value_Replace_Interactive.cpp | 158 +- .../grid_tools/Grid_Value_Replace_Interactive.h | 62 +- src/modules/imagery/imagery_opencv/opencv_nnet.cpp | 4 +- src/modules/imagery/imagery_opencv/opencv_nnet.h | 4 +- .../imagery/imagery_vigra/vigra_random_forest.cpp | 2 +- src/modules/io/io_gdal/gdal_driver.cpp | 67 +- src/modules/io/io_gdal/gdal_driver.h | 3 + src/modules/io/io_gdal/gdal_import.cpp | 8 + src/modules/io/io_grid_image/MLB_Interface.cpp | 13 +- src/modules/io/io_grid_image/grid_export.cpp | 43 +- src/modules/io/io_grid_image/grid_to_kml.cpp | 217 +- src/modules/io/io_grid_image/grid_to_kml.h | 31 +- .../pointcloud/pointcloud_tools/MLB_Interface.cpp | 12 +- .../pointcloud/pointcloud_tools/Makefile.am | 2 + .../pointcloud/pointcloud_tools/Makefile.in | 8 +- .../pointcloud/pointcloud_tools/pc_from_shapes.cpp | 35 +- .../pointcloud/pointcloud_tools/pc_from_shapes.h | 2 +- .../{pc_from_shapes.cpp => pc_from_table.cpp} | 156 +- .../{pc_from_shapes.h => pc_from_table.h} | 46 +- .../pointcloud_tools/pc_reclass_extract.cpp | 36 +- .../pointcloud_tools/pc_reclass_extract.h | 3 +- src/modules/shapes/shapes_lines/MLB_Interface.cpp | 3 +- .../shapes/shapes_lines/line_split_with_lines.cpp | 179 ++ .../shapes/shapes_lines/line_split_with_lines.h | 23 + .../shapes/shapes_points/Points_From_Lines.cpp | 596 +++- .../shapes/shapes_points/Points_From_Lines.h | 9 +- src/modules/simulation/Makefile.am | 2 +- src/modules/simulation/Makefile.in | 2 +- src/modules/simulation/sim_rivflow/DataTrans.cpp | 179 ++ .../sim_rivflow/DataTrans.h} | 188 +- src/modules/simulation/sim_rivflow/GridComb.cpp | 405 +++ .../sim_rivflow/GridComb.h} | 215 +- src/modules/simulation/sim_rivflow/LandFlow.cpp | 3165 ++++++++++++++++++++ src/modules/simulation/sim_rivflow/LandFlow.h | 294 ++ .../sim_rivflow}/MLB_Interface.cpp | 266 +- .../sim_rivflow/MLB_Interface.h} | 178 +- src/modules/simulation/sim_rivflow/Makefile.am | 32 + .../sim_rivflow}/Makefile.in | 99 +- src/modules/simulation/sim_rivflow/RivBasin.cpp | 594 ++++ .../sim_rivflow/RivBasin.h} | 204 +- .../simulation/sim_rivflow/RivCourseImpr.cpp | 192 ++ .../sim_rivflow/RivCourseImpr.h} | 189 +- src/modules/simulation/sim_rivflow/RivGridPrep.cpp | 221 ++ .../sim_rivflow/RivGridPrep.h} | 202 +- .../statistics/statistics_kriging/kriging_base.cpp | 2 +- .../statistics_kriging/kriging_regression.cpp | 77 +- .../statistics_regression/gw_multi_regression.cpp | 2 +- .../statistics_regression/gw_regression.cpp | 2 +- .../point_multi_grid_regression.cpp | 56 +- .../statistics_regression/point_trend_surface.cpp | 2 +- .../ta_morphometry/ProtectionIndex.cpp | 48 +- .../ta_morphometry/tc_iwahashi_pike.cpp | 776 +++-- .../ta_morphometry/tc_iwahashi_pike.h | 58 +- src/saga_core/saga_api/Makefile.am | 5 +- src/saga_core/saga_api/Makefile.in | 31 +- src/saga_core/saga_api/api_core.h | 10 +- src/saga_core/saga_api/api_string.cpp | 39 +- src/saga_core/saga_api/data_manager.cpp | 30 +- src/saga_core/saga_api/data_manager.h | 4 +- src/saga_core/saga_api/dataobject.cpp | 24 +- src/saga_core/saga_api/dataobject.h | 12 +- src/saga_core/saga_api/datetime.cpp | 515 ++++ src/saga_core/saga_api/datetime.h | 368 +++ src/saga_core/saga_api/grid.cpp | 40 +- src/saga_core/saga_api/grid.h | 83 +- src/saga_core/saga_api/grid_io.cpp | 513 ++-- src/saga_core/saga_api/grid_memory.cpp | 82 +- src/saga_core/saga_api/mat_tools.cpp | 161 +- src/saga_core/saga_api/mat_tools.h | 110 +- src/saga_core/saga_api/module_chain.cpp | 142 +- src/saga_core/saga_api/parameter_data.cpp | 21 +- src/saga_core/saga_api/pointcloud.cpp | 101 +- src/saga_core/saga_api/pointcloud.h | 34 +- src/saga_core/saga_api/quadtree.cpp | 4 +- src/saga_core/saga_api/saga_api.h | 4 +- src/saga_core/saga_api/shapes.cpp | 8 +- src/saga_core/saga_api/table_io.cpp | 6 +- src/saga_core/saga_api/tin.cpp | 6 +- src/saga_core/saga_cmd/module_library.cpp | 32 +- src/saga_core/saga_cmd/module_library.h | 4 +- src/saga_core/saga_gui/data_source.cpp | 2 +- src/saga_core/saga_gui/project.cpp | 18 +- src/saga_core/saga_gui/res/saga.ger.txt | 983 +++++- src/saga_core/saga_gui/res/saga.lng.txt | 981 +++++- src/saga_core/saga_gui/saga.cpp | 24 +- src/saga_core/saga_gui/saga_frame.cpp | 12 +- src/saga_core/saga_gui/view_histogram.cpp | 6 +- src/saga_core/saga_gui/view_layout_info.cpp | 4 +- src/saga_core/saga_gui/view_map_control.cpp | 4 +- src/saga_core/saga_gui/wksp_base_item.h | 13 +- src/saga_core/saga_gui/wksp_data_manager.cpp | 123 +- src/saga_core/saga_gui/wksp_data_menu_file.cpp | 38 +- src/saga_core/saga_gui/wksp_data_menu_file.h | 3 +- src/saga_core/saga_gui/wksp_data_menu_files.cpp | 13 +- src/saga_core/saga_gui/wksp_data_menu_files.h | 3 +- src/saga_core/saga_gui/wksp_grid.cpp | 17 +- src/saga_core/saga_gui/wksp_grid.h | 4 +- src/saga_core/saga_gui/wksp_layer.cpp | 8 +- src/saga_core/saga_gui/wksp_layer.h | 6 +- src/saga_core/saga_gui/wksp_map.cpp | 28 +- src/saga_core/saga_gui/wksp_map.h | 6 +- src/saga_core/saga_gui/wksp_map_layer.cpp | 80 +- src/saga_core/saga_gui/wksp_map_layer.h | 7 +- src/saga_core/saga_gui/wksp_pointcloud.cpp | 4 +- src/saga_core/saga_gui/wksp_pointcloud.h | 4 +- src/saga_core/saga_gui/wksp_shapes.cpp | 8 +- src/saga_core/saga_gui/wksp_shapes.h | 4 +- src/saga_core/saga_gui/wksp_tin.cpp | 8 +- src/saga_core/saga_gui/wksp_tin.h | 4 +- 133 files changed, 12486 insertions(+), 2622 deletions(-) diff --cc debian/changelog index df54b79,0000000..7c9c14e mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,233 -1,0 +1,239 @@@ ++saga (2.2.1+dfsg-1) UNRELEASED; urgency=medium ++ ++ * Imported Upstream version 2.2.1+dfsg ++ ++ -- Johan Van de Wauw <jo...@vandewauw.be> Thu, 24 Sep 2015 15:33:16 +0200 ++ +saga (2.2.0+dfsg-2) unstable; urgency=medium + + * Fix opencv module + * Update my emailaddress + + -- Johan Van de Wauw <jo...@vandewauw.be> Tue, 15 Sep 2015 22:59:50 +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> Fri, 17 Jul 2015 18:07:41 +0200 + +saga (2.1.4+dfsg-1) unstable; urgency=medium + + * Update to new upstream version + * Fix order in copyright file + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Mon, 24 Nov 2014 22:07:13 +0100 + +saga (2.1.2+dfsg-3) unstable; urgency=medium + + * Use dep-5 style copyright file + * Enable OpenMP + * Revert "Temporarily disable building saga gui on arm" - bug resolved in gcc + * Fix provides tag + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Thu, 09 Oct 2014 21:09:35 +0200 + +saga (2.1.2+dfsg-2) unstable; urgency=medium + + * Remove unneeded configure option + * Fix wrong version number in saga-depends + * Temporarily disable building saga gui on arm (closes: #755361) + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Tue, 12 Aug 2014 18:48:40 +0200 + +saga (2.1.2+dfsg-1) unstable; urgency=medium + + * Import new upstream (closes: #717624) + * Fix patches - remove autoreconf results - rename configure.in + * Remove changes to Makefile.am (autoreconf) + * Remove patch (included upstream) + * Delete missing icons from menu fil + * Bump standards version - no changes needed + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Tue, 15 Jul 2014 04:38:14 -0400 + +saga (2.1.0+dfsg-1) unstable; urgency=low + + [ Johan Van de Wauw ] + * Update to new upstream version. + * Uses wxwidgets 3.0 instead of 2.8 + + [ Francesco Paolo Lovergine ] + * Tagged for sid. + * Changed path to relative ones in *.install file for dh_install. + * Truly annotate the previous fix. + (closes: #715109) + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Thu, 14 Nov 2013 21:16:53 -0500 + +saga (2.0.8+dfsg-4) unstable; urgency=low + + * Correct saga-depends + * Add Missing Depends to libsaga-dev. Fixes #715109 + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Wed, 17 Jul 2013 13:58:31 -0400 + +saga (2.0.8+dfsg-3) unstable; urgency=low + + * Removed libvigraimpex-dev b-d. + (closes: #669468) + + -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 18 Jun 2012 14:28:12 +0200 + +saga (2.0.8+dfsg-2) unstable; urgency=low + + [ Johan Van de Wauw ] + * Run autoreconf after last grib2 fix + more logical patches. + + [ Francesco Paolo Lovergine ] + * Policy bumped to 3.9.3, no changes required. + + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 28 Feb 2012 23:46:51 +0100 + +saga (2.0.8+dfsg-1) unstable; urgency=low + + [ Francesco Paolo Lovergine ] + * Fixed python support in debian/rules for dh call. + (closes: #642566) + * Fixed a bit of mess in patchset and upstream on git repo. + + [ Johan Van de Wauw ] + * Imported Upstream version 2.0.8 + + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 07 Feb 2012 19:43:29 +0100 + +saga (2.0.7+dfsg-2) unstable; urgency=low + + [ Francesco Paolo Lovergine ] + * Added missing ${python:Depends} in python-saga and remove autodetection + of python versions. Thanks Jakub Wilk. + (closes: #642566) + + [ Johan Van de Wauw ] + * Install man-files correctly. + * Add python-saga to the right section. + + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 27 Sep 2011 15:27:31 +0200 + +saga (2.0.7+dfsg-1) unstable; urgency=low + + [ Johan Van de Wauw ] + * Imported Upstream version 2.0.7 + * Delete .svn files prior when creating dfsg-free tarball + * Fix gcc 4.6 build issues + * Use debian version of grib2 + * Bump standards version + * Enable building of python plugin + * Add support for opening *.las files + * Adjust grid_gridding to use qhull + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Tue, 30 Aug 2011 15:39:35 -0400 + +saga (2.0.6+dfsg-0) unstable; urgency=low + + [ Johan Van de Wauw ] + * Update to 2.0.6 + * Add libvigra-impex-dev - enables extra modules + * Add break/replace to avoid apt problems + * Revert to the right descriptions in debian/control + * Update saga_depends to 2.0.6 + * Switch build system from cdbs to dh7 + * Add patch from autoreconf result + + [ Francesco Paolo Lovergine ] + * Dropped obsolete pre-squeeze proj alternative build-dep. + * Policy bumped to current 3.9.2, without changes. + * Dropped cdbs dependency, now using debhelper dh_* rules. + * Using source 3.0 format with quilt support. + * Debhelper level set to 8. + * Some packaging changes. + * Added missing changelog note. + + -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 07 Jun 2011 17:16:33 +0200 + +saga (2.0.5+dfsg-0) unstable; urgency=low + + * Update to 2.0.5 + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Wed, 29 Sep 2010 14:23:48 +0200 + +saga (2.0.4+dfsg-3) unstable; urgency=low + + * Update build-depends to enable backport to lenny + * Move unversioned libraries to -dev package + * Fix module description html generation + * Bump standards version to 3.9.0, no changes required + + -- Johan Van de Wauw <johan.vandew...@gmail.com> Thu, 22 Jul 2010 13:27:01 +0200 + +saga (2.0.4+dfsg-2) unstable; urgency=low + + [ Johan Van de Wauw ] + * Fix program description (closes: #578419) + * Fix bug: deep map window zoom freezes SAGA + * Fix Esri E00 import + * Fix bug: printf() crashes + + -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 10 May 2010 16:00:39 +0200 + +saga (2.0.4+dfsg-1) unstable; urgency=low + + * Initial release, with copyright fixes and non-free removals. + (closes: #570014) + + [ Johan Van de Wauw ] + * Initial import debian files + * Fix tip of the day + * Add saga_gdi to lib instead of pkglib (fixes errors when running + saga_cmd) + * Fix upstream bug 2896803 Grid to shapefile + * Update manfile (multiple files example) + * Remove unneccesary CVS files + * Add libsaga_gdi.so to /usr/lib instead of /usr/lib/saga + * Use grib2 in debian instead of static linked version + * Separate saga-dev package + * Fix sonumbers for saga_api.so and saga_gdi + * Remove non-free components (in grid_gridding and fire_simulation) + + [ Francesco Paolo Lovergine ] + * Maintainer set to DebianGis team, with git maintenance. + * Added Johan and me as uploaders. + * Set Vcs-* fields. + * Long description revised. + * Set libproj-dev build-dep. + * Moved to Debhelper level 7. + * Minor layout changes to debian/control to respect 80 cols width. + * Debian revision reset to 2.0.4-1. + * Apps -> Applications in debian/menu. + * Now libtool helper files .la are not installed. + * Added ITP bug number. + * Added a templated debhelper saga-depends little script to provide required + substvars for third-parties packages. + + -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 25 Mar 2010 13:22:43 +0100 -- 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