This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gdal.
commit 21f09f1e06ba6076403d2ce319e489f9d4550ac8 Author: Bas Couwenberg <[email protected]> Date: Fri Sep 9 21:00:55 2016 +0200 Revert "Disable armadillo support." This reverts commit c8504b352682d619aea9542ab3e8982cb51e8640. --- debian/changelog | 7 ------- debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7cc85e0..cac7272 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -gdal (2.1.1+dfsg-5) UNRELEASED; urgency=medium - - * Disable armadillo support. - armadillo 6.700.6 requires superlu < 4.4, but 5.2 is now in unstable. - - -- Bas Couwenberg <[email protected]> Fri, 09 Sep 2016 12:07:33 +0200 - gdal (2.1.1+dfsg-4) unstable; urgency=medium * Remove MySQL support. The dependencies via default-libmysqlclient-dev diff --git a/debian/control b/debian/control index a373bba..20503e8 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9), ant, autotools-dev, chrpath, -# libarmadillo-dev, + libarmadillo-dev, libcrypto++-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libdap-dev, @@ -94,7 +94,7 @@ Architecture: any Section: libdevel Depends: libgdal20 (= ${binary:Version}), libc6-dev, -# libarmadillo-dev, + libarmadillo-dev, libcrypto++-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libdap-dev, diff --git a/debian/rules b/debian/rules index 11c0774..c1a350a 100755 --- a/debian/rules +++ b/debian/rules @@ -88,7 +88,7 @@ override_dh_auto_configure: --with-rename-internal-libtiff-symbols=yes \ --with-rename-internal-libgeotiff-symbols=yes \ --with-threads \ - --with-armadillo=no \ + --with-armadillo=yes \ --with-cfitsio=no \ --with-cryptopp=yes \ --with-curl \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
