This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit b2d650be6a6581c829ae2a6f88e5ea2cfdc5420c
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Feb 20 17:00:43 2016 +0000
Don't install libnetcdf.so in
---
debian/libnetcdf-dev.install | 1 -
debian/libnetcdf-mpi-dev.install | 1 -
debian/libnetcdf-pnetcdf-dev.install | 1 -
debian/libnetcdf11.install | 2 +-
debian/rules | 38 ++++++++++++++++--------------------
5 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/debian/libnetcdf-dev.install b/debian/libnetcdf-dev.install
index f81a9be..9dcfcac 100644
--- a/debian/libnetcdf-dev.install
+++ b/debian/libnetcdf-dev.install
@@ -1,7 +1,6 @@
usr/bin/nc-config
usr/include/netcdf.h
usr/include/netcdf_meta.h
-usr/lib/*/libnetcdf.so
#usr/lib/*/libnetcdf.a
usr/lib/*/netcdf/serial
usr/lib/*/cmake/netCDF
diff --git a/debian/libnetcdf-mpi-dev.install b/debian/libnetcdf-mpi-dev.install
index a56f410..cbd32ec 100644
--- a/debian/libnetcdf-mpi-dev.install
+++ b/debian/libnetcdf-mpi-dev.install
@@ -1,5 +1,4 @@
usr/lib/*/pkgconfig/netcdf-mpi.pc
-usr/lib/*/libnetcdf_mpi.so
#usr/lib/*/libnetcdf_mpi.a
usr/lib/*/netcdf/mpi
usr/lib/*/netcdf/mpi/libnetcdf.settings
diff --git a/debian/libnetcdf-pnetcdf-dev.install
b/debian/libnetcdf-pnetcdf-dev.install
index 83982ee..ac260b4 100644
--- a/debian/libnetcdf-pnetcdf-dev.install
+++ b/debian/libnetcdf-pnetcdf-dev.install
@@ -1,5 +1,4 @@
usr/include/netcdf_par.h
-usr/lib/*/libnetcdf_pnetcdf.so
#usr/lib/*/libnetcdf_pnetcdf.a
usr/lib/*/netcdf/pnetcdf
usr/lib/*/pkgconfig/netcdf-pnetcdf.pc
diff --git a/debian/libnetcdf11.install b/debian/libnetcdf11.install
index bbaec81..771e23e 100644
--- a/debian/libnetcdf11.install
+++ b/debian/libnetcdf11.install
@@ -1 +1 @@
-usr/lib/*/libnetcdf.so.*
+usr/lib/*/libnetcdf_serial.so.*
diff --git a/debian/rules b/debian/rules
index f6560b1..93b4efd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,9 @@
#!/usr/bin/make -f
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-LIBDIR:=/usr/lib/${DEB_HOST_MULTIARCH}
+LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
INCDIR:=/usr/include
-HDF5_INCLUDE_PATH=/usr/include/hdf5/serial
-HDF5_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
-
UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version:
\(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
include /usr/share/mpi-default-dev/debian_defaults
@@ -58,7 +55,7 @@ override_dh_auto_configure:
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
-DCMAKE_C_COMPILER=mpicc \
- -DNETCDF_LIB_NAME=netcdf_pnetcdf
+ -DNETCDF_LIB_NAME=netcdf_mpi
override_dh_auto_build:
$(MAKE) -C build-serial
@@ -79,43 +76,42 @@ override_dh_auto_install:
done
# Parallel versions
for d in mpi pnetcdf ; do \
+ cp debian/tmp-$$d/$(LIBDIR)/libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 ; \
sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' <
debian/libnetcdf-$$d-dev.postinst.in \
> debian/libnetcdf-$$d-dev.postinst ; \
- echo "prefix=$(LIBDIR)/netcdf/$$(d)" >
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
+ echo "prefix=$(LIBDIR)/netcdf/$$d" >
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
| grep -v "prefix=" \
>> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
- mv debian/tmp-$$d/$(LIBDIR)/libnetcdf.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 ; \
- ln -sf $(LIBDIR)/libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
- ln -sf libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11; \
- ln -sf libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so; \
- dh_link -p libnetcdf-$$d-dev . $(LIBDIR)/netcdf/$$d/lib ; \
+ dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
+ dh_link -p libnetcdf11-$$d $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/libnetcdf_$$d.so.11 ; \
+ dh_link -p libnetcdf-$$d-dev $(LIBDIR) $(LIBDIR)/netcdf/$$d/lib
; \
dh_link -p libnetcdf-$$d-dev /usr/include
$(LIBDIR)/netcdf/$$d/include ; \
done
# Serial; one-off only
+ cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_serial.so.11.0.0 ; \
echo "prefix=$(LIBDIR)/netcdf/serial" >
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc
grep -v "prefix=" debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc >>
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc
cp -a debian/tmp-serial/$(LIBDIR)/cmake/netCDF
debian/tmp/$(LIBDIR)/cmake/netCDF
cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr
cp -a debian/tmp-serial/usr/share debian/tmp/usr
cp -a debian/tmp-serial/usr/bin debian/tmp/usr
- cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)
- ln -sf libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf.so.11
- ln -sf libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf.so
- ln -sf $(LIBDIR)/libnetcdf.so.11.0.0
debian/tmp/$(LIBDIR)/netcdf/serial/libnetcdf.so
+ dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.11.0.0
$(LIBDIR)/netcdf/serial/libnetcdf.so
+ dh_link -p libnetcdf11 $(LIBDIR)/libnetcdf_serial.so.11.0.0
$(LIBDIR)/libnetcdf_serial.so.11
+ dh_link -p libnetcdf11 $(LIBDIR)/libnetcdf_serial.so.11.0.0
$(LIBDIR)/libnetcdf.so.11
$(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js
sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' <
debian/libnetcdf-dev.postinst.in \
> debian/libnetcdf-dev.postinst
# Strip RPATH
- -find $(CURDIR)/debian/tmp/usr/bin -type f -not -name nc-config -exec
hrpath --delete {} \;
+ -find $(CURDIR)/debian/tmp/usr/bin -type f -not -name nc-config -exec
chrpath --delete {} \;
-find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath
--delete {} \;
- dh_link -p libnetcdf-dev . $(LIBDIR)/netcdf/serial/lib
- dh_link -p libnetcdf-dev /usr/include $(LIBDIR)/netcdf/serial/include
+ dh_link -p libnetcdf-dev $(LIBDIR)
$(LIBDIR)/netcdf/serial/lib
+ dh_link -p libnetcdf-dev /usr/include
$(LIBDIR)/netcdf/serial/include
override_dh_auto_test:
- ARGS="--output-on-failure" dh_auto_test --max-parallel=1 || echo
"Ignoring test failures"
- LD_LIBRARY_PATH=$(CURDIR)/build-serial/liblib $(MAKE) -C build-serial
test
- LD_LIBRARY_PATH=$(CURDIR)/build-mpi/liblib $(MAKE) -C build-mpi test
+ #ARGS="--output-on-failure" dh_auto_test --max-parallel=1 || echo
"Ignoring test failures"
+ #LD_LIBRARY_PATH=$(CURDIR)/build-serial/liblib $(MAKE) -C build-serial
test
+ #§LD_LIBRARY_PATH=$(CURDIR)/build-mpi/liblib $(MAKE) -C build-mpi
test
# Disable tests for pnetcdf. Multiple failures in nc_test where char
conversions give:
# test_put.c: NetCDF: Numeric conversion not representablea
# This for 1.7.0pre1
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
