[dune-common] 03/13: Refresh patches.

[Ansgar Burchardt]

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

ansgar pushed a commit to branch master
in repository dune-common.

commit 52b9d54926138c6eb37015a26e20f7e5a4d27e1c
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Fri Dec 27 18:48:15 2013 +0100

    Refresh patches.
---
 debian/patches/aclocal.patch        |  4 ++--
 debian/patches/dune-autogen.patch   | 10 +++++-----
 debian/patches/fix-PARSER_TRIM.diff | 11 -----------
 debian/patches/series               |  1 -
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/debian/patches/aclocal.patch b/debian/patches/aclocal.patch
index d5f0a2a..a317975 100644
--- a/debian/patches/aclocal.patch
+++ b/debian/patches/aclocal.patch
@@ -1,7 +1,7 @@
 --- a/bin/dune-autogen
 +++ b/bin/dune-autogen
 @@ -36,6 +36,10 @@
-     ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $LIBTOOL_prefix/share/aclocal"
+     ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I \"$LIBTOOL_prefix/share/aclocal\""
  fi
  
 +if test -d "/usr/share/dune/aclocal"; then
@@ -13,7 +13,7 @@
      # stolen from configure...
 --- a/bin/dunecontrol
 +++ b/bin/dunecontrol
-@@ -368,6 +368,9 @@
+@@ -567,6 +567,9 @@
      if test -d "m4"; then
        ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
      fi
diff --git a/debian/patches/dune-autogen.patch b/debian/patches/dune-autogen.patch
index 0ad15ae..4c72427 100644
--- a/debian/patches/dune-autogen.patch
+++ b/debian/patches/dune-autogen.patch
@@ -1,11 +1,11 @@
---- dune-common.orig/bin/dune-autogen
-+++ dune-common/bin/dune-autogen
+--- a/bin/dune-autogen
++++ b/bin/dune-autogen
 @@ -27,7 +27,7 @@
  rm -f $name.m4
  
  # add current dir to PATH
--PATH=`dirname $0`:$PATH
-+#PATH=`dirname $0`:$PATH
+-PATH=`dirname "$0"`:$PATH
++#PATH=`dirname "$0"`:$PATH
  
  # guess libtool prefix
  if test -n "$LIBTOOLIZE"; then
@@ -14,6 +14,6 @@
  # create a link to the dune-common am directory
  if [ "$name" != "dune-common" ]; then
 +  : ${am_dir:=/usr/share/dune-common/am}
-   if [ -n "$am_dir" ] && [ -d $am_dir ]; then
+   if [ -n "$am_dir" ] && [ -d "$am_dir" ]; then
      echo "--> linking dune-common/am..."
      rm -f am
diff --git a/debian/patches/fix-PARSER_TRIM.diff b/debian/patches/fix-PARSER_TRIM.diff
deleted file mode 100644
index f6f7cf5..0000000
--- a/debian/patches/fix-PARSER_TRIM.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/dunemodules.lib
-+++ b/lib/dunemodules.lib
-@@ -43,7 +43,7 @@
- # paramters:
- # $1 file to read
- #
--PARSER_TRIM="awk '{gsub(/^[[:space:]]+| +$/,\"\");printf(\"%s\", \$0);}'"
-+PARSER_TRIM="awk '{gsub(/^[ \\t]+|[ \\t]+$/,\"\");printf(\"%s\", \$0);}'"
- parse_control() {
-   # check file existence
-   if test ! -f "$1" -o "$(basename $1)" != "$CONTROL"; then
diff --git a/debian/patches/series b/debian/patches/series
index 1016014..032574c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 soname.patch
 dune-autogen.patch
 aclocal.patch
-fix-PARSER_TRIM.diff

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