[dune-common] 02/04: Drop obsolete and backported patches.

[Ansgar Burchardt]

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

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

commit 42bde9b270a5a3f1b4632d17f9004334e58e5c22
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Fri Feb 14 09:12:20 2014 +0100

    Drop obsolete and backported patches.
---
 ...n-Prevents-overriding-am_dir-with-install.patch | 65 ----------------------
 debian/patches/series                              |  2 -
 debian/patches/svn-version.patch                   | 12 ----
 3 files changed, 79 deletions(-)

diff --git a/debian/patches/0001-dune-autogen-Prevents-overriding-am_dir-with-install.patch b/debian/patches/0001-dune-autogen-Prevents-overriding-am_dir-with-install.patch
deleted file mode 100644
index ba82b3e..0000000
--- a/debian/patches/0001-dune-autogen-Prevents-overriding-am_dir-with-install.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 073167e61070a5e952c738c02d85c3f946717e40 Mon Sep 17 00:00:00 2001
-From: Markus Blatt <markus at dr-blatt.de>
-Date: Sun, 19 Jan 2014 20:31:45 +0100
-Subject: [PATCH] [dune-autogen] Prevents overriding am_dir with installed
- modules.
-
-Before this patch we tried setting am_dir for directory with a
-DUNE module. If one is working with local modules
-(e.g. dune-common and dune-geometry), that are a subset of installed
-modules (e.g. dune-common, dune-geometry, and dune-istl), that are all
-installed under the same prefix, then modules that are part of the difference
-of the set of installed and the set of the local modules caused am_dir to
-point to the am directory of the installed dune-common directory.
-After this patch  am_dir is only set once, which fixes this behaviour and
-flyspray issue #1420
----
- bin/dune-autogen | 32 ++++++++++++++++++--------------
- 1 file changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/bin/dune-autogen b/bin/dune-autogen
-index 40772ee..c9f0bdb 100755
---- a/bin/dune-autogen
-+++ b/bin/dune-autogen
-@@ -63,20 +63,24 @@ for OPT in "$@"; do
-             if test -d "$OPT/m4"; then
-               ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I \"$OPT/m4\""
-             fi
--            if test -f "$OPT/dune-common.pc.in" ; then
--#            if test \( -d "$OPT/am" \) -a ! \( -h "$OPT/am" \) ; then
--              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
--            if test -d "$OPT/share/dune-common/am"; then
--              echo "Found am directory $OPT/share/dune-common/am"
--              am_dir="$OPT/share/dune-common/am"
-+	    if test -z "$am_dir"; then
-+              # if am_dir is already set, then we already find dune-common
-+              # and did set am_dir correctly. 
-+              if test -f "$OPT/dune-common.pc.in" ; then
-+#               if test \( -d "$OPT/am" \) -a ! \( -h "$OPT/am" \) ; then
-+                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
-+              if test -d "$OPT/share/dune-common/am"; then
-+                echo "Found am directory $OPT/share/dune-common/am"
-+                am_dir="$OPT/share/dune-common/am"
-+              fi
-             fi
- 			      PATH=$OPT/bin:$PATH
-             ;;
--- 
-1.8.5.2
-
diff --git a/debian/patches/series b/debian/patches/series
index b8fc74a..ed2211d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 soname.patch
 dune-autogen.patch
-svn-version.patch
 skip-dirs-starting-with-dot.patch
 rename-git-whitespace-hook.patch
-0001-dune-autogen-Prevents-overriding-am_dir-with-install.patch
diff --git a/debian/patches/svn-version.patch b/debian/patches/svn-version.patch
deleted file mode 100644
index 498c8cd..0000000
--- a/debian/patches/svn-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Subject: set version to 2.3-svn
-
-Set the version to 2.3-svn as this is not the final release.
---- a/dune.module
-+++ b/dune.module
-@@ -1,4 +1,4 @@
- Module: dune-common
--Version: 2.3beta2
-+Version: 2.3-svn
- Maintainer: dune-devel at dune-project.org
- Whitespace-Hook: Yes

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