[saga] 12/20: Reorder targets in order of execution.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Mar 4 20:29:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository saga.
commit 1e197d42f81587db0278cf89193bbebc5a637a15
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Mar 4 18:07:42 2016 +0100
Reorder targets in order of execution.
---
debian/rules | 42 ++++++++++++++++++------------------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/debian/rules b/debian/rules
index 3b9ad62..282c1cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,32 @@
#!/usr/bin/make -f
-CFLAGS+=$(CPPFLAGS)
+CFLAGS += $(CPPFLAGS)
+
+VERSION := $(shell grep '^AC_INIT' configure.ac | sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g')
+UPSTREAM_URL ?= $(shell uscan --dehs | sed -n 's/.*<upstream-url>\(.*\)<\/upstream-url>.*/\1/p')
+UPSTREAM_VERSION ?= $(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
+
+debian/% :: debian/%.in
+ sed -e 's/@VERSION@/$(VERSION)/' $< >$@
%:
dh $@ --with python2 --with autoreconf --parallel
+override_dh_clean:
+ dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1
+
override_dh_auto_configure:
dh_auto_configure -- \
--prefix=/usr \
- --enable-openmp \
--disable-libfire \
- --with-system_grib2c \
--disable-triangle \
- --enable-python $(shell dpkg-buildflags --export=configure)
-
-VERSION := $(shell grep '^AC_INIT' configure.ac | \
- sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g')
-UPSTREAM_URL ?=$(shell uscan --dehs | sed -n 's/.*<upstream-url>\(.*\)<\/upstream-url>.*/\1/p')
-UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
-
-debian/% :: debian/%.in
- sed -e 's/@VERSION@/$(VERSION)/' $< >$@
-
-override_dh_auto_build: man
- dh_auto_build
+ --enable-openmp \
+ --enable-python $(shell dpkg-buildflags --export=configure) \
+ --with-system_grib2c
-man:
- pod2man --section=1 --release=$(VERSION) --center " " debian/saga_gui.pod >saga_gui.1
- pod2man --section=1 --release=$(VERSION) --center " " debian/saga_cmd.pod >saga_cmd.1
+override_dh_auto_build:
+ pod2man --section=1 --release=$(VERSION) --center " " debian/saga_gui.pod > saga_gui.1
+ pod2man --section=1 --release=$(VERSION) --center " " debian/saga_cmd.pod > saga_cmd.1
dh_auto_build
override_dh_auto_install:
@@ -55,14 +54,9 @@ override_dh_auto_install:
override_dh_python2:
dh_python2 --no-guessing-versions
-override_dh_clean:
- dh_clean
- rm -f src/saga_core/saga_api/saga_api.py
- rm -f saga_cmd.1
- rm -f saga_gui.1
-
override_dh_makeshlibs:
dh_makeshlibs -Xpython-saga
get-orig-source:
uscan --verbose --force-download --repack --compression xz
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git
More information about the Pkg-grass-devel
mailing list