[dopewars] 04/06: ada

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository dopewars.

commit ada34c7c5c807f7425e2bf84de97c0e47c785fc6
Author: Markus Koschany <apo at debian.org>
Date:   Thu Mar 31 16:42:39 2016 +0200

    ada
---
 debian/patches/m4_copy-error.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/patches/m4_copy-error.patch b/debian/patches/m4_copy-error.patch
index 6fe845d..065aae3 100644
--- a/debian/patches/m4_copy-error.patch
+++ b/debian/patches/m4_copy-error.patch
@@ -3,19 +3,21 @@ Date: Thu, 31 Mar 2016 16:39:55 +0200
 Subject: m4_copy error
 
 ---
- acinclude.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ acinclude.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index de7a863..724817b 100644
+index de7a863..ade713c 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -877,7 +877,7 @@ dnl We go to great lengths to make sure that aclocal won't
+@@ -877,8 +877,8 @@ dnl We go to great lengths to make sure that aclocal won't
  dnl try to pull in the installed version of these macros
  dnl when running aclocal in the glib directory.
  dnl
 -m4_copy([AC_DEFUN],[glib_DEFUN])
+-m4_copy([AC_REQUIRE],[glib_REQUIRE])
 +dnl m4_copy([AC_DEFUN],[glib_DEFUN])
- m4_copy([AC_REQUIRE],[glib_REQUIRE])
++dnl m4_copy([AC_REQUIRE],[glib_REQUIRE])
  dnl
  dnl At the end, if we're not within glib, we'll define the public
+ dnl definitions in terms of our private definitions.

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