[cminpack] 10/19: update cminpack

Tue May 13 10:34:53 UTC 2014

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

olebole-guest pushed a commit to branch debian
in repository cminpack.

commit f75e897b3a0d929d593135b46a7934ab93b671d8
Author: malat <malat at 7ca82aff-d165-4cda-a4f1-7f280d66a853>
Date:   Wed Apr 11 16:35:33 2012 +0000

    update cminpack
    
    git-svn-id: svn://svn.debian.org/debian-science/packages/cminpack/trunk@44698 7ca82aff-d165-4cda-a4f1-7f280d66a853
---
 debian/changelog                |  5 +++--
 debian/cminpack-doc.doc-base    | 27 +++++++++++++++++++++++++++
 debian/cminpack-doc.docs        |  1 +
 debian/control                  | 17 +++++++++++++++++
 debian/libcminpack-dev.manpages |  1 +
 debian/patches/addlibmath.patch | 17 +++++++++++++++++
 debian/patches/multiarch.patch  | 16 +++++++++++-----
 debian/patches/series           |  1 +
 8 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8351caa..5814894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-cminpack (1.1.4-2) UNRELEASED; urgency=low
+cminpack (1.1.4-2) unstable; urgency=low
 
   * Use my @d.o alias
   * Remove DMUA flag
   * Make multiarch
   * Use hardening flags
+  * Make sure to link to math lib
 
- -- Mathieu Malaterre <malat at debian.org>  Wed, 11 Apr 2012 17:51:11 +0200
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 11 Apr 2012 18:35:17 +0200
 
 cminpack (1.1.4-1) unstable; urgency=low
 
diff --git a/debian/cminpack-doc.doc-base b/debian/cminpack-doc.doc-base
new file mode 100644
index 0000000..d18b8ee
--- /dev/null
+++ b/debian/cminpack-doc.doc-base
@@ -0,0 +1,27 @@
+Document: cminpack-doc
+Title: cminpack Library Users Manual
+Author: Frédéric Devern
+Abstract: This is the official description of Minpack, from the original ReadMe file:
+ Minpack includes software for solving nonlinear equations and nonlinear least
+ squares problems. Five algorithmic paths each include a core subroutine and an
+ easy-to-use driver. The algorithms proceed either from an analytic
+ specification of the Jacobian matrix or directly from the problem functions.
+ The paths include facilities for systems of equations with a banded Jacobian
+ matrix, for least squares problems with a large amount of data, and for
+ checking the consistency of the Jacobian matrix with the functions.
+ .
+ The original authors of the FORTRAN version are Jorge More', Burt Garbow, and
+ Ken Hillstrom from Argonne National Laboratory, and the code can be obtained
+ from Netlib.
+ .
+ Minpack is probably the best open-source implementation of the
+ Levenberg-Marquardt algorithm (in fact, it is even better, since it adds to L-M
+ automatic variables scaling). There is another open-source L-M implementation
+ in C/C++, levmar by Manolis Lourakis, but unfortunately is is released under
+ the GPL, which restricts its inclusion in commercial software. Minpack is
+ licensed under a BSD-like license (available in the distribution).
+Section: Science/Data Analysis
+
+Format: HTML
+Index: /usr/share/doc/cminpack-doc/index.html
+Files: /usr/share/doc/cminpack-doc/*.html
diff --git a/debian/cminpack-doc.docs b/debian/cminpack-doc.docs
new file mode 100644
index 0000000..1776ad4
--- /dev/null
+++ b/debian/cminpack-doc.docs
@@ -0,0 +1 @@
+doc/*.html
diff --git a/debian/control b/debian/control
index 9e21eba..0817a7f 100644
--- a/debian/control
+++ b/debian/control
@@ -42,3 +42,20 @@ Description: Nonlinear equations and nonlinear least squares problems - runtime
  This is the C re-write of the original fortran minpack implementation.
  .
  This package contains the libraries needed to run cminpack applications.
+
+Package: cminpack-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Nonlinear equations and nonlinear least squares problems - runtime
+ Minpack includes software for solving nonlinear equations and nonlinear least
+ squares problems. Five algorithmic paths each include a core subroutine and an
+ easy-to-use driver. The algorithms proceed either from an analytic
+ specification of the Jacobian matrix or directly from the problem functions.
+ The paths include facilities for systems of equations with a banded Jacobian
+ matrix, for least squares problems with a large amount of data, and for
+ checking the consistency of the Jacobian matrix with the functions.
+ .
+ This is the C re-write of the original fortran minpack implementation.
+ .
+ This package contains documentation files for cminpack.
diff --git a/debian/libcminpack-dev.manpages b/debian/libcminpack-dev.manpages
new file mode 100644
index 0000000..abc4b13
--- /dev/null
+++ b/debian/libcminpack-dev.manpages
@@ -0,0 +1 @@
+doc/*.3
diff --git a/debian/patches/addlibmath.patch b/debian/patches/addlibmath.patch
new file mode 100644
index 0000000..422afe8
--- /dev/null
+++ b/debian/patches/addlibmath.patch
@@ -0,0 +1,17 @@
+Description: need to link to math lib
+Forwarded: Frederic Devernay
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2012-04-11
+
+Index: cminpack-1.1.4/CMakeLists.txt
+===================================================================
+--- cminpack-1.1.4.orig/CMakeLists.txt	2012-04-11 18:22:10.000000000 +0200
++++ cminpack-1.1.4/CMakeLists.txt	2012-04-11 18:22:20.000000000 +0200
+@@ -56,6 +56,7 @@
+     cminpack.h minpack.h)
+ 
+ add_library (cminpack ${LIB_TYPE} ${cminpack_srcs})
++target_link_libraries(cminpack m)
+ 
+ install (TARGETS cminpack 
+    LIBRARY DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
index 30284cb..9a445f8 100644
--- a/debian/patches/multiarch.patch
+++ b/debian/patches/multiarch.patch
@@ -5,15 +5,21 @@ Last-Update: 2012-04-11
 
 Index: cminpack-1.1.4/cmake/cminpack_utils.cmake
 ===================================================================
---- cminpack-1.1.4.orig/cmake/cminpack_utils.cmake	2012-04-11 18:01:36.000000000 +0200
-+++ cminpack-1.1.4/cmake/cminpack_utils.cmake	2012-04-11 18:01:41.000000000 +0200
-@@ -5,7 +5,9 @@
+--- cminpack-1.1.4.orig/cmake/cminpack_utils.cmake	2012-04-11 16:01:36.000000000 +0000
++++ cminpack-1.1.4/cmake/cminpack_utils.cmake	2012-04-11 16:16:46.000000000 +0000
+@@ -5,6 +5,7 @@
          set(OS_WIN TRUE)
      endif(WIN32)
  
 +    if(NOT DEFINED CMINPACK_LIB_INSTALL_DIR)
      set(CMINPACK_LIB_INSTALL_DIR "lib")
-+    endif(NOT DEFINED CMINPACK_LIB_INSTALL_DIR)
      if(OS_LINUX)
          if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-             set(CMINPACK_LIB_INSTALL_DIR "lib64")
+@@ -20,6 +21,7 @@
+     else(OS_LINUX)
+         message (STATUS "Operating system is generic Unix")
+     endif(OS_LINUX)
++    endif(NOT DEFINED CMINPACK_LIB_INSTALL_DIR)
+     set(CMINPACK_INCLUDE_INSTALL_DIR
+         "include/${PROJECT_NAME_LOWER}-${CMINPACK_MAJOR_VERSION}")
+ endmacro(GET_OS_INFO)
diff --git a/debian/patches/series b/debian/patches/series
index 96b549c..f5bfd89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 multiarch.patch
+addlibmath.patch

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

