[SCM] Packaging for dune-common: a toolbox for solving PDEs -- basic classes branch, master, updated. debian/2.2.1-1

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 162fea8123ec453d22d694babda2c86850fb451f
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sat Mar 2 02:17:25 2013 +0100

    Update aclocal.patch.

diff --git a/debian/patches/aclocal.patch b/debian/patches/aclocal.patch
index adf04bf..d5f0a2a 100644
--- a/debian/patches/aclocal.patch
+++ b/debian/patches/aclocal.patch
@@ -1,24 +1,25 @@
---- dune-common.orig/bin/dune-autogen
-+++ dune-common/bin/dune-autogen
-@@ -68,6 +68,9 @@
-               echo "Found am directory $OPT/am"
-               am_dir="$OPT/am"
-             fi
-+            if test -d "$OPT/share/dune/aclocal"; then
-+              ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $OPT/share/dune/aclocal"
-+            fi
-             if test -d "$OPT/share/aclocal"; then
-               ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $OPT/share/aclocal"
-             fi
---- dune-common.orig/bin/dunecontrol
-+++ dune-common/bin/dunecontrol
-@@ -378,6 +378,9 @@
-       if test -d "$path/m4"; then
-           ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $path/m4"
-       fi
-+      if test -d "$path/share/dune/aclocal"; then
-+          ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $path/share/dune/aclocal"
-+      fi
-       if test -d "$path/share/aclocal"; then
-           ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $path/share/aclocal"
-       fi
+--- a/bin/dune-autogen
++++ b/bin/dune-autogen
+@@ -36,6 +36,10 @@
+     ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $LIBTOOL_prefix/share/aclocal"
+ fi
+ 
++if test -d "/usr/share/dune/aclocal"; then
++    ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I /usr/share/dune/aclocal"
++fi
++
+ for OPT in "$@"; do
+     set +e
+     # stolen from configure...
+--- a/bin/dunecontrol
++++ b/bin/dunecontrol
+@@ -368,6 +368,9 @@
+     if test -d "m4"; then
+       ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
+     fi
++    if test -d "/usr/share/dune/aclocal"; then
++        ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I /usr/share/dune/aclocal"
++    fi
+     MY_MODULES=
+     # get dependencies & suggestions
+     sort_modules $module

-- 
Packaging for dune-common: a toolbox for solving PDEs -- basic classes