Control: retitle -1 unblock: sundials/2.5.0-3 I have uploaded a new version of sundials which fixes some problems with the previous upload. I attach the debdiff between sundials 2.5.0-1 (testing) and 2.5.0-3 (unstable). -- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594
diff -u sundials-2.5.0/debian/control sundials-2.5.0/debian/control
--- sundials-2.5.0/debian/control
+++ sundials-2.5.0/debian/control
@@ -81,7 +81,9 @@
Package: libsundials-serial-dev
Section: libdevel
Architecture: any
-Depends: libsundials-serial (= ${binary:Version}), ${misc:Depends}
+Depends: libsundials-serial (= ${binary:Version}), ${misc:Depends},
+ libblas-dev | libatlas-base-dev | libopenblas-dev,
+ liblapack-dev | libatlas-base-dev
Description: SUNDIALS development files
The family of solvers referred to as SUNDIALS (SUit of Nonlinear and
DIfferential/ALgebraic equation Solvers) consists of solvers CVODE
@@ -109,7 +111,7 @@
Package: octave-sundials
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, octave
Recommends: libsundials-serial-dev
Description: SUNDIALS for octave
The family of solvers referred to as SUNDIALS (SUit of Nonlinear and
diff -u sundials-2.5.0/debian/changelog sundials-2.5.0/debian/changelog
--- sundials-2.5.0/debian/changelog
+++ sundials-2.5.0/debian/changelog
@@ -1,3 +1,25 @@
+sundials (2.5.0-3) unstable; urgency=low
+
+ * Team upload.
+ * Revert changes from experimental version which inadvertently made it into
+ the previous upload.
+ * Improve the fix for missing BLAS and LAPACK dependencies (closes: #700525)
+ + no longer pass BLAS and LAPACK through LDFLAGS
+ + link-blas-lapack.patch: new patch which rather adds the dependencies at
+ the libtool link level
+ + add missing dependency of libsundials-serial-dev on libblas-dev and
+ liblapack-dev
+ * Fix the dependency of octave-sundials on octave.
+
+ -- Sébastien Villemot <sebastien@debian.org> Wed, 27 Feb 2013 16:58:32 +0100
+
+sundials (2.5.0-2) unstable; urgency=low
+
+ * debian/rules:
+ - Add -lblas -llapack -lm to LDFLAGS (closes: #700525)
+
+ -- Christophe Trophime <christophe.trophime@lncmi.cnrs.fr> Fri, 15 Feb 2013 11:40:09 +0100
+
sundials (2.5.0-1) unstable; urgency=low
* New upstream release
diff -u sundials-2.5.0/debian/patches/series sundials-2.5.0/debian/patches/series
--- sundials-2.5.0/debian/patches/series
+++ sundials-2.5.0/debian/patches/series
@@ -4,0 +5 @@
+link-blas-lapack.patch
only in patch2:
unchanged:
--- sundials-2.5.0.orig/debian/patches/link-blas-lapack.patch
+++ sundials-2.5.0/debian/patches/link-blas-lapack.patch
@@ -0,0 +1,104 @@
+Description: Ensure that libraries are linked against BLAS and LAPACK when needed
+ In particular, this ensures that the shared libraries packages have correct
+ dependencies.
+Author: Sébastien Villemot <sebastien@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700525
+Forwarded: no
+Last-Update: 2013-02-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/cvode/Makefile.in
++++ b/src/cvode/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS = @LIBS@
+
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+
+ top_srcdir = $(srcdir)/../..
+
+@@ -88,7 +89,7 @@
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODE_LIB) $(CVODE_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+
+ lib_with_bl: shared $(CVODE_LIB_FILES) $(CVODE_BL_LIB_FILES)
+- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODE_LIB) $(CVODE_LIB_FILES) $(CVODE_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODE_LIB) $(CVODE_LIB_FILES) $(CVODE_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+
+ install: $(CVODE_LIB)
+ $(mkinstalldirs) $(includedir)/cvode
+--- a/src/cvodes/Makefile.in
++++ b/src/cvodes/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS = @LIBS@
+
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+
+ top_srcdir = $(srcdir)/../..
+
+@@ -88,7 +89,7 @@
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODES_LIB) $(CVODES_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+
+ lib_with_bl: shared $(CVODES_LIB_FILES) $(CVODES_BL_LIB_FILES)
+- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODES_LIB) $(CVODES_LIB_FILES) $(CVODES_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODES_LIB) $(CVODES_LIB_FILES) $(CVODES_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+
+ install: $(CVODES_LIB)
+ $(mkinstalldirs) $(includedir)/cvodes
+--- a/src/ida/Makefile.in
++++ b/src/ida/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS = @LIBS@
+
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+
+ top_srcdir = $(srcdir)/../..
+
+@@ -88,7 +89,7 @@
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDA_LIB) $(IDA_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+
+ lib_with_bl: shared $(IDA_LIB_FILES) $(IDA_BL_LIB_FILES)
+- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDA_LIB) $(IDA_LIB_FILES) $(IDA_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDA_LIB) $(IDA_LIB_FILES) $(IDA_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+
+ install: $(IDA_LIB)
+ $(mkinstalldirs) $(includedir)/ida
+--- a/src/idas/Makefile.in
++++ b/src/idas/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS = @LIBS@
+
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+
+ top_srcdir = $(srcdir)/../..
+
+@@ -88,7 +89,7 @@
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDAS_LIB) $(IDAS_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+
+ lib_with_bl: shared $(IDAS_LIB_FILES) $(IDAS_BL_LIB_FILES)
+- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDAS_LIB) $(IDAS_LIB_FILES) $(IDAS_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDAS_LIB) $(IDAS_LIB_FILES) $(IDAS_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+
+ install: $(IDAS_LIB)
+ $(mkinstalldirs) $(includedir)/idas
+--- a/src/kinsol/Makefile.in
++++ b/src/kinsol/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS = @LIBS@
+
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+
+ top_srcdir = $(srcdir)/../..
+
+@@ -88,7 +89,7 @@
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(KINSOL_LIB) $(KINSOL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+
+ lib_with_bl: shared $(KINSOL_LIB_FILES) $(KINSOL_BL_LIB_FILES)
+- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(KINSOL_LIB) $(KINSOL_LIB_FILES) $(KINSOL_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(KINSOL_LIB) $(KINSOL_LIB_FILES) $(KINSOL_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+
+ install: $(KINSOL_LIB)
+ $(mkinstalldirs) $(includedir)/kinsol
Attachment:
signature.asc
Description: This is a digitally signed message part