[cminpack] 03/03: Update for new upstream version 1.3.6

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository cminpack.

commit 5a076c0ec3fcea84b75489d0fc00486d184b8a6d
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Feb 27 15:37:02 2017 +0100

    Update for new upstream version 1.3.6
---
 debian/changelog                                   |  3 ++-
 debian/patches/Link-to-math-lib.patch              | 27 ++++++++++++++++------
 ...ded-environment-when-building-the-test-su.patch |  2 +-
 debian/rules                                       |  2 +-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49bdb91..5b61e4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-cminpack (1.3.4-5) UNRELEASED; urgency=low
+cminpack (1.3.6-1) UNRELEASED; urgency=low
 
+  * New upstream version
   * Push standards-version to 3.9.8. Update VCS urls to https
   * Add Repository and Bug-Database to d/u/metadata
 
diff --git a/debian/patches/Link-to-math-lib.patch b/debian/patches/Link-to-math-lib.patch
index 42d03f9..9cb197a 100644
--- a/debian/patches/Link-to-math-lib.patch
+++ b/debian/patches/Link-to-math-lib.patch
@@ -4,18 +4,31 @@ Subject: Link to math lib
 
 Forwarded: Frederic Devernay
 ---
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
+ CMakeLists.txt | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7cd09bc..5e79b57 100644
+index b138275..e7c80d5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -57,6 +57,7 @@ set (cminpack_hdrs
+@@ -61,11 +61,8 @@ set (cminpack_srcs
+ set (cminpack_hdrs
      cminpack.h minpack.h)
  
- add_library (cminpack ${LIB_TYPE} ${cminpack_srcs})
+-add_library (cminpack ${cminpack_srcs})
+-
+-if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+-  TARGET_LINK_LIBRARIES(cminpack m)
+-endif()
++add_library (cminpack ${cminpack_srcs})
 +target_link_libraries(cminpack m)
  
- install (TARGETS cminpack 
-    LIBRARY DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library
+ # Link with a BLAS library if requested
+ if (USE_BLAS)
+@@ -94,4 +91,4 @@ endif ()
+ set_target_properties(cminpack PROPERTIES VERSION ${CMINPACK_VERSION} SOVERSION ${CMINPACK_SOVERSION})
+ 
+ add_subdirectory (cmake)
+-add_subdirectory (examples)
+\ No newline at end of file
++add_subdirectory (examples)
diff --git a/debian/patches/Use-system-provided-environment-when-building-the-test-su.patch b/debian/patches/Use-system-provided-environment-when-building-the-test-su.patch
index 08dc6a4..f2df2cf 100644
--- a/debian/patches/Use-system-provided-environment-when-building-the-test-su.patch
+++ b/debian/patches/Use-system-provided-environment-when-building-the-test-su.patch
@@ -7,7 +7,7 @@ Subject: Use system provided environment when building the test suite
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/examples/Makefile b/examples/Makefile
-index 31ea902..fb37b12 100644
+index 63d9781..9f2bf26 100644
 --- a/examples/Makefile
 +++ b/examples/Makefile
 @@ -10,10 +10,12 @@ F77=gfortran
diff --git a/debian/rules b/debian/rules
index 49caa6a..dc8ea3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
  -DUSE_FPIC:BOOL=ON \
  -DCMINPACK_LIB_INSTALL_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
- -DSHARED_LIBS:BOOL=ON \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
  -DBUILD_EXAMPLES:BOOL=OFF
 
 override_dh_auto_configure:

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