[eris] 02/07: Remove patch that has been implemented upstream

[Olek Wojnar]

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

olek-guest pushed a commit to branch master
in repository eris.

commit 97cc1881447b858890d48a5a458b83141078cc1b
Author: Olek Wojnar <olek-dev at wojnar.org>
Date:   Mon Oct 20 17:42:56 2014 -0500

    Remove patch that has been implemented upstream
---
 debian/patches/0001-bump-mercator-builddep.patch | 20 --------------------
 debian/patches/series                            |  1 -
 2 files changed, 21 deletions(-)

diff --git a/debian/patches/0001-bump-mercator-builddep.patch b/debian/patches/0001-bump-mercator-builddep.patch
deleted file mode 100644
index f1329eb..0000000
--- a/debian/patches/0001-bump-mercator-builddep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: bump required versions of build dependencies
- The required versions of several build dependencies was too low and could cause
- trouble is someone were to rebuild from source.
-Author: Stephen M. Webb
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,8 +88,9 @@
- )
- 
- dnl check for all the WorldForge libs we use
--PKG_CHECK_MODULES(WF, skstream-0.3 >= 0.3.9 atlascpp-0.6 >= 0.5.94 wfmath-1.0 >= 1.0.0 mercator-0.3 >= 0.2.6,
--    [
-+PKG_CHECK_MODULES([WF],[
-+       skstream-0.3 >= 0.3.9 atlascpp-0.6 >= 0.6.2 wfmath-1.0 >= 1.0.0 mercator-0.3 >= 0.3.2
-+    ],[
-         CPPFLAGS="$CPPFLAGS $WF_CFLAGS"
-         ERIS_DEPS="$ERIS_DEPS $WF_LIBS"
-         ERIS_REQUIRES="$ERIS_REQUIRES skstream-0.3 atlascpp-0.6 wfmath-1.0 mercator-0.3"
-Binary files /dev/null and b/.configure.ac.swp differ
diff --git a/debian/patches/series b/debian/patches/series
index 75dbc5b..e494aaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-disable-silent-rules.patch
-0001-bump-mercator-builddep.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/eris.git