[eccodes] 22/106: First working build

[Alastair McKinstry]

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

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

commit b0fd0bfb9dde6ba8089a73a92872d6d7ce501b1e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jul 29 02:38:09 2016 +0100

    First working build
---
 debian/libeccodes0.install     |  4 ++--
 debian/python3-eccodes.install |  2 +-
 debian/rules                   | 20 ++++++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/libeccodes0.install b/debian/libeccodes0.install
index 27732d2..ce31bac 100644
--- a/debian/libeccodes0.install
+++ b/debian/libeccodes0.install
@@ -1,4 +1,4 @@
 usr/share/eccodes/samples
 usr/share/eccodes/definitions
-usr/lib/libeccodes_f90.so.*
-usr/lib/libeccodes.so.*
+usr/lib/*/libeccodes_f90.so.*
+usr/lib/*/libeccodes.so.*
diff --git a/debian/python3-eccodes.install b/debian/python3-eccodes.install
index b06a399..4606faa 100644
--- a/debian/python3-eccodes.install
+++ b/debian/python3-eccodes.install
@@ -1 +1 @@
-usr/lib/python3
+usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index 30affa3..3018030 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,13 @@ override_dh_auto_configure:
 	( cd ${BUILDDIR}/data ; tar axpf $(CURDIR)/../eccodes_$(UPSTREAM_VERSION).orig-data.tar.xz )
 
 override_dh_install:
+	# Move to multiarch dir
+	mkdir -p debian/tmp/${LIBDIR}
+	cp -a debian/tmp/usr/lib/lib* debian/tmp/${LIBDIR}
+	cp -a debian/tmp/usr/lib/pkgconfig debian/tmp/${LIBDIR}
 	for d in libeccodes_f90.so	libeccodes.so ; do \
-                cp debian/tmp/usr/lib/$$d.0 debian/tmp/usr/lib/$$d.0.0.0 ; \
-                chrpath -d debian/tmp/usr/lib/$$d.0.0.0 ; done
+                cp debian/tmp/$(LIBDIR)/$$d.0 debian/tmp/$(LIBDIR)/$$d.0.0.0 ; \
+                chrpath -d debian/tmp/$(LIBDIR)/$$d.0.0.0 ; done
 	chrpath -d ./debian/tmp/usr/lib/python*/site-packages/gribapi/_gribapi_swig.so
 	for d in debian/tmp/usr/bin/* ; do \
                 ( chrpath -d $$d || echo "Ignoring chrpath error for non-ELF $d" ); \
@@ -65,19 +69,19 @@ override_dh_install:
 	#
 	# Setup cmake files for magics++, metview, etc.
 	#
-	mkdir -p debian/libgrib-api-dev/$(LIBDIR)/cmake/grib_api
-	cp debian/tmp/usr/share/grib_api/cmake/* debian/libgrib-api-dev/$(LIBDIR)/cmake/grib_api
+	mkdir -p debian/libeccodes-dev/$(LIBDIR)/cmake/eccodes
+	cp debian/tmp/usr/share/eccodes/cmake/* debian/libeccodes-dev/$(LIBDIR)/cmake/eccodes
 	sed -e 's%$${_IMPORT_PREFIX}%/usr%' \
-	       < debian/tmp/usr/share/grib_api//cmake/grib_api-targets-release.cmake | \
+	       < debian/tmp/usr/share/eccodes/cmake/eccodes-targets-release.cmake | \
 	sed -e 's%-l${PY3VERSM} %%g' | \
 	sed -e 's%${LIBDIR}/libopenjpeg.so;%%' | sed -e 's%;${LIBDIR}/libpng.so%%g' \
-	      > debian/libgrib-api-dev/$(LIBDIR)/cmake/grib_api/grib_api-targets-release.cmake
+	      > debian/libeccodes-dev/$(LIBDIR)/cmake/eccodes/eccodes-targets-release.cmake
 	sed -e 's%;${LIBDIR}/libopenjpeg.so%%g' \
-	        < debian/tmp/usr/share/grib_api//cmake/grib_api-config.cmake | \
+	        < debian/tmp/usr/share/eccodes/cmake/eccodes-config.cmake | \
 	sed -e 's%-l${PY3VERSM} %%g' | \
 	sed -s 's%/usr/include/${PY3VERSM};%%g' | sed -e 's%/usr/include/python2.7;%%g' | \
 	sed -e 's%;${LIBDIR}/libpng.so%%g' \
-	        > debian/libgrib-api-dev/$(LIBDIR)/cmake/grib_api/grib_api-config.cmake
+	        > debian/libeccodes-dev/$(LIBDIR)/cmake/eccodes/grib_api-config.cmake
 
 
 override_dh_auto_clean:

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