[normaliz] 01/01: Slightly Improved Imported Debian patch 2.12.2+ds-1

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository normaliz.

commit 74da51604127f7faede197b36508aa6d03c01329
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon May 4 02:34:06 2015 +0200

    Slightly Improved Imported Debian patch 2.12.2+ds-1
---
 debian/libnormaliz0-dev-common.install | 17 +----------------
 debian/rules                           |  7 +++++--
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/debian/libnormaliz0-dev-common.install b/debian/libnormaliz0-dev-common.install
index 9bc3190..b54cead 100644
--- a/debian/libnormaliz0-dev-common.install
+++ b/debian/libnormaliz0-dev-common.install
@@ -1,16 +1 @@
-## architecture INDEPendent packaging scheme
-## equivalent to ARCHitecture dependent scheme
-## usr/include/libnormaliz/*
-##
-source/libnormaliz/cone.h                      usr/include/libnormaliz/
-source/libnormaliz/cone_property.h             usr/include/libnormaliz/
-source/libnormaliz/general.h                   usr/include/libnormaliz/
-source/libnormaliz/HilbertSeries.h             usr/include/libnormaliz/
-source/libnormaliz/integer.h                   usr/include/libnormaliz/
-source/libnormaliz/libnormaliz.h               usr/include/libnormaliz/
-source/libnormaliz/map_operations.h            usr/include/libnormaliz/
-source/libnormaliz/matrix.h                    usr/include/libnormaliz/
-source/libnormaliz/my_omp.h                    usr/include/libnormaliz/
-source/libnormaliz/normaliz_exception.h        usr/include/libnormaliz/
-source/libnormaliz/sublattice_representation.h usr/include/libnormaliz/
-source/libnormaliz/vector_operations.h         usr/include/libnormaliz/
+usr/include/libnormaliz/*
diff --git a/debian/rules b/debian/rules
index 0a3c12b..fbd8ca2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,16 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export TOP_SRCDIR=$(CURDIR)
 
+CMAKE ?= /usr/bin/cmake
+
 default:
 	@uscan --no-conf --dehs --report || true
 
 %:
 	dh $@  --sourcedirectory=source --builddirectory=_build --parallel
 
-override_dh_auto_configure-arch:
-	dh_auto_configure -a -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+override_dh_auto_configure:
+	dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
 
 override_dh_auto_build-indep:
 	$(MAKE) -C doc pdf
@@ -22,6 +24,7 @@ override_dh_prep-arch:
 	$(MAKE) -f debian/adhoc/Makefile manpages
 
 override_dh_auto_install-indep:
+	cd _build && DESTDIR=$(CURDIR)/debian/tmp $(CMAKE) -DCOMPONENT=headers -P cmake_install.cmake
 	$(MAKE) -C doc install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C example install DESTDIR=$(CURDIR)/debian/tmp
 

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