[Git][debian-gis-team/gdal-grass][experimental] 2 commits: Don't use version plugins directory.

[Bas Couwenberg]

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


Commits:
bbe10a43 by Bas Couwenberg at 2018-05-07T22:10:07+02:00
Don't use version plugins directory.

- - - - -
dd793e1f by Bas Couwenberg at 2018-05-07T22:10:07+02:00
Set distribution to experimental.

- - - - -


3 changed files:

- debian/changelog
- debian/lintian-overrides
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libgdal-grass (2.3.0~rc1-1~exp2) UNRELEASED; urgency=medium
+libgdal-grass (2.3.0~rc1-1~exp2) experimental; 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.
+  * Don't use version plugins directory.
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 May 2018 14:43:59 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 May 2018 19:08:06 +0200
 
 libgdal-grass (2.3.0~rc1-1~exp1) experimental; urgency=medium
 


=====================================
debian/lintian-overrides
=====================================
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,4 +1,4 @@
 # The run path has been added to get GRASS internal library
-libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/gdal_GRASS.so /usr/lib/grass*/lib
-libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/ogr_GRASS.so /usr/lib/grass*/lib
+libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/gdal_GRASS.so /usr/lib/grass*/lib
+libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/ogr_GRASS.so /usr/lib/grass*/lib
 


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ endif
 PKGNAME=$(shell grep Package: debian/control | head -1 | cut -d' ' -f2)
 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)
 
 %:
 	dh $@ --with autoreconf --parallel
@@ -41,12 +40,12 @@ override_dh_auto_configure:
 
 	dh_auto_configure -- \
 	                  --prefix=/usr \
-	                  --with-autoload=/usr/lib/gdalplugins/$(GDAL) \
+	                  --with-autoload=/usr/lib/gdalplugins \
 	                  --with-grass=/usr/lib/$(GRASS) \
 	                  --with-postgres-includes=$(shell pg_config --includedir)
 
 override_dh_auto_install:
-	dh_auto_install -- AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins/$(GDAL)
+	dh_auto_install -- AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib



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

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/25f090bad8b20583a09de31df2a4a3267f559645...dd793e1f68b9fdd6e5abd7bfc24cb4a459b011da
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/e4f4088d/attachment-0001.html>