This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository grass.
commit e6d0e56f15798c390e63546e8eadc18bdd008745 Author: Bas Couwenberg <[email protected]> Date: Sun Nov 5 15:43:53 2017 +0100 Override dh_gencontrol to set GRASS ABI dependency with substvars. --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 200 ------------------------------------------------------ debian/rules | 6 +- 4 files changed, 7 insertions(+), 202 deletions(-) diff --git a/debian/changelog b/debian/changelog index d043df6..d8af29f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ grass (7.2.2-2) UNRELEASED; urgency=medium * Update spelling-errors.patch to fix additional typo. * Add lintian override for package-installs-java-bytecode false positive. * Bump Standards-Version to 4.1.1, no changes. + * Override dh_gencontrol to set GRASS ABI dependency with substvars. -- Bas Couwenberg <[email protected]> Fri, 06 Oct 2017 11:16:50 +0200 diff --git a/debian/control b/debian/control index 1b3309d..cacc0d5 100644 --- a/debian/control +++ b/debian/control @@ -98,7 +98,7 @@ Suggests: grass-dev, python-rpy2, python-termcolor Breaks: grass (<< 6.4.2-1~) -Provides: grass722 +Provides: ${grass:Provides} Replaces: grass (<< 6.4.2-1~) Description: GRASS GIS core components Commonly referred to as GRASS, this is a Geographic Information diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index 1d5754e..0000000 --- a/debian/control.in +++ /dev/null @@ -1,200 +0,0 @@ -Source: grass -Maintainer: Debian GIS Project <[email protected]> -Uploaders: Francesco Paolo Lovergine <[email protected]>, - Bas Couwenberg <[email protected]> -Section: science -Priority: optional -Build-Depends: autoconf2.13, - autotools-dev, - bison, - debhelper (>= 9), - dh-python, - doxygen, - fakeroot, - flex, - graphviz, - libblas-dev, - libbz2-dev, - libcairo2-dev, - libfftw3-dev, - libfreetype6-dev, - libgdal-dev (>= 2.0), - libgeos-dev, - libglu1-mesa-dev, - libjpeg-dev, - liblapack-dev, - liblas-c-dev (>= 1.8.0-8~), - libmotif-dev | lesstif2-dev, - default-libmysqlclient-dev, - libncurses5-dev, - libnetcdf-dev, - libpng-dev, - libpq-dev, - libproj-dev, - libreadline-dev, - libsqlite3-dev, - libtiff-dev, - libwxgtk3.0-dev, - libxmu-dev, - netcdf-bin, -# install optipng if compressing the PNG images in the programmers' manual -# optipng, -# proj-bin needed for nad2bin during config - proj-bin, - python, - python-dev, - python-numpy, - python-pil, - python-ply, - python-wxgtk3.0, - unixodbc-dev, - zlib1g-dev -Standards-Version: 4.1.1 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/grass.git -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git -Homepage: http://grass.osgeo.org/ - -Package: grass -Architecture: all -Section: metapackages -Depends: grass-core, - grass-gui, - ${misc:Depends} -Recommends: grass-doc -Suggests: grass-dev -Description: Geographic Resources Analysis Support System (GRASS GIS) - Commonly referred to as GRASS, this is a Geographic Information - System (GIS) used for geospatial data management and analysis, - image processing, graphics/map production, spatial modeling, and - visualization. GRASS is currently used in academic and commercial - settings around the world, as well as by many government agencies - and environmental consulting companies. - . - Install this virtual package to get a full GRASS system. - -Package: grass-core -Architecture: any -Depends: grass-doc, - ${shlibs:Depends}, - ${python:Depends}, - ${misc:Depends} -Recommends: gdal-bin, -# cs2cs used by m.proj, gdalinfo+gdal_translate used by a number of scripts - proj-bin -Suggests: grass-dev, - grass-gui, -# used by v.in.e00 - e00compr, - avce00, -# used by i.spectral - gnuplot, -# used by v.in.gpsbabel - gpsbabel, -# used by v.in.garmin - gpstrans, -# used by NVIZ, d.out.gpsdrive, r.out.mpeg - netpbm, -# used by v.kridge - python-rpy2, - python-termcolor -Breaks: grass (<< 6.4.2-1~) -Provides: grass@ABI@ -Replaces: grass (<< 6.4.2-1~) -Description: GRASS GIS core components - Commonly referred to as GRASS, this is a Geographic Information - System (GIS) used for geospatial data management and analysis, - image processing, graphics/map production, spatial modeling, and - visualization. GRASS is currently used in academic and commercial - settings around the world, as well as by many government agencies - and environmental consulting companies. - . - This package contains the core processing components, but not the GUI. - -Package: grass-gui -Architecture: any -Depends: grass-core, -# pyGL needed for wxNviz - python-opengl, - python-wxgtk3.0, - xterm | x-terminal-emulator, - ${python:Depends}, - ${misc:Depends} -Recommends: -# gs needed for wxPsmap PDF export - ghostscript, -# PIL needed for wxPsmap preview - python-pil, - python-matplotlib -Breaks: grass (<< 6.4.2-1~) -Replaces: grass (<< 6.4.2-1~) -Description: GRASS GIS graphical user interfaces - Commonly referred to as GRASS, this is a Geographic Information - System (GIS) used for geospatial data management and analysis, - image processing, graphics/map production, spatial modeling, and - visualization. GRASS is currently used in academic and commercial - settings around the world, as well as by many government agencies - and environmental consulting companies. - . - This package contains the GRASS GUIs. - -Package: grass-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Suggests: grass, - grass-dev-doc -Description: GRASS GIS user documentation - Commonly referred to as GRASS, this is a Geographic Information - System (GIS) used for geospatial data management and analysis, - image processing, graphics/map production, spatial modeling, and - visualization. GRASS is currently used in academic and commercial - settings around the world, as well as by many government agencies - and environmental consulting companies. - . - This package contains HTML documentation for the GRASS system. - -Package: grass-dev-doc -Section: doc -Architecture: all -Depends: libjs-jquery, - ${misc:Depends} -Suggests: grass -Description: GRASS GIS Programmers' Manual - Commonly referred to as GRASS, this is a Geographic Information - System (GIS) used for geospatial data management and analysis, - image processing, graphics/map production, spatial modeling, and - visualization. GRASS is currently used in academic and commercial - settings around the world, as well as by many government agencies - and environmental consulting companies. - . - This package contains the HTML version of the GRASS Programmers' Manual. - -Package: grass-dev -Section: devel -Architecture: any -Depends: grass-core (= ${binary:Version}), -# fakeroot used by patches/htmlgen-fakeroot; see changelog entry for 5.7.0+6.0.0beta2-2 - fakeroot, - libfreetype6-dev, - libgdal-dev, - libpq-dev, - libproj-dev, - python, - ${shlibs:Depends}, - ${misc:Depends} -# Subversion is needed by g.extension, a primary motivator for installing the grass-dev pkg -Recommends: subversion -Suggests: grass-dev-doc, - pkg-config -Description: GRASS GIS development files - Commonly referred to as GRASS, this is a Geographic Information - System (GIS) used for geospatial data management and analysis, - image processing, graphics/map production, spatial modeling, and - visualization. GRASS is currently used in academic and commercial - settings around the world, as well as by many government agencies - and environmental consulting companies. - . - This package contains the header files for developing with GRASS. - Install this package if you wish to develop software that manipulates - GRASS data sets or install addons using the g.extension module. - diff --git a/debian/rules b/debian/rules index 4eea291..7640719 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,7 @@ 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/-/') +GRASS_ABI=grass$(ABI) BASE_NAME=grass$(VERSION) PKG_NAME=grass @@ -266,4 +267,7 @@ override_dh_shlibdeps: override_dh_compress: dh_compress -XAUTHORS -.PHONY: templates +override_dh_gencontrol: + dh_gencontrol -- -Vgrass:Provides="$(GRASS_ABI)" + +.PHONY: templates versions -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
