[SCM] libopenmpt/master: Build-Conflicts against autoconf-archive

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cd8e422929362edf8a14317e121c944ee86b934f
Author: James Cowgill <jcowgill at debian.org>
Date:   Sat Jan 7 23:05:38 2017 +0000

    Build-Conflicts against autoconf-archive
    
    The newer ax_prog_doxygen.m4 from autoconf-archive doesn't work with
    libopenmpt's Makefile.am. Ensure we use the copy in m4/.

diff --git a/debian/control b/debian/control
index 4d959ea..5385c78 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends:
  pkg-config,
  portaudio19-dev,
  zlib1g-dev
+Build-Conflicts: autoconf-archive
 Standards-Version: 3.9.8
 Homepage: https://lib.openmpt.org/libopenmpt/
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/libopenmpt.git

-- 
libopenmpt packaging