[Pkg-scicomp-commits] [SCM] sundials branch, master, updated. 174ff05588dc5c1c662fc78a5cb097cd5fa74b12

[Rafael Laboissiere]

tags 530983 pending
thanks

The following commit has been merged in the master branch:
commit f9e5f0718992379903081c811b49108edeb6ae5a
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Tue Jun 2 16:44:44 2009 +0200

    Remove bashism from sundials-config and use /bin/sh in configure

diff --git a/debian/changelog b/debian/changelog
index 94abe09..c41ab29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,11 +9,14 @@ sundials (2.4.0-1) UNRELEASED; urgency=low
     prefix for installing files in all src/*/Makefile.in files.  This is
     necessary, otherwise the installed *.la files would contain a wrong
     value in the libdir variable.
+  * debian/patches/remove-bashishm.diff: New patch for removing bashisms
+    from bin/sundials-config (closes: #530983)
   * debian/rules:
     + Use DESTDIR instead of prefix when invoking make install
     + This new upstream version creates correctly the needed directories
       at installation time. Remove the hacked code in rule
       common-install-prehook-impl, accordingly.
+    + Pass SHELL=/bin/sh to the configure environment
 
   * debian/control: Bump Standards-Version to 3.8.1 (no changes needed)
 
diff --git a/debian/patches/remove-bashishm.diff b/debian/patches/remove-bashishm.diff
new file mode 100644
index 0000000..4703150
--- /dev/null
+++ b/debian/patches/remove-bashishm.diff
@@ -0,0 +1,22 @@
+New patch for removing bashisms from bin/sundials-config (fixes
+Bug#530983)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 02 Jun 2009 08:17:26 +0200
+
+--- a/bin/sundials-config.in
++++ b/bin/sundials-config.in
+@@ -50,10 +50,10 @@
+ shift $(( $OPTIND - 1 ))
+ 
+ # args check
+-[[ $module ]] || { echo >&2 the -m option and argument must be specified; exit 1; }
+-[[ $vector ]] || { echo >&2 the -t option and argument must be specified; exit 1; }
+-[[ $lang ]]   || { echo >&2 the -l option and argument must be specified; exit 1; }
+-[[ $show ]]   || { show=both; }
++[ $module ] || { echo >&2 the -m option and argument must be specified; exit 1; }
++[ $vector ] || { echo >&2 the -t option and argument must be specified; exit 1; }
++[ $lang ]   || { echo >&2 the -l option and argument must be specified; exit 1; }
++[ $show ]   || { show=both; }
+ 
+ # main
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a63a234..0239541 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 allow-destdir.diff
+remove-bashishm.diff
diff --git a/debian/rules b/debian/rules
index cee608b..c904c27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --disable-mpi --enable-examples
-DEB_CONFIGURE_SCRIPT_ENV += F77="gfortran"
+DEB_CONFIGURE_SCRIPT_ENV += F77="gfortran" SHELL=/bin/sh
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(DEB_DESTDIR)
 
 DEB_INSTALL_MANPAGES_libsundials-serial-dev := debian/sundials-config.1

-- 
sundials