[netcdf] 30/31: Drop _serial suffix on serial version

[Alastair McKinstry]

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

mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.

commit 2e4d1b57c1b888f5843691d6671a37324957e7ee
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Oct 10 17:22:46 2016 +0100

    Drop _serial suffix on serial version
---
 debian/rules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index cc7cbc4..efd54ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,16 +94,14 @@ override_dh_auto_install:
 		dh_link -p libnetcdf-$$d-dev /usr/include $(LIBDIR)/netcdf/$$d/include ; \
 		done
 	# Serial; one-off only
-	cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.$(SO_VERSION) debian/tmp/$(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) ; \
 	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
-	dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/netcdf/serial/libnetcdf.so 
-	dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_serial.so 
-	dh_link -p libnetcdf-$(SO_MAJOR) $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_serial.so.$(SO_MAJOR)
+	dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf.so.$(SO_VERSION) $(LIBDIR)/netcdf/serial/libnetcdf.so 
+	dh_link -p libnetcdf$(SO_MAJOR) $(LIBDIR)/libnetcdf.so.$(SO_VERSION) $(LIBDIR)/libnetcdf.so.$(SO_MAJOR)
 	$(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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git