[exodus] 39/48: remove disabled shared libs

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository exodus.

commit bd6a45c535238a1fd465e958a04dbfd13787c523
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 15 17:56:40 2013 +0000

    remove disabled shared libs
---
 debian/changelog               |  3 ++-
 debian/patches/soversion.patch | 37 +++++++++++++++++++++++++------------
 debian/rules                   |  6 +++---
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25c2c90..aff4724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 exodusii (6.02.dfsg.1-3) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release. Closes: #699919.
   * Standards-Version: 3.9.5
+  * Move arch-dep files from M-A: same. Closes: #728781.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 14 Dec 2013 14:34:55 +0000
 
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
index b63b81c..ed0e7ba 100644
--- a/debian/patches/soversion.patch
+++ b/debian/patches/soversion.patch
@@ -3,11 +3,11 @@ Description: Add SOVERSION to the shared libraries. Needed for Debian.
 Forwarded: no
 Last-Updated: 2011-10-11
 
-Index: exodusii-5.24.dfsg.1/exodus/cbind/CMakeLists.txt
+Index: exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt
 ===================================================================
---- exodusii-5.24.dfsg.1.orig/exodus/cbind/CMakeLists.txt	2013-06-16 12:42:13.000000000 +0100
-+++ exodusii-5.24.dfsg.1/exodus/cbind/CMakeLists.txt	2013-06-16 12:42:13.000000000 +0100
-@@ -287,6 +287,8 @@
+--- exodusii-6.02.dfsg.1.orig/exodus/cbind/CMakeLists.txt	2013-12-14 18:33:09.000000000 +0000
++++ exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt	2013-12-15 17:33:03.000000000 +0000
+@@ -284,6 +284,8 @@
    set_target_properties(exoIIv2c PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
  ENDIF(MSVC)
  
@@ -16,15 +16,28 @@ Index: exodusii-5.24.dfsg.1/exodus/cbind/CMakeLists.txt
  IF(EXODUS_LIBRARY_PROPERTIES)
    SET_TARGET_PROPERTIES(exoIIv2c PROPERTIES ${EXODUS_LIBRARY_PROPERTIES})
  ENDIF(EXODUS_LIBRARY_PROPERTIES)
-Index: exodusii-5.24.dfsg.1/nemesis/CMakeLists.txt
+Index: exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt
 ===================================================================
---- exodusii-5.24.dfsg.1.orig/nemesis/CMakeLists.txt	2013-06-16 12:42:13.000000000 +0100
-+++ exodusii-5.24.dfsg.1/nemesis/CMakeLists.txt	2013-06-16 12:42:52.000000000 +0100
-@@ -8,6 +8,7 @@
- SET(NEMESIS_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}")
- SET(HEADERS "ne_nemesisI.h")
+--- exodusii-6.02.dfsg.1.orig/nemesis/CMakeLists.txt	2013-12-14 18:33:09.000000000 +0000
++++ exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt	2013-12-15 17:33:47.000000000 +0000
+@@ -74,6 +74,7 @@
  
+ ADD_LIBRARY(nemesis ${SOURCES})
+ TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
 +set_target_properties(nemesis PROPERTIES VERSION 3.09.0 SOVERSION 3)
  
- find_path( NETCDF_INCLUDE_DIR netcdf.h
-    $ENV{ACCESS}/inc
+ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
+ TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
+Index: exodusii-6.02.dfsg.1/exodus/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/exodus/CMakeLists.txt	2013-12-14 18:33:09.000000000 +0000
++++ exodusii-6.02.dfsg.1/exodus/CMakeLists.txt	2013-12-15 17:55:46.000000000 +0000
+@@ -7,7 +7,7 @@
+ SET(EXODUSII_VERSION "${EXODUSII_VERSION_MAJOR}.${EXODUSII_VERSION_MINOR}")
+ SET(EXODUSII_VERSION_FULL "${EXODUSII_VERSION}.${EXODUSII_VERSION_PATCH}")
+ 
+-OPTION(BUILD_SHARED "Build the exodus libraries shared." OFF)
++# OPTION(BUILD_SHARED "Build the exodus libraries shared." ON)
+ 
+ IF(BUILD_SHARED)
+   SET(EXODUS_LIBRARY_TYPE SHARED)
diff --git a/debian/rules b/debian/rules
index 14ca1e1..2d987fd 100644
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Version numbers
 EX_SO_MAJOR=5
-EX_SO_MINOR=0
-EX_SO_PATCH=14
-EX_SONAME=libexoIIv2c.so.$(EX_SO_MAJOR)
+EX_SO_MINOR=14
+EX_SO_PATCH=0
+EX_SONAME:=libexoIIv2c.so.$(EX_SO_MAJOR)
 EX_SONAME_FULL=$(EX_SONAME).$(EX_SO_MINOR).$(EX_SO_PATCH)
 NE_SO_MAJOR=3
 NE_SO_MINOR=09

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/exodus.git