[gdal-grass] 05/11: Use minimal dh rules, enable parallel builds.
Bas Couwenberg
sebastic at xs4all.nl
Sun Mar 16 08:31:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository gdal-grass.
commit 2e9c661f5b01c39dec018d577a06dad691b380b0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Mar 9 02:43:59 2014 +0100
Use minimal dh rules, enable parallel builds.
---
debian/changelog | 1 +
debian/control | 3 ++-
debian/control.in | 3 ++-
debian/rules | 72 +++++++++++--------------------------------------------
4 files changed, 19 insertions(+), 60 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 94a85e9..fe62ff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libgdal-grass (1.10.1-2) UNRELEASED; urgency=low
* Add myself to Uploaders.
* Update watch file, also match gdal-1.10.x.
+ * Use minimal dh rules with autoreconf, enable parallel builds.
-- Bas Couwenberg <sebastic at xs4all.nl> Thu, 16 Jan 2014 00:02:08 +0100
diff --git a/debian/control b/debian/control
index b271d22..3921eaf 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 9),
pkg-config,
grass-dev (>= 6.4.0~rc5),
grass (>= 6.4.0~rc5),
- libproj-dev
+ libproj-dev,
+ dh-autoreconf
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/gdal-grass.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/gdal-grass.git
diff --git a/debian/control.in b/debian/control.in
index dd9c49b..07468ae 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 9),
pkg-config,
grass-dev (>= 6.4.0~rc5),
grass (>= 6.4.0~rc5),
- libproj-dev
+ libproj-dev,
+ dh-autoreconf
Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/gdal-grass.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/gdal-grass.git
diff --git a/debian/rules b/debian/rules
index 74e2090..2f9952e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
#!/usr/bin/make -f
# -*- makefile -*-
-#
-# Debian package by Alessandro Amici 2002-2003.
-# Maintained by DebianGis team since 2005.
-# Based on: GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -18,73 +14,33 @@ ifneq ($(shell gdal-config --version),$(shell cat VERSION))
$(error GDAL version and GDAL GRASS plugin version are not aligned. Please, upload a proper plugin source version.)
endif
-debian/control: debian/control.in
- sed -e 's/@GRASS_ABI@/$(GRASS_ABI)/' $< >$@
+%:
+ dh $@ --with autoreconf --parallel
-lintian-overrides: debian/$(PKGNAME).lintian-overrides
-debian/$(PKGNAME).lintian-overrides: debian/lintian-overrides.in
- sed -e 's/@GDAL@/$(GDAL)/' -e 's/@GRASS@/$(GRASS)/' -e 's/@PKGNAME@/$(PKGNAME)/' $< >$@
+override_dh_auto_configure:
+ sed -e 's/@GRASS_ABI@/$(GRASS_ABI)/' debian/control.in > debian/control
+
+ sed -e 's/@GDAL@/$(GDAL)/' -e 's/@GRASS@/$(GRASS)/' -e 's/@PKGNAME@/$(PKGNAME)/' debian/lintian-overrides.in > debian/$(PKGNAME).lintian-overrides
-config.status: debian/control lintian-overrides
- dh_testdir
-
@echo "Depending on $(GRASS)"
if [ `grep "$(GRASS_ABI)" debian/control|wc -l` -eq 0 ]; then \
- sed -e 's/@GRASS_ABI@/$(GRASS_ABI)/' debian/control.in >debian/control; \
+ sed -e 's/@GRASS_ABI@/$(GRASS_ABI)/' debian/control.in > debian/control; \
fi
- ./configure --prefix=/usr --with-grass=/usr/lib/$(GRASS) --with-autoload=/usr/lib/gdalplugins/$(GDAL)
-
-build-indep: build
-build-arch: build
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- [ ! -f $(CURDIR)/Makefile ] || $(MAKE) distclean
+ dh_auto_configure -- --prefix=/usr --with-grass=/usr/lib/$(GRASS) --with-autoload=/usr/lib/gdalplugins/$(GDAL)
+override_dh_clean:
dh_clean config.status
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
+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
+ GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
+
# removes redundant stuff already installed by grass
rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)
-binary-indep: build install
-# Do nothing
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs
- dh_lintian
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
+override_dh_shlibdeps:
dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary-indep binary install lintian-overrides build-arch build-indep
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git
More information about the Pkg-grass-devel
mailing list