[dune-common] 03/07: Remove patches that should be obsoleted by upstream changes.

[Ansgar Burchardt]

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

ansgar pushed a commit to annotated tag debian/2.3.20140117beta2-1
in repository dune-common.

commit fab773b823e172aa58b17ec2f020364d12e5bcb0
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Mon Jan 20 12:47:53 2014 +0100

    Remove patches that should be obsoleted by upstream changes.
---
 debian/patches/aclocal.patch      | 25 -------------------------
 debian/patches/dune-autogen.patch |  8 --------
 debian/patches/series             |  1 -
 3 files changed, 34 deletions(-)

diff --git a/debian/patches/aclocal.patch b/debian/patches/aclocal.patch
deleted file mode 100644
index 1b09c0f..0000000
--- a/debian/patches/aclocal.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
-@@ -616,6 +616,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
diff --git a/debian/patches/dune-autogen.patch b/debian/patches/dune-autogen.patch
index 810400d..a39bcca 100644
--- a/debian/patches/dune-autogen.patch
+++ b/debian/patches/dune-autogen.patch
@@ -9,11 +9,3 @@
  
  # guess libtool prefix
  if test -n "$LIBTOOLIZE"; then
-@@ -128,6 +128,7 @@
- 
- # 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
-     echo "--> linking dune-common/am..."
-     rm -f am
diff --git a/debian/patches/series b/debian/patches/series
index 71465ab..a9127f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 soname.patch
 dune-autogen.patch
-aclocal.patch
 svn-version.patch
 skip-dirs-starting-with-dot.patch
 rename-git-whitespace-hook.patch

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