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

johanvdw-guest pushed a commit to branch ubuntugis
in repository grass.

commit 16c96afcb44b81b0bd01c4c5a3fcf0fc323e1a7b
Merge: fbc3185 1cb7b2e
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date:   Thu Aug 6 21:35:37 2015 +0200

    Merge branch 'experimental' into ubuntugis
    
    Conflicts:
        debian/changelog

 AUTHORS                                            |    23 +-
 ChangeLog_7.0.0.gz                                 |   Bin 788043 -> 0 bytes
 ChangeLog_7.0.1.gz                                 |   Bin 0 -> 798778 bytes
 README.debian                                      |    78 +
 REQUIREMENTS.html                                  |     8 +-
 config.guess                                       |    27 +-
 config.sub                                         |    13 +-
 db/db.tables/main.c                                |     3 +
 db/drivers/postgres/README                         |     5 +-
 debian/changelog                                   |    46 +-
 debian/control                                     |    53 +-
 debian/control.in                                  |    53 +-
 debian/grass-core.lintian-overrides                |    10 -
 debian/grass-gui.links.in                          |     4 +-
 debian/patches/desktop.patch                       |     3 +-
 debian/patches/instdir                             |     1 +
 debian/patches/pager                               |     3 +-
 debian/rules                                       |    11 +-
 debian/watch                                       |     5 +-
 demolocation/grassrc.tmpl                          |     2 -
 display/d.legend/d.legend.html                     |    16 +-
 display/d.legend/d_legend.png                      |   Bin 0 -> 236883 bytes
 display/d.linegraph/main.c                         |     2 +-
 display/d.rast.num/d.rast.num.html                 |    33 +-
 display/d.rast.num/d_rast_num_zoom.png             |   Bin 0 -> 147085 bytes
 display/d.rast.num/main.c                          |     4 +-
 display/d.vect.chart/d.vect.chart.html             |    15 +-
 display/d.vect.chart/d_vect_chart_pie_2d.png       |   Bin 0 -> 91184 bytes
 display/d.vect.chart/main.c                        |     3 +-
 display/d.vect.chart/pie.c                         |    14 +-
 display/d.vect/area.c                              |     2 +-
 display/d.vect/lines.c                             |    12 +-
 display/d.vect/main.c                              |     2 +-
 doc/.howto_release.txt.swp                         |   Bin 0 -> 16384 bytes
 doc/howto_release.txt                              |    15 +-
 doc/parms_flags.txt                                |     2 +-
 general/g.gui/main.c                               |    92 +-
 general/g.mapset/main.c                            |    19 +-
 general/g.mapsets/g.mapsets.html                   |    41 +-
 general/g.mapsets/g_mapsets_gui.png                |   Bin 0 -> 17263 bytes
 general/g.parser/standard_option.c                 |     2 +
 gui/images/startup_banner.svg                      |   234 +
 gui/images/startup_banner.txt                      |    23 +
 gui/wxpython/animation/controller.py               |     9 +-
 gui/wxpython/animation/data.py                     |     4 +
 gui/wxpython/animation/dialogs.py                  |    12 +-
 gui/wxpython/animation/g.gui.animation.py          |    36 +-
 gui/wxpython/core/render.py                        |     2 +-
 gui/wxpython/core/settings.py                      |     2 +-
 gui/wxpython/core/toolboxes.py                     |   113 +-
 gui/wxpython/core/treemodel.py                     |     5 +-
 gui/wxpython/core/utils.py                         |     7 -
 gui/wxpython/dbmgr/base.py                         |    41 +-
 gui/wxpython/dbmgr/g.gui.dbmgr.py                  |    38 +-
 gui/wxpython/dbmgr/manager.py                      |    20 +-
 gui/wxpython/dbmgr/sqlbuilder.py                   |    19 +-
 gui/wxpython/docs/wxGUI.nviz.html                  |     4 +-
 gui/wxpython/gcp/g.gui.gcp.py                      |    22 +-
 gui/wxpython/gmodeler/g.gui.gmodeler.py            |    25 +-
 gui/wxpython/gui_core/dialogs.py                   |    33 +-
 gui/wxpython/gui_core/forms.py                     |    31 +-
 gui/wxpython/gui_core/goutput.py                   |     2 +-
 gui/wxpython/gui_core/widgets.py                   |     8 +-
 gui/wxpython/iclass/frame.py                       |    22 +-
 gui/wxpython/iclass/g.gui.iclass.py                |    70 +-
 gui/wxpython/iscatt/controllers.py                 |     4 +-
 gui/wxpython/iscatt/core_c.py                      |     2 +-
 gui/wxpython/iscatt/iscatt_core.py                 |     2 +-
 gui/wxpython/lmgr/frame.py                         |     6 +-
 gui/wxpython/lmgr/layertree.py                     |    15 +-
 gui/wxpython/lmgr/toolbars.py                      |     4 +-
 gui/wxpython/mapswipe/g.gui.mapswipe.py            |    40 +-
 gui/wxpython/modules/mapsets_picker.py             |    22 +-
 gui/wxpython/psmap/frame.py                        |     4 +-
 gui/wxpython/psmap/g.gui.psmap.py                  |    20 +-
 gui/wxpython/rlisetup/g.gui.rlisetup.py            |    19 +-
 gui/wxpython/rlisetup/wizard.py                    |     8 +-
 gui/wxpython/timeline/g.gui.timeline.py            |    20 +-
 gui/wxpython/vdigit/g.gui.vdigit.html              |    79 +-
 gui/wxpython/vdigit/g.gui.vdigit.py                |   103 +-
 gui/wxpython/vnet/dialogs.py                       |     9 +-
 gui/wxpython/web_services/widgets.py               |    11 +-
 gui/wxpython/wxplot/profile.py                     |     8 +-
 gui/wxpython/xml/toolboxes.xml                     |     4 +-
 imagery/i.atcorr/6s.cpp                            |     2 +-
 imagery/i.atcorr/i.atcorr.html                     |     4 +-
 imagery/i.eb.soilheatflux/i.eb.soilheatflux.html   |    37 +-
 imagery/i.segment/create_isegs.c                   |     2 +-
 include/Make/Compile.make                          |     2 +-
 include/VERSION                                    |     2 +-
 include/defs/la.h                                  |     4 +
 include/defs/vector.h                              |     7 +
 include/gis.h                                      |     6 +-
 include/glocale.h                                  |     4 +-
 include/iostream/empq_impl.h                       |     4 +-
 lib/cairodriver/cairodriver.html                   |    30 +-
 lib/db/dbmi_client/copy_tab.c                      |     2 +-
 lib/gis/basename.c                                 |     4 +-
 lib/gis/copy_dir.c                                 |    33 +-
 lib/gis/get_ellipse.c                              |     2 +-
 lib/gis/parser_standard_options.c                  |    24 +
 lib/gis/renamed_options                            |     4 +
 lib/gmath/la.c                                     |   203 +-
 lib/init/grass.py                                  |    16 +-
 lib/init/variables.html                            |    18 +-
 lib/manage/do_remove.c                             |     4 +-
 lib/nviz/nviz.c                                    |     4 +-
 lib/ogsf/gs2.c                                     |     4 +-
 lib/proj/ellipse.c                                 |     2 +-
 lib/python/docs/src/pygrass_modules.rst            |     9 +-
 lib/python/docs/src/pygrass_raster.rst             |    54 +-
 lib/python/docs/src/pygrass_vector.rst             |     8 +-
 lib/python/docs/src/script_intro.rst               |    29 +-
 lib/python/docs/src/temporal_framework.rst         |     5 +-
 lib/python/pygrass/modules/interface/Makefile      |     4 +-
 lib/python/pygrass/modules/interface/docstring.py  |    55 +
 lib/python/pygrass/modules/interface/env.py        |    36 +
 lib/python/pygrass/modules/interface/flag.py       |    17 +-
 lib/python/pygrass/modules/interface/module.py     |    88 +-
 lib/python/pygrass/modules/interface/parameter.py  |    11 +-
 lib/python/pygrass/modules/interface/read.py       |     2 +-
 lib/python/pygrass/modules/interface/typedict.py   |     2 +-
 lib/python/pygrass/raster/__init__.py              |     4 +-
 lib/python/pygrass/raster/category.py              |     2 +-
 lib/python/pygrass/tests/benchmark.py              |    93 +-
 lib/python/pygrass/utils.py                        |    58 +-
 lib/python/pygrass/vector/geometry.py              |    17 +-
 lib/python/pygrass/vector/table.py                 |    18 +-
 lib/python/script/Makefile                         |     6 +-
 lib/python/script/array.py                         |    53 +-
 lib/python/script/core.py                          |    69 +-
 lib/python/script/setup.py                         |   191 +
 lib/python/script/setup.py.sed                     |    77 -
 lib/python/script/task.py                          |    15 +-
 lib/python/temporal/abstract_space_time_dataset.py |    26 +
 lib/python/temporal/c_libraries_interface.py       |    50 +-
 lib/python/temporal/gui_support.py                 |     1 +
 .../temporal/temporal_raster_base_algebra.py       |     5 +-
 lib/raster/get_row.c                               |     3 +-
 lib/raster/put_row.c                               |     9 +-
 lib/rst/interp_float/output2d.c                    |     2 +-
 lib/vector/Vlib/build_nat.c                        |     8 +-
 lib/vector/Vlib/build_sfa.c                        |    10 +-
 lib/vector/Vlib/cats.c                             |     2 +-
 lib/vector/Vlib/intersect2.c                       |  1431 +
 lib/vector/diglib/plus_struct.c                    |     2 +-
 locale/Makefile                                    |    12 +-
 locale/README                                      |    16 +-
 locale/po/grasslibs_ar.po                          | 13152 ++--
 locale/po/grasslibs_cs.po                          | 14034 ++--
 locale/po/grasslibs_de.po                          | 13956 ++--
 locale/po/grasslibs_el.po                          | 13846 ++--
 locale/po/grasslibs_es.po                          | 14648 ++---
 locale/po/grasslibs_fr.po                          | 13804 ++--
 locale/po/grasslibs_it.po                          | 14208 ++--
 locale/po/grasslibs_ja.po                          | 13732 ++--
 locale/po/grasslibs_ko.po                          | 12300 ++--
 locale/po/grasslibs_lv.po                          | 13042 ++--
 locale/po/grasslibs_ml.po                          | 11926 ++--
 locale/po/grasslibs_pl.po                          | 13790 ++--
 locale/po/grasslibs_pt.po                          | 13906 ++--
 locale/po/grasslibs_pt_br.po                       | 13385 ++--
 locale/po/grasslibs_ro.po                          | 11672 ++--
 locale/po/grasslibs_ru.po                          | 13962 ++--
 locale/po/grasslibs_sl.po                          | 13328 ++--
 locale/po/grasslibs_th.po                          | 13760 ++--
 locale/po/grasslibs_tr.po                          | 13200 ++--
 locale/po/grasslibs_vi.po                          | 13962 ++--
 locale/po/grasslibs_zh.po                          | 13583 ++--
 locale/po/grassmods_ar.po                          | 58056 ++++++++---------
 locale/po/grassmods_cs.po                          | 62048 +++++++++---------
 locale/po/grassmods_de.po                          | 63823 +++++++++---------
 locale/po/grassmods_el.po                          | 51909 +++++++--------
 locale/po/grassmods_es.po                          | 64365 ++++++++++---------
 locale/po/grassmods_fr.po                          | 64139 +++++++++---------
 locale/po/grassmods_it.po                          | 60662 ++++++++---------
 locale/po/grassmods_ja.po                          | 62490 +++++++++---------
 locale/po/grassmods_ko.po                          | 51411 +++++++--------
 locale/po/grassmods_lv.po                          | 58231 +++++++++--------
 locale/po/grassmods_pl.po                          | 60275 ++++++++---------
 locale/po/grassmods_pt.po                          | 61076 +++++++++---------
 locale/po/grassmods_pt_br.po                       | 61269 +++++++++---------
 locale/po/grassmods_ro.po                          | 48613 +++++++-------
 locale/po/grassmods_ru.po                          | 62939 +++++++++---------
 locale/po/grassmods_sl.po                          | 58455 ++++++++---------
 locale/po/grassmods_th.po                          | 61792 +++++++++---------
 locale/po/grassmods_tr.po                          | 58379 ++++++++---------
 locale/po/grassmods_vi.po                          | 63273 +++++++++---------
 locale/po/grassmods_zh.po                          | 59205 ++++++++---------
 locale/po/grasswxpy_cs.po                          | 28370 ++++----
 locale/po/grasswxpy_de.po                          | 28172 ++++----
 locale/po/grasswxpy_el.po                          | 23368 +++----
 locale/po/grasswxpy_es.po                          | 28755 ++++-----
 locale/po/grasswxpy_fr.po                          | 28147 ++++----
 locale/po/grasswxpy_id.po                          | 27515 ++++----
 locale/po/grasswxpy_it.po                          | 26332 ++++----
 locale/po/grasswxpy_ja.po                          | 28193 ++++----
 locale/po/grasswxpy_ko.po                          | 18921 +++---
 locale/po/grasswxpy_lv.po                          | 23513 +++----
 locale/po/grasswxpy_ml.po                          | 24131 +++----
 locale/po/grasswxpy_pl.po                          | 27781 ++++----
 locale/po/grasswxpy_pt.po                          | 26726 ++++----
 locale/po/grasswxpy_pt_br.po                       | 27988 ++++----
 locale/po/grasswxpy_ro.po                          | 27756 ++++----
 locale/po/grasswxpy_ru.po                          | 27674 ++++----
 locale/po/grasswxpy_th.po                          | 24908 +++----
 locale/po/grasswxpy_tr.po                          | 26654 ++++----
 locale/po/grasswxpy_vi.po                          | 27990 ++++----
 locale/po/grasswxpy_zh.po                          | 27807 ++++----
 man/build_html.py                                  |     1 +
 mswindows/GRASS-Installer.nsi.tmpl                 |    19 +-
 mswindows/env.bat                                  |     2 -
 mswindows/osgeo4w/env.bat.tmpl                     |     2 -
 mswindows/osgeo4w/mklibs.sh                        |     2 +-
 raster/r.carve/enforce_ds.c                        |    50 +-
 raster/r.carve/r.carve.html                        |     4 +-
 raster/r.clump/clump.c                             |     4 +-
 raster/r.clump/main.c                              |     2 +-
 raster/r.compress/main.c                           |    89 +-
 raster/r.compress/r.compress.html                  |    67 +-
 raster/r.contour/cont.c                            |     4 +-
 raster/r.cost/main.c                               |     2 +-
 raster/r.distance/defs.h                           |     2 +-
 raster/r.drain/r.drain.html                        |     4 +-
 raster/r.external/proj.c                           |     5 +-
 raster/r.fill.dir/dopolys.c                        |     2 +-
 raster/r.flow/r.flow.html                          |    56 +-
 raster/r.flow/r_flow_accumulation.png              |   Bin 0 -> 169742 bytes
 raster/r.flow/r_flow_length.png                    |   Bin 0 -> 159149 bytes
 raster/r.flow/r_flow_line.png                      |   Bin 0 -> 186040 bytes
 raster/r.grow.distance/r.grow.distance.html        |    10 +-
 raster/r.grow.distance/r_grow_distance_zoom.png    |   Bin 0 -> 131869 bytes
 raster/r.horizon/main.c                            |    50 +-
 raster/r.horizon/r.horizon.html                    |     4 +-
 raster/r.in.gdal/main.c                            |    72 +-
 raster/r.in.lidar/main.c                           |     5 +-
 raster/r.in.lidar/r.in.lidar.html                  |     4 +-
 raster/r.in.mat/r.in.mat.html                      |     4 +-
 raster/r.in.xyz/r.in.xyz.html                      |     4 +-
 raster/r.li/r.li.daemon/daemon.c                   |     4 +-
 raster/r.li/r.li.daemon/daemon.h                   |    14 +-
 raster/r.li/r.li.daemon/r.li.daemon.html           |    31 +-
 raster/r.li/r.li.html                              |    12 +-
 raster/r.mapcalc/map.c                             |    29 +-
 raster/r.mapcalc/r3.mapcalc.html                   |     4 +-
 raster/r.mapcalc/xrand.c                           |     4 +-
 raster/r.neighbors/r.neighbors.html                |     9 +-
 raster/r.null/r.null.html                          |     4 +-
 raster/r.out.gdal/r.out.gdal.html                  |     5 +-
 raster/r.out.mpeg/r.out.mpeg.html                  |     4 +-
 raster/r.out.ppm/main.c                            |     4 +-
 raster/r.out.ppm3/main.c                           |     4 +-
 raster/r.param.scale/r.param.scale.html            |     4 +-
 raster/r.profile/r.profile.html                    |    82 +-
 raster/r.proj/main.c                               |    18 +-
 raster/r.random.cells/r.random.cells.html          |    12 +-
 raster/r.random/r.random.html                      |     4 +-
 raster/r.relief/r.relief.html                      |    43 +-
 raster/r.report/global.h                           |     4 +-
 raster/r.report/header.c                           |     8 +-
 raster/r.report/main.c                             |     4 +-
 raster/r.report/parse.c                            |    29 +-
 raster/r.resamp.bspline/crosscorr.c                |     2 +-
 raster/r.resamp.rst/main.c                         |     2 +-
 raster/r.ros/spot_dist.c                           |    18 +-
 raster/r.sim/simlib/input.c                        |     2 +-
 raster/r.slope.aspect/r.slope.aspect.html          |    39 +-
 raster/r.slope.aspect/r_slope_aspect_aspect.png    |   Bin 0 -> 145079 bytes
 raster/r.slope.aspect/r_slope_aspect_pcurv.png     |   Bin 0 -> 179415 bytes
 raster/r.slope.aspect/r_slope_aspect_slope.png     |   Bin 0 -> 107595 bytes
 raster/r.slope.aspect/r_slope_aspect_tcurv.png     |   Bin 0 -> 182325 bytes
 raster/r.spread/main.c                             |     2 +-
 raster/r.spread/pick_dist.c                        |     5 +
 raster/r.stream.extract/del_streams.c              |     4 +-
 raster/r.surf.contour/r.surf.contour.html          |     4 +-
 raster/r.surf.fractal/r.surf.fractal.html          |     4 +-
 raster/r.surf.idw/main.c                           |     9 +-
 raster/r.terraflow/main.cpp                        |    11 +-
 raster/r.texture/main.c                            |     2 +-
 raster/r.texture/r.texture.html                    |     4 +-
 raster/r.thin/io.c                                 |    27 +-
 raster/r.thin/main.c                               |     3 +-
 raster/r.thin/r.thin.html                          |    22 +-
 raster/r.thin/thin_lines.c                         |     5 +-
 raster/r.timestamp/r.timestamp.html                |     4 +-
 raster/r.to.rast3/r.to.rast3.html                  |    23 +-
 raster/r.to.vect/r.to.vect.html                    |     4 +-
 raster/r.walk/r.walk.html                          |    54 +-
 raster/r.watershed/front/main.c                    |     6 +-
 raster/r.watershed/front/r.watershed.html          |     5 +-
 raster/r.watershed/ram/do_cum.c                    |     2 +-
 raster/r.watershed/seg/init_vars.c                 |     2 +-
 raster/rasterintro.html                            |     5 +-
 raster3d/r3.timestamp/r3.timestamp.html            |     4 +-
 scripts/Makefile                                   |     1 +
 scripts/d.polar/d.polar.html                       |     4 +-
 scripts/d.rast.leg/d.rast.leg.py                   |    48 +-
 scripts/db.in.ogr/db.in.ogr.py                     |    21 +-
 scripts/g.extension/g.extension.html               |    47 +-
 scripts/g.extension/g.extension.py                 |    52 +-
 scripts/g.manual/g.manual.py                       |    24 +-
 scripts/i.oif/i.oif.html                           |     4 +-
 scripts/i.tasscap/i.tasscap.py                     |   119 +-
 scripts/r.pack/r.pack.html                         |     7 +-
 scripts/r.pack/r.pack.py                           |     2 +-
 scripts/r.tileset/r.tileset.html                   |     4 +-
 scripts/r.unpack/r.unpack.html                     |     5 +-
 scripts/r.unpack/r.unpack.py                       |    68 +-
 scripts/r3.in.xyz/r3.in.xyz.html                   |     4 +-
 scripts/v.in.e00/v.in.e00.py                       |    10 +-
 scripts/v.pack/v.pack.html                         |    18 +-
 scripts/v.pack/v.pack.py                           |     2 +-
 scripts/v.unpack/v.unpack.html                     |     5 +-
 scripts/v.unpack/v.unpack.py                       |     7 +-
 scripts/v.what.strds/Makefile                      |     7 +
 scripts/v.what.strds/testsuite/test_what_strds.py  |    70 +
 scripts/v.what.strds/v.what.strds.html             |    28 +
 scripts/v.what.strds/v.what.strds.py               |   233 +
 temporal/t.connect/t.connect.html                  |     4 +-
 temporal/t.rast.accdetect/t.rast.accdetect.html    |     4 +-
 temporal/t.rast.aggregate/t.rast.aggregate.html    |     5 +-
 temporal/t.rast.algebra/t.rast.algebra.html        |     5 +-
 temporal/t.rast.export/t.rast.export.html          |    10 +-
 temporal/t.rast.import/t.rast.import.html          |     7 +-
 temporal/t.rast.list/t.rast.list.html              |     5 +-
 temporal/t.rast.mapcalc/t.rast.mapcalc.html        |     5 +-
 temporal/t.rast.series/t.rast.series.html          |     4 +-
 temporal/t.vect.export/t.vect.export.html          |     7 +-
 temporal/t.vect.import/t.vect.import.html          |     8 +-
 testsuite/raster/rhemisphere.sh                    |     4 +-
 tools/grass_indent.sh                              |    18 +-
 translators.csv                                    |     2 +
 vector/v.buffer/main.c                             |     1 +
 vector/v.buffer/v.buffer.html                      |     4 +-
 vector/v.build.polylines/main.c                    |     4 +-
 vector/v.category/main.c                           |    28 +-
 vector/v.colors/main.c                             |     1 +
 vector/v.colors/write_rgb.c                        |     4 +-
 vector/v.edit/main.c                               |    34 +-
 vector/v.edit/select.c                             |     2 +-
 vector/v.external/list.c                           |     4 +-
 vector/v.extract/extract.c                         |     3 +
 vector/v.extract/main.c                            |     2 +-
 vector/v.in.ascii/points.c                         |     2 +-
 vector/v.in.db/main.c                              |     2 +-
 vector/v.in.lidar/main.c                           |     4 +-
 vector/v.in.ogr/geom.c                             |     5 +-
 vector/v.in.ogr/main.c                             |   143 +-
 vector/v.kernel/main.c                             |     8 +-
 vector/v.lidar.correction/main.c                   |     4 +-
 vector/v.lrs/v.lrs.segment/main.c                  |    12 +-
 vector/v.lrs/v.lrs.where/main.c                    |    10 +-
 vector/v.net.distance/main.c                       |     2 +-
 vector/v.net.visibility/v.net.visibility.html      |     4 +-
 vector/v.out.ascii/main.c                          |     2 +-
 vector/v.out.ogr/main.c                            |    28 +-
 vector/v.out.ogr/v.out.ogr.html                    |     5 +-
 vector/v.out.postgis/main.c                        |     4 +-
 vector/v.out.pov/main.c                            |     2 +-
 vector/v.overlay/area_area.c                       |     2 +-
 vector/v.overlay/main.c                            |     3 +
 vector/v.parallel/v.parallel.html                  |     4 +-
 vector/v.proj/main.c                               |    17 +-
 vector/v.qcount/v.qcount.html                      |     4 +-
 vector/v.random/main.c                             |    10 +-
 vector/v.reclass/v.reclass.html                    |     4 +-
 vector/v.sample/main.c                             |     2 +-
 vector/v.segment/main.c                            |    12 +-
 vector/v.segment/v.segment.html                    |     4 +-
 vector/v.select/args.c                             |     2 +
 vector/v.select/overlap.c                          |    58 +-
 vector/v.select/proto.h                            |     2 +-
 vector/v.select/select.c                           |    20 +-
 vector/v.surf.bspline/main.c                       |    30 +-
 vector/v.surf.bspline/v.surf.bspline.html          |     4 +-
 vector/v.surf.idw/main.c                           |     4 +-
 vector/v.surf.idw/read_sites.c                     |     4 +-
 vector/v.timestamp/v.timestamp.html                |     4 +-
 vector/v.to.3d/description.html                    |    48 -
 vector/v.to.3d/trans3.c                            |     2 +-
 vector/v.to.3d/v.to.3d.html                        |     7 +-
 vector/v.to.db/report.c                            |     7 +
 vector/v.to.db/v.to.db.html                        |    23 +-
 vector/v.to.points/main.c                          |     1 +
 vector/v.to.rast/v.to.rast.html                    |    59 +-
 vector/v.to.rast/v_to_rast_binning.png             |   Bin 0 -> 53520 bytes
 vector/v.vect.stats/main.c                         |    12 +-
 vector/v.vect.stats/v.vect.stats.html              |    86 +-
 vector/v.vol.rst/user3.c                           |     4 +-
 vector/v.vol.rst/v.vol.rst.html                    |    20 +-
 vector/v.voronoi/main.c                            |     3 +-
 vector/v.voronoi/sw_main.c                         |     4 +-
 vector/v.voronoi/v.voronoi.html                    |    25 +-
 vector/v.what.rast3/main.c                         |    16 +-
 vector/vectorintro.html                            |     9 +-
 395 files changed, 1009637 insertions(+), 1004176 deletions(-)

diff --cc debian/changelog
index 9b30d27,3d0c5cf..a35c5d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,28 +1,35 @@@
- grass (7.0.0-1~exp2~trusty3) trusty; urgency=medium
++grass (7.0.1-1~exp1~trusty) trusty; urgency=medium
 +
-   * Further fix
++  * Trusty build
++  * Use WX 2.8 python
 +
-  -- Johan Van de Wauw <johan.vandew...@gmail.com>  Tue, 24 Mar 2015 20:10:05 
+0100
++ -- Johan Van de Wauw <johan.vandew...@gmail.com>  Thu, 06 Aug 2015 21:34:15 
+0200
 +
- grass (7.0.0-1~exp2~trusty2) trusty; urgency=medium
+ grass (7.0.1-1~exp1) experimental; urgency=medium
  
-   * Fix wx2.8 usage 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Thu, 30 Jul 2015 23:45:54 +0200
+ 
+ grass (7.0.1~rc2-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Drop typo patches, applied upstream.
+   * Support alternative tarball extensions in watch file.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Thu, 23 Jul 2015 00:06:10 +0200
+ 
+ grass (7.0.1~rc1-1~exp2) experimental; urgency=medium
+ 
+   * Enable liblas support.
+     (closes: #781227)
+   * Require at least liblas 1.8.0-3 for boost dependencies.
+   * Change build dependency to liblas-c-dev for capi.
+   * Drop unused lintian overrides.
  
-  -- Johan Van de Wauw <johan.vandew...@gmail.com>  Mon, 23 Mar 2015 00:06:52 
+0100
+  -- Bas Couwenberg <sebas...@debian.org>  Sun, 05 Jul 2015 01:39:05 +0200
  
- grass (7.0.0-1~exp2~trusty) trusty; urgency=medium
+ grass (7.0.1~rc1-1~exp1) experimental; urgency=medium
  
    [ Bas Couwenberg ]
    * Use upstream grass startup script, and install custom x-grass7 as 
x-grass70.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/grass.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