[saga] 01/01: Merge branch 'master' into ubuntugis/wily

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch ubuntugis/wily
in repository saga.

commit 2359edc4ba3c1d898a21aa885e27433417c631ef
Merge: 8e1d33e 9e97fe8
Author: Johan Van de Wauw <johan at vandewauw.be>
Date:   Thu Apr 28 11:04:07 2016 +0200

    Merge branch 'master' into ubuntugis/wily

 README                                             |    2 +-
 configure                                          |   20 +-
 configure.ac                                       |    4 +-
 debian/changelog                                   |   11 +-
 debian/control                                     |   21 +-
 debian/control.in                                  |    7 +-
 debian/copyright                                   |   27 +-
 ...api-2.2.6.install => libsaga-api-2.2.7.install} |    0
 ...gdi-2.2.6.install => libsaga-gdi-2.2.7.install} |    0
 ...errides => libsaga-gdi-2.2.7.lintian-overrides} |    2 +-
 debian/patches/fix-spelling.patch                  |   14 +
 debian/patches/series                              |    1 +
 debian/saga-depends                                |    4 +-
 src/modules/climate/climate_tools/milankovic.cpp   |    4 +-
 src/modules/db/db_pgsql/get_connection.cpp         |    2 +-
 src/modules/grid/grid_analysis/Grid_IMCORR.cpp     |    4 +-
 src/modules/grid/grid_tools/CreateGridSystem.cpp   |  547 +--
 src/modules/grid/grid_tools/CreateGridSystem.h     |   10 +-
 src/modules/grid/grid_tools/Grid_Completion.cpp    |    4 +-
 src/modules/grid/grid_tools/Grid_Orientation.cpp   |    7 +-
 src/modules/grid/grid_tools/Grid_Shrink_Expand.cpp |    4 +-
 .../imagery_classification/cluster_isodata.cpp     |    7 +-
 src/modules/imagery/imagery_opencv/opencv_nnet.cpp |    2 +-
 src/modules/io/io_grid/import_clip_resample.cpp    |  146 +-
 src/modules/io/io_grid/import_clip_resample.h      |    6 +-
 .../io/io_shapes_dxf/dxflib/dl_attributes.h        |  185 -
 src/modules/io/io_shapes_dxf/dxflib/dl_codes.h     |  545 ---
 .../io/io_shapes_dxf/dxflib/dl_creationadapter.h   |  105 -
 .../io/io_shapes_dxf/dxflib/dl_creationinterface.h |  269 --
 src/modules/io/io_shapes_dxf/dxflib/dl_dxf.cpp     | 5073 --------------------
 src/modules/io/io_shapes_dxf/dxflib/dl_dxf.h       |  433 --
 src/modules/io/io_shapes_dxf/dxflib/dl_entities.h  | 1454 ------
 src/modules/io/io_shapes_dxf/dxflib/dl_exception.h |   58 -
 src/modules/io/io_shapes_dxf/dxflib/dl_extrusion.h |  147 -
 src/modules/io/io_shapes_dxf/dxflib/dl_writer.h    |  621 ---
 .../io/io_shapes_dxf/dxflib/dl_writer_ascii.cpp    |  157 -
 .../io/io_shapes_dxf/dxflib/dl_writer_ascii.h      |   78 -
 .../pointcloud_tools/pc_drop_attribute.cpp         |  124 +-
 .../pointcloud_tools/pc_drop_attribute.h           |   13 +-
 src/modules/projection/pj_proj4/crs_base.cpp       |    4 +-
 .../ta_hydrology/Flow_Parallel.cpp                 |    2 +-
 .../ta_hydrology/Flow_RecursiveUp.cpp              |    2 +-
 .../ta_hydrology/flow_massflux.cpp                 |    2 +-
 src/saga_core/saga_api/grid_operation.cpp          |    4 +-
 src/saga_core/saga_api/mat_formula.cpp             |    6 +-
 src/saga_core/saga_api/module_chain.cpp            |    3 +
 src/saga_core/saga_api/saga_api.h                  |    4 +-
 src/saga_core/saga_cmd/module_library.cpp          |   26 +-
 src/saga_core/saga_gui/dlg_about.cpp               |   10 +-
 src/saga_core/saga_gui/helper.cpp                  |    4 +-
 src/saga_core/saga_gui/res/saga.bra.txt            |   53 +-
 src/saga_core/saga_gui/res/saga.ger.txt            |   53 +-
 src/saga_core/saga_gui/res/saga.lng.txt            |   53 +-
 src/saga_core/saga_gui/res_commands.cpp            |    4 +-
 src/saga_core/saga_gui/saga_frame.cpp              |    4 +-
 src/saga_core/saga_gui/wksp_module.cpp             |   13 +-
 src/scripting/helper/make_saga_release.bat         |    2 +-
 src/scripting/toolchains/imagery_lczc.xml          |    4 +-
 src/scripting/toolchains/twi.xml                   |    4 +-
 59 files changed, 597 insertions(+), 9778 deletions(-)

diff --cc debian/changelog
index 3327b6e,de78270..8f4f24d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,7 +1,13 @@@
- saga (2.2.6+dfsg-0~ubuntugis~wily) wily; urgency=medium
++saga (2.2.7+dfsg-0~ubuntugis~wily) wily; urgency=medium
 +
 +  * wily build 
 +
 + -- Johan Van de Wauw <johan at vandewauw.be>  Fri, 08 Apr 2016 09:03:58 +0200
 +
- saga (2.2.6+dfsg-1) UNRELEASED; urgency=medium
+ saga (2.2.7+dfsg-1) UNRELEASED; urgency=medium
  
    [ Johan Van de Wauw ]
-   * Imported Upstream version 2.2.6
+   * Imported Upstream version 2.2.7
      - Removed JasPer support. (closes: #818218)
  
    [ Bas Couwenberg ]

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