[gmt] 01/03: Use dh_auto_{clean, build, install} instead of custom commands.
Bas Couwenberg
sebastic at debian.org
Sat Nov 5 13:07:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gmt.
commit fa93d02fc79b3d3751f6a61e827e4a6bd009befb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Nov 5 11:16:05 2016 +0100
Use dh_auto_{clean,build,install} instead of custom commands.
---
debian/changelog | 6 ++++++
debian/rules | 12 ++----------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ccf61ba..646dd88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmt (5.3.1+dfsg-2) UNRELEASED; urgency=medium
+
+ * Use dh_auto_{clean,build,install} instead of custom commands.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 05 Nov 2016 11:16:03 +0100
+
gmt (5.3.1+dfsg-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/rules b/debian/rules
index c7a04e0..52429ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,6 @@ BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date
MANPAGES:=$(wildcard debian/man/*.*.xml)
BUILDDIR = $(CURDIR)/debian/build
-DESTDIR = $(CURDIR)/debian/tmp
CMAKE_OPTS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_FLAGS="-fstrict-aliasing $(CFLAGS)" \
@@ -39,17 +38,11 @@ CMAKE_OPTS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
override_dh_clean:
dh_clean debian/man/*.1
-override_dh_auto_clean:
- rm -rf $(BUILDDIR) $(DESTDIR)
- dh_auto_clean
-
override_dh_auto_configure:
- dh_auto_configure -B $(BUILDDIR) -- $(CMAKE_OPTS)
+ dh_auto_configure -- $(CMAKE_OPTS)
override_dh_auto_build-arch:
- mkdir $(BUILDDIR) || true
- cd $(BUILDDIR) && cmake $(CMAKE_OPTS) ../..
- $(MAKE) -C $(BUILDDIR) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ dh_auto_build -a
override_dh_auto_build-indep:
$(MAKE) -C $(BUILDDIR) docs_man docs_html
@@ -61,7 +54,6 @@ override_dh_auto_install:
mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
done
- DESTDIR=$(DESTDIR) $(MAKE) -C $(BUILDDIR) install
dh_auto_install
# Uncompress examples stuff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git
More information about the Pkg-grass-devel
mailing list