[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. debian/0.8.D.3-1-5-g42a677e

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 71c26c59f6fbb0fad79b358935685ccc09b431a8
Author: Stephen Kitt <steve at sk2.org>
Date:   Tue Nov 8 07:20:36 2011 +0100

    Build-conflict with autoconf2.13 which causes the build to fail.

diff --git a/debian/changelog b/debian/changelog
index 1956c28..f1f91f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mednafen (0.8.D.3-2) unstable; urgency=low
     supported MIME types, as suggested by Damian Yarrick (LP: #886912;
     helps with #635538).
   * Simplify rules using dh 9 and enable hardening.
+  * Build-conflict with autoconf2.13 which causes the build to fail.
 
  -- Stephen Kitt <steve at sk2.org>  Mon, 07 Nov 2011 23:19:44 +0100
 
diff --git a/debian/control b/debian/control
index 5f1e6e7..d2947bc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 8.1.3), autotools-dev, x11proto-core-dev,
  libsndfile1-dev | libsndfile-dev,
  libasound2-dev [linux-any],
  libjack-dev
+Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.1
 Homepage: http://mednafen.sourceforge.net
 Vcs-Git: git://git.debian.org/git/pkg-games/mednafen.git

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine