[silo-llnl] 80/96: Fix python3.

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 258add23ae608b0917c20aac09f75e8ddfd90f32
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 22:12:19 2014 +0100

    Fix python3.
---
 debian/libsilo-bin.install  |  5 ++++-
 debian/libsilo-dev.install  |  5 +++--
 debian/python3-silo.install |  2 +-
 debian/rules                | 18 +++++++++++-------
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/debian/libsilo-bin.install b/debian/libsilo-bin.install
index 4cb4bd3..4a50501 100644
--- a/debian/libsilo-bin.install
+++ b/debian/libsilo-bin.install
@@ -1 +1,4 @@
-/usr/bin/*
+tools/browser/browser /usr/bin
+tools/browser/silodiff	/usr/bin
+tools/browser/silofile	/usr/bin
+tools/silock/silock	/usr/bin
diff --git a/debian/libsilo-dev.install b/debian/libsilo-dev.install
index b4089fa..94f1411 100644
--- a/debian/libsilo-dev.install
+++ b/debian/libsilo-dev.install
@@ -1,2 +1,3 @@
-usr/lib/*/libsiloh5.a	
-usr/include/*
+src/silo/silo.inc 	/usr/include
+src/silo/silo.h		/usr/include
+src/silo/pmpio.h	/usr/include
diff --git a/debian/python3-silo.install b/debian/python3-silo.install
index 097a7e8..fef6392 100644
--- a/debian/python3-silo.install
+++ b/debian/python3-silo.install
@@ -1 +1 @@
-/usr/lib/python3
+/usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index a846663..a109bf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ endif
 
 # QT version 4 or 5
 QT:=qt5
-QT_INCLUDES:="-I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets"
+QT_INCLUDES:=-I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets
 
 DEFAULT_PYTHON:=`py3versions -d`
 PYVERS:= `pyversions -s`
@@ -32,11 +32,10 @@ LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_autoreconf:
 	libtoolize -c -f
-	dh_autoreconf
+	dh_autoreconf --as-needed
 
 # Note: Since QT headers now include C++ features, configure must be called with g++ as the C compiler.
 # But use $(CC) as the C compiler later when actually building.
-# -Wl,--as-needed removed from LDFLAGS for the moment.
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -44,7 +43,7 @@ override_dh_auto_configure:
 		--with-hdf5=/usr/include,/usr/lib \
 		--with-Qt-bin=$(QT_BINDIR) --with-Qt-include-dir=/usr/include/$(QT) -with-Qt-lib=Qt5Widgets \
 		CC=$(CXX) CXX=$(CXX) CFLAGS="$(CFLAGS) -fPIC " CXXFLAGS="$(CXXFLAGS) -fPIC " \
-		LIBS=" -lQt5Core " LDFLAGS="$(LDFLAGS)" \
+		LIBS=" -lQt5Core " LDFLAGS="$(LDFLAGS) -Wl,--as-needed " \
 		CPPFLAGS=" $(QT_INCLUDES) -I$(MPI_INC) $(CPPFLAGS)"  
 
 # Iterate over some directories to avoid stepping into tools/silex, which doesn't build.
@@ -63,12 +62,17 @@ override_dh_auto_test:
                 $(MAKE) -C $$d check; done
 	
 override_dh_auto_install:
-	# move the python modules to where dh_pysupport will spot them ...
+	# move the python modules to where dh_python* will spot them ...
 	set -e; for p in $(PYVERS) $(PY3VERS); do \
-		mkdir -p debian/python-silo/usr/lib/$$p/site-packages ; \
+		mkdir -p debian/tmp/usr/lib/$$p/site-packages ; \
 		chrpath -d debian/Silo.so.$$p ; \
-		cp debian/Silo.so.$$p debian/python-silo/usr/lib/$$p/site-packages/Silo.so ; \
+		cp debian/Silo.so.$$p debian/tmp/usr/lib/$$p/site-packages/Silo.so ; \
 	done
+	$(MAKE) -C src install prefix=`pwd`/debian/tmp
+	dh_install
+	# cp src/.libs/libsiloh5.a debian/libsilo-dev/$(LIBDIR)
+	mkdir -p debian/libsiloh5-0/$(LIBDIR)
+	mv debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libsiloh5.so.0.0.0 debian/libsiloh5-0/$(LIBDIR)
 	dh_link -p libsiloh5-0 $(LIBDIR)/libsiloh5.so.0.0.0 $(LIBDIR)/libsiloh5.so.0
 	dh_link -p libsilo-dev $(LIBDIR)/libsiloh5.so.0.0.0 $(LIBDIR)/libsiloh5.so
 	mkdir -p debian/libsilo-dev/$(LIBDIR)/pkgconfig

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