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

martinl-guest pushed a commit to branch ubuntugis/trusty
in repository grass.

commit 2acc1f0d5795b2f8ce285e64056ffb717764175f
Merge: 78a0c84 84a8c04
Author: Martin Landa <landa.mar...@gmail.com>
Date:   Thu Sep 8 11:02:55 2016 +0200

    New upstream release candidate (7.0.5~rc1)

 CITING                                           |    28 +
 COPYING                                          |     8 +-
 ChangeLog_7.0.4RC1.gz                            |   Bin 827109 -> 0 bytes
 ChangeLog_7.0.5RC1.gz                            |   Bin 0 -> 834097 bytes
 INSTALL                                          |    56 +-
 Makefile                                         |     2 +-
 contributors_extra.csv                           |    46 +-
 db/databaseintro.html                            |     1 +
 debian/changelog                                 |    40 +-
 debian/control                                   |     4 +
 debian/copyright                                 |     5 +
 debian/patches/appstream.patch                   |     6 +-
 debian/patches/series                            |     1 +
 debian/patches/spelling-errors2.patch            |    91 +
 debian/rules                                     |    38 +-
 display/d.barscale/draw_scale.c                  |     4 +-
 display/d.histogram/bar.c                        |     3 +-
 display/d.mon/d.mon.html                         |     9 +-
 display/d.northarrow/draw_n_arrow.c              |     4 +-
 display/d.northarrow/main.c                      |     2 -
 display/d.vect.thematic/d.vect.thematic.html     |    52 +-
 display/d.vect.thematic/d_vect_thematic.png      |   Bin 116313 -> 168911 bytes
 display/d.vect.thematic/d_vect_thematic_leg.txt  |    16 +
 doc/howto_release.txt                            |    33 +-
 doc/infrastructure.txt                           |     6 +-
 doc/projectionintro.html                         |     1 +
 general/g.copy/g.copy.html                       |    29 +-
 general/g.proj/g.proj.html                       |    35 +-
 general/g.region/g.region.html                   |   265 +-
 general/g.region/printwindow.c                   |     2 +-
 general/g.version/Makefile                       |     2 +-
 general/g.version/main.c                         |    16 +-
 gui/icons/grass.appdata.xml                      |    33 +-
 gui/wxpython/README                              |     2 +-
 gui/wxpython/core/utils.py                       |     4 +-
 gui/wxpython/dbmgr/base.py                       |     2 +-
 gui/wxpython/dbmgr/dialogs.py                    |     2 +-
 gui/wxpython/docs/wxGUI.html                     |     4 +-
 gui/wxpython/gis_set.py                          |    11 +-
 gui/wxpython/gmodeler/frame.py                   |    21 +-
 gui/wxpython/gmodeler/model.py                   |    28 +-
 gui/wxpython/gui_core/forms.py                   |    23 +-
 gui/wxpython/gui_core/ghelp.py                   |    27 +
 gui/wxpython/gui_core/preferences.py             |    42 +-
 gui/wxpython/gui_core/query.py                   |     3 +-
 gui/wxpython/gui_core/wxlibplot.py               |  2556 +
 gui/wxpython/iclass/plots.py                     |     9 +-
 gui/wxpython/location_wizard/wizard.py           |     2 +-
 gui/wxpython/mapdisp/frame.py                    |     3 +-
 gui/wxpython/mapswipe/frame.py                   |     6 +-
 gui/wxpython/nviz/mapwindow.py                   |     2 +-
 gui/wxpython/tools/build_modules_xml.py          |     2 +-
 gui/wxpython/web_services/dialogs.py             |     2 +-
 gui/wxpython/wxplot/base.py                      |     6 +-
 gui/wxpython/wxplot/histogram.py                 |     6 +-
 gui/wxpython/wxplot/profile.py                   |     6 +-
 gui/wxpython/wxplot/scatter.py                   |     6 +-
 imagery/i.albedo/main.c                          |     5 +
 imagery/i.aster.toar/gain_aster.c                |   246 +-
 imagery/i.aster.toar/i.aster.toar.html           |    12 +-
 imagery/i.aster.toar/main.c                      |   196 +-
 imagery/i.aster.toar/rad2ref_aster.c             |    15 +-
 imagery/i.atcorr/README                          |     2 +-
 imagery/i.atcorr/i.atcorr.html                   |    51 +-
 imagery/i.atcorr/main.cpp                        |     4 +
 imagery/i.biomass/i.biomass.html                 |    14 +-
 imagery/i.eb.eta/eta.c                           |     2 +-
 imagery/i.eb.eta/i.eb.eta.html                   |     2 +-
 imagery/i.eb.evapfr/i.eb.evapfr.html             |    43 +-
 imagery/i.eb.evapfr/main.c                       |     3 +-
 imagery/i.eb.hsebal01/i.eb.hsebal01.html         |     2 +-
 imagery/i.eb.netrad/i.eb.netrad.html             |     2 +-
 imagery/i.eb.soilheatflux/i.eb.soilheatflux.html |     2 +-
 imagery/i.emissivity/i.emissivity.html           |    38 +-
 imagery/i.evapo.mh/i.evapo.mh.html               |     2 +-
 imagery/i.evapo.mh/mh_eto.c                      |     2 +-
 imagery/i.evapo.mh/mh_original.c                 |     2 +-
 imagery/i.evapo.mh/mh_samani.c                   |     2 +-
 imagery/i.evapo.pm/i.evapo.pm.html               |     2 +-
 imagery/i.evapo.pt/i.evapo.pt.html               |     2 +-
 imagery/i.evapo.pt/pt_daily_et.c                 |     2 +-
 imagery/i.evapo.time/i.evapo.time.html           |     2 +-
 imagery/i.fft/i.fft.html                         |     2 +-
 imagery/i.group/main.c                           |     4 +
 imagery/i.landsat.acca/i.landsat.acca.html       |     3 +-
 imagery/i.landsat.acca/main.c                    |     3 +-
 imagery/i.landsat.toar/main.c                    |     3 +-
 imagery/i.segment/create_isegs.c                 |     2 +-
 imagery/i.segment/i.segment.html                 |     6 +-
 imagery/i.vi/main.c                              |    24 +-
 imagery/imageryintro.html                        |    21 +-
 include/Make/Vars.make                           |     8 +-
 include/Makefile                                 |     5 +-
 include/VERSION                                  |     2 +-
 include/iostream/embuffer.h                      |     2 +-
 include/iostream/mm.h                            |    16 +-
 lib/db/dbmi_base/dbmscap.c                       |    37 +-
 lib/db/sqlp/sql.html                             |     6 +-
 lib/gis/datum.table                              |    27 +-
 lib/gis/datumtransform.table                     |    14 +-
 lib/gis/lrand48.c                                |     8 +-
 lib/gmath/blas_level_3.c                         |     4 +-
 lib/init/grass.py                                |    19 +-
 lib/init/helptext.html                           |    31 +-
 lib/iostream/mm.cpp                              |    20 +-
 lib/proj/Makefile                                |    14 +-
 lib/proj/README.txt                              |     4 +-
 lib/proj/convert.c                               |    23 +-
 lib/proj/coordinate_axis.csv                     |   231 -
 lib/proj/datum.c                                 |     2 +
 lib/proj/ellipse.c                               |    70 +-
 lib/proj/ellipsoid.csv                           |    53 -
 lib/proj/gcs.csv                                 |   430 -
 lib/proj/gcs.override.csv                        |    47 -
 lib/proj/gdal_datum.csv                          |   571 -
 lib/proj/gt_datum.csv                            |   229 -
 lib/proj/gt_ellips.csv                           |    24 -
 lib/proj/pcs.csv                                 |  3356 --
 lib/proj/pcs.override.csv                        |    14 -
 lib/proj/prime_meridian.csv                      |    14 -
 lib/proj/projop_wparm.csv                        |  1589 -
 lib/proj/stateplane.csv                          |   259 -
 lib/proj/unit_of_measure.csv                     |    79 -
 lib/python/ctypes/Makefile                       |     5 +-
 lib/python/script/raster.py                      |     7 +-
 lib/python/script/setup.py                       |     3 +-
 lib/raster/open.c                                |     6 +-
 lib/vector/Vlib/area.c                           |     2 +-
 lib/vector/dglib/BUGS                            |     2 +-
 lib/vector/vectorlib_topology.dox                |     2 +-
 locale/po/grasslibs_ar.po                        | 12638 ++--
 locale/po/grasslibs_cs.po                        | 13518 ++---
 locale/po/grasslibs_de.po                        | 13340 ++---
 locale/po/grasslibs_el.po                        | 12960 +++--
 locale/po/grasslibs_es.po                        | 14215 +++--
 locale/po/grasslibs_fi.po                        |  9462 +--
 locale/po/grasslibs_fr.po                        | 14175 ++---
 locale/po/grasslibs_it.po                        | 13783 ++---
 locale/po/grasslibs_ja.po                        | 13010 +++--
 locale/po/grasslibs_ko.po                        | 11580 ++--
 locale/po/grasslibs_lv.po                        | 12353 ++--
 locale/po/grasslibs_ml.po                        | 11180 ++--
 locale/po/grasslibs_pl.po                        | 13326 ++---
 locale/po/grasslibs_pt.po                        | 13430 ++---
 locale/po/grasslibs_pt_br.po                     | 12646 ++--
 locale/po/grasslibs_ro.po                        | 11031 ++--
 locale/po/grasslibs_ru.po                        | 13342 ++---
 locale/po/grasslibs_sl.po                        | 12666 ++--
 locale/po/grasslibs_th.po                        | 12974 +++--
 locale/po/grasslibs_tr.po                        | 12656 ++--
 locale/po/grasslibs_vi.po                        | 13276 ++---
 locale/po/grasslibs_zh.po                        | 12824 ++--
 locale/po/grassmods_ar.po                        | 59036 +++++++++----------
 locale/po/grassmods_cs.po                        | 61862 ++++++++++----------
 locale/po/grassmods_de.po                        | 64336 ++++++++++----------
 locale/po/grassmods_el.po                        | 52772 ++++++++---------
 locale/po/grassmods_es.po                        | 64276 +++++++++-----------
 locale/po/grassmods_fi.po                        | 44057 +++++++-------
 locale/po/grassmods_fr.po                        | 64678 +++++++++++----------
 locale/po/grassmods_it.po                        | 61383 +++++++++----------
 locale/po/grassmods_ja.po                        | 62678 ++++++++++----------
 locale/po/grassmods_ko.po                        | 52061 ++++++++---------
 locale/po/grassmods_lv.po                        | 58630 +++++++++----------
 locale/po/grassmods_pl.po                        | 60979 +++++++++----------
 locale/po/grassmods_pt.po                        | 61780 ++++++++++----------
 locale/po/grassmods_pt_br.po                     | 62112 ++++++++++----------
 locale/po/grassmods_ro.po                        | 48955 ++++++++--------
 locale/po/grassmods_ru.po                        | 63338 ++++++++++----------
 locale/po/grassmods_sl.po                        | 58902 +++++++++----------
 locale/po/grassmods_th.po                        | 62368 ++++++++++----------
 locale/po/grassmods_tr.po                        | 59104 +++++++++----------
 locale/po/grassmods_vi.po                        | 63490 ++++++++++----------
 locale/po/grassmods_zh.po                        | 59658 +++++++++----------
 locale/po/grasswxpy_cs.po                        | 26012 +++++----
 locale/po/grasswxpy_de.po                        | 27733 ++++-----
 locale/po/grasswxpy_el.po                        | 22980 ++++----
 locale/po/grasswxpy_es.po                        | 22960 ++++----
 locale/po/grasswxpy_fi.po                        | 19241 +++---
 locale/po/grasswxpy_fr.po                        | 27120 ++++-----
 locale/po/grasswxpy_id.po                        | 23726 ++++----
 locale/po/grasswxpy_it.po                        | 27084 ++++-----
 locale/po/grasswxpy_ja.po                        | 26589 ++++-----
 locale/po/grasswxpy_ko.po                        | 18259 +++---
 locale/po/grasswxpy_lv.po                        | 19057 +++---
 locale/po/grasswxpy_ml.po                        | 23084 ++++----
 locale/po/grasswxpy_pl.po                        | 26591 ++++-----
 locale/po/grasswxpy_pt.po                        | 26544 ++++-----
 locale/po/grasswxpy_pt_br.po                     | 25922 ++++-----
 locale/po/grasswxpy_ro.po                        | 23592 ++++----
 locale/po/grasswxpy_ru.po                        | 26796 ++++-----
 locale/po/grasswxpy_th.po                        | 24260 ++++----
 locale/po/grasswxpy_tr.po                        | 25675 ++++----
 locale/po/grasswxpy_vi.po                        | 27378 ++++-----
 locale/po/grasswxpy_zh.po                        | 21162 +++----
 misc/m.nviz.script/m.nviz.script.html            |    13 +-
 mswindows/osgeo4w/mklibs.sh                      |     2 +-
 mswindows/osgeo4w/setup.hint                     |     4 +-
 raster/r.in.gdal/main.c                          |     3 +-
 raster/r.in.gdal/r.in.gdal.html                  |    81 +-
 raster/r.in.xyz/r.in.xyz.html                    |    48 +-
 raster/r.mapcalc/map.c                           |     2 +-
 raster/r.mapcalc/r.mapcalc.html                  |    34 +-
 raster/r.neighbors/r.neighbors.html              |    25 +-
 raster/r.out.gdal/export_band.c                  |    46 +-
 raster/r.out.gdal/local_proto.h                  |     2 +-
 raster/r.out.gdal/main.c                         |    41 +-
 raster/r.out.pov/r.out.pov.html                  |     4 +-
 raster/r.param.scale/r.param.scale.html          |    20 +-
 raster/r.random.surface/r.random.surface.html    |     9 +-
 raster/r.reclass/r.reclass.html                  |    43 +-
 raster/r.relief/r.relief.html                    |     2 +-
 raster/r.resamp.bspline/r.resamp.bspline.html    |     5 +-
 raster/r.resamp.filter/main.c                    |     1 +
 raster/r.resamp.filter/r.resamp.filter.html      |     5 +-
 raster/r.resamp.interp/r.resamp.interp.html      |     5 +-
 raster/r.resamp.rst/r.resamp.rst.html            |     5 +-
 raster/r.resamp.stats/r.resamp.stats.html        |     5 +-
 raster/r.resample/r.resample.html                |    19 +-
 raster/r.rescale/r.rescale.html                  |     5 +-
 raster/r.sim/r.sim.sediment/main.c               |   164 +-
 raster/r.sim/r.sim.water/main.c                  |   159 +-
 raster/r.sim/simlib/Makefile                     |     5 +-
 raster/r.sim/simlib/hydro.c                      |    10 +-
 raster/r.sim/simlib/input.c                      |   251 +-
 raster/r.sim/simlib/observation_points.c         |    19 +-
 raster/r.sim/simlib/output.c                     |     4 +-
 raster/r.sim/simlib/simlib.h                     |    96 +
 raster/r.sim/simlib/waterglobs.h                 |    28 +-
 raster/r.sim/test/test.sh                        |    47 +
 raster/r.statistics/r.statistics.html            |    31 +-
 raster/r.stats.quantile/r.stats.quantile.html    |     9 +-
 raster/r.stats.zonal/r.stats.zonal.html          |    12 +-
 raster/r.stream.extract/r.stream.extract.html    |     2 +-
 raster/r.surf.contour/r.surf.contour.html        |     5 +-
 raster/r.surf.idw/r.surf.idw.html                |     5 +-
 raster/r.surf.random/r.surf.random.html          |     3 +-
 raster/r.tile/r.tile.html                        |     7 +-
 raster/r.timestamp/r.timestamp.html              |    22 +-
 raster/r.to.vect/areas.c                         |    20 +-
 raster/r.to.vect/areas_io.c                      |   137 +-
 raster/r.to.vect/global.h                        |     2 +
 raster/r.to.vect/lines.c                         |    10 +-
 raster/r.to.vect/lines_io.c                      |    81 +-
 raster/r.to.vect/main.c                          |    72 +-
 raster/r.to.vect/util.c                          |     7 +
 raster/r.topidx/r.topidx.html                    |     4 +-
 raster/r.topmodel/r.topmodel.html                |     4 +-
 raster/r.univar/r.univar.html                    |    56 +-
 raster/r.univar/r3.univar.html                   |    53 +-
 raster/r.volume/centroids.c                      |     2 +-
 raster/r.volume/local_proto.h                    |     2 +-
 raster/r.volume/main.c                           |     7 +-
 raster/r.water.outlet/r.water.outlet.html        |     6 +-
 raster/r.watershed/front/r.watershed.html        |    14 +-
 raster/rasterintro.html                          |    44 +-
 raster3d/r3.timestamp/main.c                     |     5 +-
 raster3d/r3.timestamp/r3.timestamp.html          |   137 +-
 raster3d/raster3dintro.html                      |     2 +-
 scripts/g.extension/g.extension.html             |    21 +-
 scripts/g.search.modules/g.search.modules.html   |     4 +-
 scripts/m.proj/m.proj.html                       |     6 +-
 scripts/r.colors.stddev/r.colors.stddev.html     |     2 +-
 scripts/r.import/r.import.html                   |    51 +-
 scripts/v.centroids/v.centroids.py               |     2 +-
 scripts/v.db.addcolumn/v.db.addcolumn.py         |     4 +-
 scripts/v.db.addtable/v.db.addtable.html         |     8 +-
 scripts/v.db.addtable/v.db.addtable.py           |     4 +-
 scripts/v.db.univar/v.db.univar.html             |    28 +-
 scripts/v.import/v.import.html                   |    39 +-
 scripts/v.krige/v.krige.html                     |    12 +-
 temporal/t.register/t.register.html              |     6 +-
 temporal/t.sample/t.sample.html                  |     6 +-
 temporal/t.vect.import/t.vect.import.html        |     4 +-
 translators.csv                                  |     2 +-
 vector/v.buffer/v.buffer.html                    |    17 +-
 vector/v.buffer/v_buffer_areas_int.png           |   Bin 0 -> 60097 bytes
 vector/v.db.select/main.c                        |     2 +-
 vector/v.distance/v.distance.html                |     6 +-
 vector/v.in.ogr/main.c                           |    36 +-
 vector/v.in.ogr/v.in.ogr.html                    |    50 +-
 vector/v.kernel/v.kernel.html                    |     5 +-
 vector/v.net/v.net.html                          |    14 +-
 vector/v.overlay/main.c                          |    10 +-
 vector/v.overlay/v.overlay.html                  |    65 +-
 vector/v.proj/v.proj.html                        |     6 +-
 vector/v.random/main.c                           |     1 +
 vector/v.random/v.random.html                    |   146 +-
 vector/v.random/vrandom_restricted_area.png      |   Bin 0 -> 54428 bytes
 vector/v.random/vrandom_restricted_attr.png      |   Bin 0 -> 52868 bytes
 vector/v.surf.bspline/v.surf.bspline.html        |     5 +-
 vector/v.surf.idw/v.surf.idw.html                |    53 +-
 vector/v.surf.rst/v.surf.rst.html                |     5 +-
 vector/v.timestamp/v.timestamp.html              |    95 +-
 vector/v.vect.stats/v.vect.stats.html            |     2 +-
 vector/v.vol.rst/user3.c                         |     1 -
 vector/vectorintro.html                          |     5 +-
 296 files changed, 1025676 insertions(+), 1027196 deletions(-)

diff --cc debian/changelog
index e017734,11b1b53..02ed317
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,36 +1,42 @@@
- grass (7.0.4~rc1-1~exp1~trusty1) trusty; urgency=medium
++grass (7.0.5~rc1-1~exp1~trusty) trusty; urgency=medium
++
++  * Rebuild for trusty.
++
++ -- Martin Landa <landa.mar...@gmail.com>  Thu, 08 Sep 2016 11:01:09 +0200
++
+ grass (7.0.5~rc1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Drop patches applied upstream, refresh remaining patches.
+   * Use SOURCE_DATE_EPOCH as random seed for reproducible builds.
+   * Update copyright file, add license & copyright for wxlibplot.py.
+   * Add patch to fix spelling errors.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Sun, 28 Aug 2016 04:19:36 +0200
+ 
+ grass (7.0.4-3) unstable; urgency=medium
+ 
+   * Add upstream patch to fix FTBFS with GCC 6.
+     (closes: #811886)
+   * Add patch to fix spelling errors.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Thu, 30 Jun 2016 23:21:27 +0200
+ 
+ grass (7.0.4-2) unstable; urgency=medium
+ 
+   * Add patches by Alexis Bienvenüe to make the build reproducible.
+     (closes: #825092)
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Tue, 24 May 2016 20:01:10 +0200
+ 
+ grass (7.0.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebas...@debian.org>  Sun, 01 May 2016 16:09:45 +0200
+ 
+ grass (7.0.4~rc1-1~exp1) experimental; urgency=medium
  
    * New upstream release candidate.
    * Add template for x-grass7.
diff --cc debian/control
index e12e77a,3dac4c5..1477f6e
--- a/debian/control
+++ b/debian/control
@@@ -106,7 -105,7 +106,11 @@@ Suggests: grass-doc
  Breaks: grass (<< 6.4.2-1~)
  Conflicts: grass70-core,
             grass7-core
++<<<<<<< HEAD
 +Provides: grass703-2,
++=======
+ Provides: grass705-1,
++>>>>>>> debian/7.0.5.rc1-1.exp1
            grass70-core,
            grass7-core
  Replaces: grass70-core,

-- 
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