[netcdf] 07/15: Undo flavor patch, not used.

[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 d74af1979231058b93b56872204f507fc98de1fb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jun 7 16:53:22 2014 +0100

    Undo flavor patch, not used.
---
 debian/netcdf-mpi.ver               | 4 ++--
 debian/patches/series               | 1 -
 debian/patches/version-script.patch | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/netcdf-mpi.ver b/debian/netcdf-mpi.ver
index ed1a50b..c79fb52 100644
--- a/debian/netcdf-mpi.ver
+++ b/debian/netcdf-mpi.ver
@@ -1,9 +1,9 @@
-/* Symbol versioning script for NetCDF (serial version)
+/* Symbol versioning script for NetCDF (mpi version)
  * Alastair McKinstry, <mckinstry at debian.org> 2014-06-05
  * Last-Updated: 2014-06-05
  */
 
-NETCDF_SERIAL_4.1.3 { 
+NETCDF_MPI_4.1.3 { 
     global:
         Cde2h;
         Cdh2e;
diff --git a/debian/patches/series b/debian/patches/series
index f15bde4..92e27ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 version-script.patch
-flavour-configure-option.patch
diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index 678214c..aa6842e 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -23,7 +23,7 @@ Index: netcdf-4.3.2/liblib/CMakeLists.txt
 +    IF (NOT LIBLIB_VERSION_SCRIPT)
 +       SET(LIBLIB_VERSION_SCRIPT "")
 +    ENDIF()
-+    SET_TARGET_PROPERTIES(netcdf PROPERTIES LINK_FLAGS -shared LIBLIB_VERSION_SCRIPT)
++    SET_TARGET_PROPERTIES(netcdf PROPERTIES LINK_FLAGS "-shared ${LIBLIB_VERSION_SCRIPT}")
    ENDIF()
  ENDIF()
  

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