[pktools] 06/28: Switch buildsystem to CMake.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository pktools.

commit a2210a670a06b14b8c6f24f4ae2ea7fb06b36493
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue May 17 21:55:19 2016 +0200

    Switch buildsystem to CMake.
---
 debian/changelog                             |  1 +
 debian/control                               |  3 +--
 debian/patches/automake-subdir-objects.patch | 11 -----------
 debian/patches/series                        |  1 -
 debian/rules                                 |  7 +++----
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23e4a2e..fbab252 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pktools (2.6.7-1) UNRELEASED; urgency=medium
     - Add license & copyright for QGIS plugin source
     - Drop license & copyright for Autoconf files removed upstream
     - Add license & copyright for svm.{cpp,h}
+  * Switch buildsystem to CMake.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 17 May 2016 20:46:48 +0200
 
diff --git a/debian/control b/debian/control
index adcb762..ed0420d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
-               autotools-dev,
+               cmake,
                libgdal-dev (>= 1.10.0-0~),
                libgsl-dev | libgsl0-dev,
                libboost-dev,
diff --git a/debian/patches/automake-subdir-objects.patch b/debian/patches/automake-subdir-objects.patch
deleted file mode 100644
index 1a3710d..0000000
--- a/debian/patches/automake-subdir-objects.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Remain forward compatible with automake using subdir-objects.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-
---- a/src/apps/Makefile.am
-+++ b/src/apps/Makefile.am
-@@ -1,3 +1,5 @@
-+AUTOMAKE_OPTIONS = subdir-objects
-+
- AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base $(GDAL_CFLAGS) @AM_CXXFLAGS@
- AM_LDFLAGS = $(GSL_LIBS) $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la $(top_builddir)/src/imageclasses/libimageClasses.la $(top_builddir)/src/fileclasses/libfileClasses.la @AM_LDFLAGS@
- LDADD = $(GSL_LIBS) $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la $(top_builddir)/src/imageclasses/libimageClasses.la $(top_builddir)/src/fileclasses/libfileClasses.la
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e9e0975..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-automake-subdir-objects.patch
diff --git a/debian/rules b/debian/rules
index 98d9ca8..4addfe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,14 +14,13 @@ endif
 MANPAGES:=$(wildcard debian/man/*.*.xml)
 
 %:
-	dh $@ --buildsystem autoconf \
-	      --with autoreconf \
+	dh $@ --buildsystem cmake \
 	      --with pkgkde_symbolshelper \
 	      --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-fann \
-	                     --enable-las
+	dh_auto_configure -- -DBUILD_WITH_FANN=ON \
+	                     -DBUILD_WITH_LIBLAS=ON
 
 override_dh_clean:
 	dh_clean debian/man/*.1

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