This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit efd828a26a92834cd2879b0638c581dc10a30b6b
Author: Alastair McKinstry <mckins...@debian.org>
Date: Wed Oct 5 02:50:34 2016 +0100
Revert SOVERSION 12 -> 11, accidentally incremented in upstream
---
debian/control | 18 +++++++++---------
.../{libnetcdf-12.install => libnetcdf-11.install} | 0
debian/libnetcdf-11.lintian-overrides | 1 +
debian/libnetcdf-12.lintian-overrides | 1 -
...cdf-mpi-12.install => libnetcdf-mpi-11.install} | 0
debian/libnetcdf-mpi-11.lintian-overrides | 1 +
...cdf-mpi-12.symbols => libnetcdf-mpi-11.symbols} | 0
debian/libnetcdf-mpi-12.lintian-overrides | 1 -
...cdf-12.install => libnetcdf-pnetcdf-11.install} | 0
debian/libnetcdf-pnetcdf-11.lintian-overrides | 1 +
debian/libnetcdf-pnetcdf-12.lintian-overrides | 1 -
.../{libnetcdf12.symbols => libnetcdf11.symbols} | 2 +-
debian/rules | 22 ++++++++++++----------
13 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/debian/control b/debian/control
index fe97472..4a0bae6 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: Documentation for NetCDF
This package contains documentation for the NetCDF library in a
variety of formats.
-Package: libnetcdf-12
+Package: libnetcdf-11
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -60,7 +60,7 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
-Package: libnetcdf-mpi-12
+Package: libnetcdf-mpi-11
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -75,7 +75,7 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
-Package: libnetcdf-pnetcdf-12
+Package: libnetcdf-pnetcdf-11
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -93,7 +93,7 @@ Description: Interface for scientific data access to large
binary data
Package: libnetcdf-dev
Architecture: any
Section: libdevel
-Depends: libnetcdf-12 (= ${binary:Version}),
+Depends: libnetcdf-11 (= ${binary:Version}),
libhdf5-dev (>= 1.8.6-1~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
${misc:Depends}, pkg-config
@@ -115,7 +115,7 @@ Package: libnetcdf-mpi-dev
Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf-mpi-12 (= ${binary:Version}),
+ libnetcdf-mpi-11 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
pkg-config
Suggests: netcdf-bin, netcdf-doc
@@ -133,7 +133,7 @@ Package: libnetcdf-pnetcdf-dev
Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf-pnetcdf-12 (= ${binary:Version}),
+ libnetcdf-pnetcdf-11 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
pkg-config
Suggests: netcdf-bin, netcdf-doc
@@ -151,9 +151,9 @@ Package: netcdf-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libnetcdf-12 (= ${binary:Version}),
- libnetcdf-mpi-12 (= ${binary:Version}),
- libnetcdf-pnetcdf-12 (= ${binary:Version}),
+Depends: libnetcdf-11 (= ${binary:Version}),
+ libnetcdf-mpi-11 (= ${binary:Version}),
+ libnetcdf-pnetcdf-11 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: debugging symbols for NetCDF
diff --git a/debian/libnetcdf-12.install b/debian/libnetcdf-11.install
similarity index 100%
rename from debian/libnetcdf-12.install
rename to debian/libnetcdf-11.install
diff --git a/debian/libnetcdf-11.lintian-overrides
b/debian/libnetcdf-11.lintian-overrides
new file mode 100644
index 0000000..088215a
--- /dev/null
+++ b/debian/libnetcdf-11.lintian-overrides
@@ -0,0 +1 @@
+libnetcdf-11: package-name-doesnt-match-sonames libnetcdf11
diff --git a/debian/libnetcdf-12.lintian-overrides
b/debian/libnetcdf-12.lintian-overrides
deleted file mode 100644
index c856a76..0000000
--- a/debian/libnetcdf-12.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetcdf-12: package-name-doesnt-match-sonames libnetcdf12
diff --git a/debian/libnetcdf-mpi-12.install b/debian/libnetcdf-mpi-11.install
similarity index 100%
rename from debian/libnetcdf-mpi-12.install
rename to debian/libnetcdf-mpi-11.install
diff --git a/debian/libnetcdf-mpi-11.lintian-overrides
b/debian/libnetcdf-mpi-11.lintian-overrides
new file mode 100644
index 0000000..4f82348
--- /dev/null
+++ b/debian/libnetcdf-mpi-11.lintian-overrides
@@ -0,0 +1 @@
+libnetcdf-mpi-11: package-name-doesnt-match-sonames libnetcdf-mpi11
diff --git a/debian/libnetcdf-mpi-12.symbols b/debian/libnetcdf-mpi-11.symbols
similarity index 100%
rename from debian/libnetcdf-mpi-12.symbols
rename to debian/libnetcdf-mpi-11.symbols
diff --git a/debian/libnetcdf-mpi-12.lintian-overrides
b/debian/libnetcdf-mpi-12.lintian-overrides
deleted file mode 100644
index a6b326c..0000000
--- a/debian/libnetcdf-mpi-12.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetcdf-mpi-12: package-name-doesnt-match-sonames libnetcdf-mpi12
diff --git a/debian/libnetcdf-pnetcdf-12.install
b/debian/libnetcdf-pnetcdf-11.install
similarity index 100%
rename from debian/libnetcdf-pnetcdf-12.install
rename to debian/libnetcdf-pnetcdf-11.install
diff --git a/debian/libnetcdf-pnetcdf-11.lintian-overrides
b/debian/libnetcdf-pnetcdf-11.lintian-overrides
new file mode 100644
index 0000000..b72bfdb
--- /dev/null
+++ b/debian/libnetcdf-pnetcdf-11.lintian-overrides
@@ -0,0 +1 @@
+libnetcdf-pnetcdf-11: package-name-doesnt-match-sonames libnetcdf-pnetcdf11
diff --git a/debian/libnetcdf-pnetcdf-12.lintian-overrides
b/debian/libnetcdf-pnetcdf-12.lintian-overrides
deleted file mode 100644
index 891cf17..0000000
--- a/debian/libnetcdf-pnetcdf-12.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetcdf-pnetcdf-12: package-name-doesnt-match-sonames libnetcdf-pnetcdf12
diff --git a/debian/libnetcdf12.symbols b/debian/libnetcdf11.symbols
similarity index 99%
rename from debian/libnetcdf12.symbols
rename to debian/libnetcdf11.symbols
index dab690d..cad12c0 100644
--- a/debian/libnetcdf12.symbols
+++ b/debian/libnetcdf11.symbols
@@ -1,4 +1,4 @@
-libnetcdf.so.12 #PACKAGE# #MINVER#
+libnetcdf.so.11 #PACKAGE# #MINVER#
Cde2h@Base 4.3.3
Cdh2e@Base 4.3.3
DAPparse@Base 4.1.3
diff --git a/debian/rules b/debian/rules
index 064d12d..fc2aa1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,15 @@ LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
INCDIR:=/usr/include
UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version:
\(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+SO_MAJOR:=11
+SO_VERSION:=11.0.0
include /usr/share/mpi-default-dev/debian_defaults
MPI:=$(ARCH_DEFAULT_MPI_IMPL)
# Verbose test output
export VERBOSE=1
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
CFLAGS:= $(shell dpkg-buildflags --get CFLAGS)
@@ -89,31 +91,31 @@ override_dh_auto_install:
done
# Parallel versions
for d in mpi pnetcdf ; do \
- cp debian/tmp-$$d/$(LIBDIR)/libnetcdf_$$d.so.12.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.12.0.0 ; \
+ 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 ; \
sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
| grep -v "prefix=" \
>> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
- dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.12.0.0
$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
- dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.12.0.0
$(LIBDIR)/libnetcdf_$$d.so ; \
- dh_link -p libnetcdf-$$d-12 $(LIBDIR)/libnetcdf_$$d.so.12.0.0
$(LIBDIR)/libnetcdf_$$d.so.12 ; \
+ dh_link -p libnetcdf-$$d-dev
$(LIBDIR)/libnetcdf_$$d.so.$(SO_VERSION) $(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
+ dh_link -p libnetcdf-$$d-dev
$(LIBDIR)/libnetcdf_$$d.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_$$d.so ; \
+ dh_link -p libnetcdf-$$d-$(SO_MAJOR)
$(LIBDIR)/libnetcdf_$$d.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_$$d.so.$(SO_MAJOR)
; \
dh_link -p libnetcdf-$$d-dev $(LIBDIR)/netcdf/$$d
$(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.12.0.0
debian/tmp/$(LIBDIR)/libnetcdf_serial.so.12.0.0 ; \
+ 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.12.0.0
$(LIBDIR)/netcdf/serial/libnetcdf.so
- dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.12.0.0
$(LIBDIR)/libnetcdf_serial.so
- dh_link -p libnetcdf-12 $(LIBDIR)/libnetcdf_serial.so.12.0.0
$(LIBDIR)/libnetcdf_serial.so.12
- #dh_link -p libnetcdf-12 $(LIBDIR)/libnetcdf_serial.so.12.0.0
$(LIBDIR)/libnetcdf.so.12
+ 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-$(SO_MAJOR)
$(LIBDIR)/libnetcdf_serial.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
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
