[saga] 03/05: Remove libfire patch (handled through configure)

[Johan Van de Wauw]

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository saga.

commit 8613ff40b8a17f6082245deefcfa40139b2aacd1
Author: Johan Van de Wauw <johan at vandewauw.be>
Date:   Thu Feb 25 17:49:31 2016 +0100

    Remove libfire patch (handled through configure)
---
 .../0001-Remove-references-to-libfire.patch        | 36 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  6 +++-
 3 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/debian/patches/0001-Remove-references-to-libfire.patch b/debian/patches/0001-Remove-references-to-libfire.patch
deleted file mode 100644
index 7c6911f..0000000
--- a/debian/patches/0001-Remove-references-to-libfire.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Johan Van de Wauw <johan.vandewauw at gmail.com>
-Date: Tue, 15 Jul 2014 04:24:25 -0400
-Subject: Remove references to libfire
-
----
- configure.ac                       | 1 -
- src/modules/simulation/Makefile.am | 2 +-
- src/modules/simulation/Makefile.in | 2 +-
- 3 files changed, 2 insertions(+), 3 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -276,7 +276,6 @@
- 	src/modules/simulation/sim_cellular_automata/Makefile \
- 	src/modules/simulation/sim_ecosystems_hugget/Makefile \
- 	src/modules/simulation/sim_erosion/Makefile \
--	src/modules/simulation/sim_fire_spreading/Makefile \
- 	src/modules/simulation/sim_hydrology/Makefile \
- 	src/modules/simulation/sim_ihacres/Makefile \
- 	src/modules/simulation/sim_qm_of_esp/Makefile \
---- a/src/modules/simulation/Makefile.am
-+++ b/src/modules/simulation/Makefile.am
-@@ -1 +1 @@
--SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres sim_qm_of_esp sim_rivflow
-+SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres sim_qm_of_esp sim_rivflow
---- a/src/modules/simulation/Makefile.in
-+++ b/src/modules/simulation/Makefile.in
-@@ -322,7 +322,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres sim_qm_of_esp sim_rivflow
-+SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres sim_qm_of_esp sim_rivflow
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/debian/patches/series b/debian/patches/series
index 50e4ee3..9af153b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-Remove-references-to-libfire.patch
 0002-Use-debian-version-of-grib2.patch
 0003-Use-qhull-instead-of-triangle.patch
 0004-Use-debian-version-of-libsvm.patch
diff --git a/debian/rules b/debian/rules
index 84a96e1..701d1b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,11 @@ CFLAGS+=$(CPPFLAGS)
 	dh $@ --with python2 --with autoreconf --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- --prefix=/usr --enable-openmp --enable-python $(shell dpkg-buildflags --export=configure)
+	dh_auto_configure -- \
+           --prefix=/usr \
+           --enable-openmp \
+           --disable-libfire \
+           --enable-python $(shell dpkg-buildflags --export=configure)
 
 VERSION := $(shell grep '^AC_INIT' configure.ac | \
 	sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git