[netcdf] 01/02: Drop SOVERSION patch, SONAME bump in RC1 was not required.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository netcdf.

commit 5a42a81b8dba1139d888a7afcefdb5958bb7927a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 15 12:39:01 2016 +0200

    Drop SOVERSION patch, SONAME bump in RC1 was not required.
---
 debian/changelog                                   |  6 +++++
 debian/control                                     |  6 ++---
 .../{libnetcdf12.install => libnetcdf11.install}   |  0
 .../{libnetcdf12.symbols => libnetcdf11.symbols}   |  2 +-
 debian/patches/series                              |  1 -
 debian/patches/soversion.patch                     | 28 ----------------------
 6 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f16271c..ec8758a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+netcdf (1:4.4.1~rc2-1~exp2) UNRELEASED; urgency=medium
+
+  * Drop SOVERSION patch, SONAME bump in RC1 was not required.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 15 May 2016 12:37:45 +0200
+
 netcdf (1:4.4.1~rc2-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/control b/debian/control
index d08c59b..92db36d 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Description: Documentation for NetCDF
  This package contains documentation for the NetCDF library in a
  variety of formats.
 
-Package: libnetcdf12
+Package: libnetcdf11
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -59,7 +59,7 @@ Description: Interface for scientific data access to large binary data
 Package: libnetcdf-dev
 Architecture: any
 Section: libdevel
-Depends: libnetcdf12 (= ${binary:Version}),
+Depends: libnetcdf11 (= ${binary:Version}),
          libhdf5-dev (>= 1.8.6-1~),
          libcurl4-gnutls-dev | libcurl-ssl-dev,
          ${misc:Depends}
@@ -82,7 +82,7 @@ Package: netcdf-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libnetcdf12 (= ${binary:Version}),
+Depends: libnetcdf11 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: gdb
 Description: debugging symbols for NetCDF
diff --git a/debian/libnetcdf12.install b/debian/libnetcdf11.install
similarity index 100%
rename from debian/libnetcdf12.install
rename to debian/libnetcdf11.install
diff --git a/debian/libnetcdf12.symbols b/debian/libnetcdf11.symbols
similarity index 99%
rename from debian/libnetcdf12.symbols
rename to debian/libnetcdf11.symbols
index 7ec2709..f5d5d96 100644
--- a/debian/libnetcdf12.symbols
+++ b/debian/libnetcdf11.symbols
@@ -1,4 +1,4 @@
-libnetcdf.so.12 #PACKAGE# #MINVER#
+libnetcdf.so.11 #PACKAGE# #MINVER#
  Cde2h at Base 4.3.3
  Cdh2e at Base 4.3.3
  DAPparse at Base 4.1.3
diff --git a/debian/patches/series b/debian/patches/series
index 6458356..dac6fb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ link-private.patch
 privacy-breach-logo.patch
 hdf5-library-path.patch
 tst_fileinfo-link-hdf5.patch
-soversion.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
deleted file mode 100644
index ed4c49f..0000000
--- a/debian/patches/soversion.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Revert SOVERSION decrement.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/Unidata/netcdf-c/issues/262
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,8 +31,8 @@ SET(NC_VERSION_NOTE "-rc2")
- SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE})
- SET(VERSION ${netCDF_VERSION})
- SET(NC_VERSION ${netCDF_VERSION})
--SET(netCDF_LIB_VERSION 11.2.0)
--SET(netCDF_SO_VERSION 11)
-+SET(netCDF_LIB_VERSION 12.0.0)
-+SET(netCDF_SO_VERSION 12)
- SET(PACKAGE_VERSION ${VERSION})
- 
- # Get system configuration, Use it to determine osname, os release, cpu. These
---- a/liblib/Makefile.am
-+++ b/liblib/Makefile.am
-@@ -18,7 +18,7 @@ lib_LTLIBRARIES = libnetcdf.la
- # for information regarding incrementing `-version-info`.
- ##
- 
--libnetcdf_la_LDFLAGS = -version-info 11:2:0 ${NOUNDEFINED}
-+libnetcdf_la_LDFLAGS = -version-info 12:0:0 ${NOUNDEFINED}
- 
- libnetcdf_la_CPPFLAGS = ${AM_CPPFLAGS}
- libnetcdf_la_LIBADD =

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