Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal-grass
Commits:
d5ad8409 by Bas Couwenberg at 2018-05-04T20:17:10+02:00
New upstream version 2.3.0~rc1
- - - - -
8fcb9f43 by Bas Couwenberg at 2018-05-04T20:17:12+02:00
Merge tag 'upstream/2.3.0_rc1' into experimental
Upstream version 2.3.0~rc1
- - - - -
30f19707 by Bas Couwenberg at 2018-05-04T20:17:53+02:00
New upstream release candidate.
- - - - -
8ca51226 by Bas Couwenberg at 2018-05-04T20:29:18+02:00
Enable parallel make.
- - - - -
45bdac01 by Bas Couwenberg at 2018-05-04T20:29:18+02:00
Set distribution to experimental.
- - - - -
2 changed files:
- debian/changelog
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libgdal-grass (2.3.0~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Enable parallel make.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 04 May 2018 20:18:15 +0200
+
libgdal-grass (2.3.0~beta1-1~exp1) experimental; urgency=medium
* New upstream beta release.
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,11 @@ 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
@@ -48,8 +53,9 @@ override_dh_auto_configure:
override_dh_auto_install:
mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
- $(MAKE) install
AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins/$(GDAL) \
-
GRASSTABLES_DIR=$(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)
View it on GitLab:
https://salsa.debian.org/debian-gis-team/gdal-grass/compare/4215c4e814b6d62515d91704127a465445499bf6...45bdac0159de8717e06ae28cc506e0df9f71892e
---
View it on GitLab:
https://salsa.debian.org/debian-gis-team/gdal-grass/compare/4215c4e814b6d62515d91704127a465445499bf6...45bdac0159de8717e06ae28cc506e0df9f71892e
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
