This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository saga.
commit 7cff3404ae6864360be3da0509b51a050ec596d0 Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Mon Jul 6 19:13:40 2015 +0200 Update patches - add patch for vigra include --- .../patches/0001-Remove-references-to-libfire.patch | 6 +++--- debian/patches/0005-0099-no-hdf5.patch | 20 ++++++++++++++++++++ debian/patches/0006-Fix-vigra-path.patch | 21 +++++++++++++++++++++ debian/patches/0099-no-hdf5.patch | 13 ------------- debian/patches/series | 3 ++- 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/debian/patches/0001-Remove-references-to-libfire.patch b/debian/patches/0001-Remove-references-to-libfire.patch index bce6076..986a7f2 100644 --- a/debian/patches/0001-Remove-references-to-libfire.patch +++ b/debian/patches/0001-Remove-references-to-libfire.patch @@ -9,7 +9,7 @@ Subject: Remove references to libfire 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index d419561..dff2da2 100755 +index 8c8b097..64c88ad 100755 --- a/configure.ac +++ b/configure.ac @@ -276,7 +276,6 @@ AC_OUTPUT(Makefile \ @@ -28,10 +28,10 @@ index 7ec461d..2f378e2 100644 -SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_fire_spreading sim_hydrology sim_ihacres +SUBDIRS = sim_cellular_automata sim_ecosystems_hugget sim_erosion sim_hydrology sim_ihacres diff --git a/src/modules/simulation/Makefile.in b/src/modules/simulation/Makefile.in -index c4823da..2f9e27c 100644 +index 65c9896..365d6e3 100644 --- a/src/modules/simulation/Makefile.in +++ b/src/modules/simulation/Makefile.in -@@ -236,7 +236,7 @@ target_alias = @target_alias@ +@@ -322,7 +322,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/debian/patches/0005-0099-no-hdf5.patch b/debian/patches/0005-0099-no-hdf5.patch new file mode 100644 index 0000000..f970725 --- /dev/null +++ b/debian/patches/0005-0099-no-hdf5.patch @@ -0,0 +1,20 @@ +From: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> +Date: Mon, 6 Jul 2015 19:11:12 +0200 +Subject: 0099-no-hdf5 + +--- + src/modules/imagery/imagery_vigra/vigra_random_forest.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp +index 7a2ab0b..ce9eece 100644 +--- a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp ++++ b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp +@@ -96,6 +96,7 @@ public: + #include <vigra/random_forest.hxx> + + #define WITH_HDF5 ++#undef WITH_HDF5 + #if defined(WITH_HDF5) + #include <vigra/random_forest_hdf5_impex.hxx> + #endif diff --git a/debian/patches/0006-Fix-vigra-path.patch b/debian/patches/0006-Fix-vigra-path.patch new file mode 100644 index 0000000..cee3314 --- /dev/null +++ b/debian/patches/0006-Fix-vigra-path.patch @@ -0,0 +1,21 @@ +From: Johan Van de Wauw <johan.vandew...@gmail.com> +Date: Mon, 6 Jul 2015 19:12:04 +0200 +Subject: Fix vigra path + +--- + src/modules/imagery/imagery_vigra/vigra_random_forest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp +index ce9eece..fa1c67e 100644 +--- a/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp ++++ b/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp +@@ -71,7 +71,7 @@ + //--------------------------------------------------------- + #if !defined(VIGRA_VERSION_MAJOR) || VIGRA_VERSION_MAJOR < 1 || VIGRA_VERSION_MINOR < 10 + // define some dummies +-#include <vigra\matrix.hxx> ++#include <vigra/matrix.hxx> + class CRandom_Forest + { + public: diff --git a/debian/patches/0099-no-hdf5.patch b/debian/patches/0099-no-hdf5.patch deleted file mode 100644 index fb48d79..0000000 --- a/debian/patches/0099-no-hdf5.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: Disable hdf5 to match libvigraimpex. -Author: Adam Conrad <adcon...@ubuntu.com> - ---- saga-2.1.4+dfsg.orig/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp -+++ saga-2.1.4+dfsg/src/modules/imagery/imagery_vigra/vigra_random_forest.cpp -@@ -92,6 +92,7 @@ int CViGrA_Random_ - #include <vigra/random_forest.hxx> - - #define WITH_HDF5 -+#undef WITH_HDF5 - #if defined(WITH_HDF5) - #include <vigra/random_forest_hdf5_impex.hxx> - #endif diff --git a/debian/patches/series b/debian/patches/series index caa9b69..75a96ba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,5 @@ 0002-Use-debian-version-of-grib2.patch 0003-Use-qhull-instead-of-triangle.patch 0004-Use-debian-version-of-libsvm.patch -0099-no-hdf5.patch +0005-0099-no-hdf5.patch +0006-Fix-vigra-path.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel