[emos] 03/04: * Now need libboost-test-dev optional package * Re-enable tests. * Fixup libemos-dev cmake files for metview to compile

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository emos.

commit bb9a354a06e3c77d4efc3024c902ad21a18c87d4
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Oct 24 16:08:47 2015 +0100

    * Now need libboost-test-dev optional package
    * Re-enable tests.
    * Fixup libemos-dev cmake files for metview to compile
---
 debian/changelog              |  5 ++++-
 debian/control                |  2 +-
 debian/libemos-bin.install    |  2 +-
 debian/libemos-dev.install.in |  6 +++---
 debian/libemos0d.install.in   |  2 +-
 debian/rules                  | 33 +++++++++++++++++++++++----------
 6 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c7bbc4..6dbf128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-emoslib (2:4.1.1-2) UNRELEASED; urgency=medium
+emoslib (2:4.1.1-2) experimental; urgency=medium
 
   * Change /usr/lib/*/cmake/Emos -> /usr/lib/*/cmake/libemos 
   * libemos-dev now depends on libemos-bin as cmake configs assume binaries
     are available.
+  * Now need libboost-test-dev optional package
+  * Re-enable tests.
+  * Fixup libemos-dev cmake files for metview to compile
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 21 Oct 2015 17:51:39 +0100
 
diff --git a/debian/control b/debian/control
index c887936..8a94e88 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>=9), gfortran, cmake, 
- libboost-dev (>= 1.47.0), chrpath,
+ libboost-dev (>= 1.47.0), libboost-test-dev, chrpath,
  libgrib-api-dev (>= 1.9.16~), libgrib-api-tools,
  libjasper-dev, libopenjpeg-dev, libpng12-dev, zlib1g-dev
 Standards-Version: 3.9.6
diff --git a/debian/libemos-bin.install b/debian/libemos-bin.install
index 70bce2a..e82dac3 100644
--- a/debian/libemos-bin.install
+++ b/debian/libemos-bin.install
@@ -1 +1 @@
-obj-*/bin/* /usr/bin
+bin/* /usr/bin
diff --git a/debian/libemos-dev.install.in b/debian/libemos-dev.install.in
index bad3bdd..2f19103 100644
--- a/debian/libemos-dev.install.in
+++ b/debian/libemos-dev.install.in
@@ -1,6 +1,6 @@
 pbio/*.h		usr/include/pbio
 gribex/*.h		usr/include/gribex
 interpolation/*.h	usr/include/interpolation
-usr/lib/*.a		usr/lib/@ARCH@
-debian/tmp/share/libemos/cmake/*	usr/lib/@ARCH@/cmake/libemos
-# usr/lib/*/pkgconfig
+lib/*.a		usr/lib/@ARCH@
+share/libemos/cmake/*	usr/lib/@ARCH@/cmake/libemos
+obj-*/*.pc  		usr/lib/@ARCH@/pkgconfig
diff --git a/debian/libemos0d.install.in b/debian/libemos0d.install.in
index f2090d2..baf9e33 100644
--- a/debian/libemos0d.install.in
+++ b/debian/libemos0d.install.in
@@ -1 +1 @@
-/usr/lib/*.0d	usr/lib/@ARCH@
+lib/*.0d	usr/lib/@ARCH@
diff --git a/debian/rules b/debian/rules
index 165cd0f..30509bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # The magic debhelper  rule
 %:
 	dh $@ --buildsystem=cmake
 
-DESTDIR:=$(shell pwd)/debian/tmp/usr
+DESTDIR:=$(shell pwd)/debian/tmp
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ARCH:=$(shell dpkg --print-architecture)
 AUTOGENERATED:= libemos-dev.install libemos-dev.links libemos0d.install
@@ -33,10 +33,8 @@ endif
 
 override_dh_auto_test:
 	# Need links for tests.
-	(cd bufrtables && ./links.sh)
-	# dh_auto_test
-	@echo "Tests temporarily disabled."
-	(cd bufrtables && ./clean.sh)
+	(cd bufrtables && sh ./links.sh)
+	dh_auto_test
 
 override_dh_auto_clean:
 	find bufrtables -type l -delete
@@ -45,6 +43,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		-DECBUILD_LOG_LEVEL=DEBUG \
 		-DCMAKE_INSTALL_PREFIX=${DESTDIR} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_SHARED_LIBS=ON \
@@ -53,12 +52,26 @@ override_dh_auto_configure:
 		-DBUILD_FLAGS=${BUILD_FLAGS} \
 		-DFPIC=${FPIC} \
 		-DINSTALL_LIBDIR=${LIBDIR} \
-		-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables
+		-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables \
+		-DTEST_BUFR_TABLES_PATH=${CURDIR}/bufrtables
 	for f in ${AUTOGENERATED} ; do \
 		sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
 		done
 
+override_dh_auto_build:
+	dh_auto_build
+	# Need to be installed into debian/tmp before tests
+	cd obj-* && $(MAKE) install
+
+# TODO: CHECK INTERPOL_TABLES_PATH is set correctly.		
+		# -DINTERPOL_TABLES_PATH=/usr/share/emos \
+
 override_dh_auto_install:
-	cd obj-* && cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR} -P cmake_install.cmake
-	cd ${DESTDIR}/share/libemos/tables/bufrtables && sh -x ./links.sh
-	dh_auto_install
+	cd obj-* && $(MAKE) install
+	(cd ${DESTDIR}/share/libemos/tables/bufrtables && sh ./links.sh)
+	dh_auto_install	
+	# Fix broken paths 
+	cat debian/tmp/share/libemos/cmake/libemos-targets-release.cmake | \
+		sed -e 's%$${_IMPORT_PREFIX}/bin%/usr/bin%' | \
+		sed -e 	's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' > debian/tmp/x
+	mv debian/tmp/x debian/tmp/share/libemos/cmake/libemos-targets-release.cmake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git