[Git][debian-gis-team/gdal-grass][experimental] 3 commits: Drop GRASSTABLES_DIR rules, removed in GDAL 2.2.0.

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal-grass


Commits:
24254a38 by Bas Couwenberg at 2018-05-07T14:44:11+02:00
Drop GRASSTABLES_DIR rules, removed in GDAL 2.2.0.

- - - - -
6bb23f8c by Bas Couwenberg at 2018-05-07T14:44:29+02:00
Use dh_auto_install instead of make.

- - - - -
25f090ba by Bas Couwenberg at 2018-05-07T14:52:02+02:00
Strip trailing whitespace from changelog & control files.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libgdal-grass (2.3.0~rc1-1~exp2) UNRELEASED; urgency=medium
+
+  * Drop GRASSTABLES_DIR rules, removed in GDAL 2.2.0.
+  * Use dh_auto_install instead of make.
+  * Strip trailing whitespace from changelog & control files.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 May 2018 14:43:59 +0200
+
 libgdal-grass (2.3.0~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
@@ -613,4 +621,3 @@ libgdal-grass (1.2.6-1) unstable; urgency=low
   * Initial release (Closes: #248832)
 
  -- Steve Halasz <debian at adkgis.org>  Mon, 13 Jun 2005 13:00:27 -0400
-


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -31,4 +31,3 @@ Description: GRASS extension for the GDAL library
  provides access to GRASS data via GDAL.
  .
  This package provides the GDAL GRASS plugin.
-


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,6 @@ GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2))
 GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/'))
 GDAL=$(shell cat VERSION | cut -d. -f1,2)
 
-NJOBS := -j1
-ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-NJOBS := -j$(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-endif
-
 %:
 	dh $@ --with autoreconf --parallel
 
@@ -51,14 +46,7 @@ override_dh_auto_configure:
 	                  --with-postgres-includes=$(shell pg_config --includedir)
 
 override_dh_auto_install:
-	mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
-
-	$(MAKE) $(NJOBS) install \
-		AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins/$(GDAL) \
-		GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
-
-	# removes redundant stuff already installed by grass
-	rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)
+	dh_auto_install -- AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins/$(GDAL)
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/45bdac0159de8717e06ae28cc506e0df9f71892e...25f090bad8b20583a09de31df2a4a3267f559645

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/45bdac0159de8717e06ae28cc506e0df9f71892e...25f090bad8b20583a09de31df2a4a3267f559645
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180507/28f6746b/attachment-0001.html>