[grass] 01/01: Rebuild 7.2.1~rc2 for xenial

[Martin Landa]

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

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

commit 5e389ad56883414a193e30f5172ef18e543f4d73
Merge: 61046d8 3a583c1
Author: Martin Landa <landa.martin at gmail.com>
Date:   Sun Apr 23 11:03:24 2017 +0200

    Rebuild 7.2.1~rc2 for xenial

 ChangeLog_7.2.1RC1.gz                       |  Bin 862811 -> 0 bytes
 ChangeLog_7.2.1RC2.gz                       |  Bin 0 -> 863398 bytes
 debian/changelog                            |   14 +
 debian/control                              |    2 +-
 debian/patches/series                       |    1 -
 debian/patches/spelling-errors.patch        |   16 -
 debian/rules                                |    7 +
 demolocation/PERMANENT/.bash_history        |   45 +
 demolocation/PERMANENT/.bashrc              |    9 +
 display/d.legend.vect/draw.c                |    6 -
 display/d.linegraph/d.linegraph.html        |    2 +-
 display/d.mon/d.mon.html                    |    2 +-
 display/d.text/main.c                       |  112 +-
 doc/howto_release.txt                       |    3 +-
 general/g.version/Makefile                  |    2 +-
 imagery/i.atcorr/iwave.cpp                  |  739 +--
 imagery/i.atcorr/sensors_csv/worldview2.csv |  752 +++
 include/VERSION                             |    2 +-
 lib/gis/parser_html.c                       |    2 +-
 lib/gis/rd_cellhd.c                         |   69 +-
 lib/vector/Vlib/build_ogr.c                 |    2 +-
 locale/po/grasslibs_pt.po                   | 2220 ++++----
 locale/po/grasslibs_pt_br.po                | 1870 +++----
 locale/po/grasslibs_sl.po                   |  660 +--
 locale/po/grassmods_pt.po                   | 7976 +++++++++++++-------------
 locale/po/grassmods_pt_br.po                | 8082 +++++++++++++--------------
 locale/po/grassmods_sl.po                   | 3310 +++++------
 misc/m.nviz.script/m.nviz.script.html       |    2 +-
 raster/r.in.lidar/r.in.lidar.html           |    2 +-
 raster/r.mapcalc/r3.mapcalc.html            |    2 +-
 raster/r.out.gdal/r.out.gdal.html           |    2 +-
 raster/r.sunhours/r.sunhours.html           |   22 +-
 raster3d/r3.in.lidar/r3.in.lidar.html       |    2 +-
 raster3d/r3.timestamp/r3.timestamp.html     |    2 +-
 scripts/m.proj/m.proj.html                  |   71 +-
 scripts/r.pack/r.pack.html                  |    2 +-
 scripts/v.what.vect/v.what.vect.html        |    2 +-
 vector/v.in.lidar/v.in.lidar.html           |    2 +-
 vector/v.in.pdal/v.in.pdal.html             |    2 +-
 vector/v.mkgrid/v.mkgrid.html               |    2 +-
 vector/v.overlay/v.overlay.html             |    2 +-
 vector/v.timestamp/v.timestamp.html         |    2 +-
 vector/v.vect.stats/v.vect.stats.html       |    2 +-
 43 files changed, 13428 insertions(+), 12598 deletions(-)

diff --cc debian/changelog
index 23680ef,274c3fd..efc1b06
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,11 +1,30 @@@
++grass (7.2.1~rc2-1~exp1~xenial1) xenial; urgency=medium
++
++  * Rebuild for xenial.
++
++ -- Martin Landa <landa.martin at gmail.com>  Sun, 23 Apr 2017 11:02:32 +0200
++
+ grass (7.2.1~rc2-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Disable PIE on Ubuntu where it's still problematic.
+   * Drop spelling-errors.patch, applied upstream.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Apr 2017 22:02:17 +0200
+ 
 +grass (7.2.1~rc1-1~exp1~xenial2) xenial; urgency=medium
 +
 +  * Disable PIE hardening flags.
 +    See https://lists.osgeo.org/pipermail/grass-dev/2017-April/084725.html
 +
 + -- Martin Landa <landa.martin at gmail.com>  Sun, 09 Apr 2017 10:44:43 +0200
 +
 +grass (7.2.1~rc1-1~exp1~xenial1) xenial; urgency=medium
 +
 +  * Rebuild for xenial.
 +
 + -- Martin Landa <landa.martin at gmail.com>  Sat, 08 Apr 2017 12:29:12 +0200
 +
  grass (7.2.1~rc1-1~exp1) experimental; urgency=medium
  
    * New upstream release candidate.
diff --cc debian/rules
index 7ca1642,4eea291..15df2e8
--- a/debian/rules
+++ b/debian/rules
@@@ -4,8 -4,15 +4,15 @@@
  #export DH_VERBOSE=1
  
  # Enable hardening build flags
 -export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
  
+ # Disable PIE on Ubuntu where it's still problematic
+ VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
+ 
+ ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
+ 	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+ endif
+ 
  VERSION=$(shell echo `head -2 $(CURDIR)/include/VERSION` | sed -e 's/ //')
  ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION` | sed -e 's/ //g' -e 's/RC/-/')
  BASE_NAME=grass$(VERSION)

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