[SCM] libmpc/master: Import 2:0.1~r459-4.1

[slomo at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 51c12eb76a64495af269f703aaf4179bc805f3e2
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Sat Sep 19 20:57:19 2015 +0200

    Import 2:0.1~r459-4.1

diff --git a/debian/changelog b/debian/changelog
index 32f7782..379b7b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libmpc (2:0.1~r459-4.1) unstable; urgency=low
+
+  [ Hideki Yamane ]
+  * Non-maintainer upload.
+    - auto detect aclocal/automake/autoconf version (Closes: #713209)
+    - include autoreconf.mk to add "config/compile" file
+  * debian/control
+    - add "Build-Depends: dh-autoreconf" to provide above autoreconf.mk
+  * debian/patches
+    - add add_subdir-objects.patch for automake
+
+ -- Neil Williams <codehelp at debian.org>  Sat, 22 Mar 2014 14:25:56 +0000
+
 libmpc (2:0.1~r459-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 44862e6..8545eb2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: cdbs (>= 0.4.93~),
                gnulib,
                automake,
                autoconf,
+               dh-autoreconf,
                libtool,
                pkg-config,
                libreplaygain-dev (>= 1.0~r412),
diff --git a/debian/patches/add_subdir-objects.patch b/debian/patches/add_subdir-objects.patch
new file mode 100644
index 0000000..35efdf5
--- /dev/null
+++ b/debian/patches/add_subdir-objects.patch
@@ -0,0 +1,16 @@
+Description: avoid automake error
+Author: Hideki Yamane <henrich at debian.org>
+Forwarded: no
+Last-Update: 2013-10-23
+
+--- libmpc-0.1~r459.orig/configure.in
++++ libmpc-0.1~r459/configure.in
+@@ -3,7 +3,7 @@ AC_CONFIG_AUX_DIR([config])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR([libmpcdec/mpc_reader.c])
+ AM_CONFIG_HEADER([include/config.h])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE(subdir-objects)
+ AM_MAINTAINER_MODE
+ 
+ AC_LANG_C
diff --git a/debian/patches/series b/debian/patches/series
index 5c06017..b6253b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_mpcchap.patch
 04_link-order.patch
 1001_missing_extern_kw.patch
+add_subdir-objects.patch
diff --git a/debian/rules b/debian/rules
index 2c2f6e0..7f06118 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,15 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 DEB_AUTO_UPDATE_LIBTOOL = pre
-DEB_AUTO_UPDATE_ACLOCAL = 1.11
-DEB_AUTO_UPDATE_AUTOCONF = 2.67
-DEB_AUTO_UPDATE_AUTOHEADER = 2.67
-DEB_AUTO_UPDATE_AUTOMAKE = 1.11
+DEB_AUTO_UPDATE_ACLOCAL = $(shell dpkg -s automake | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
+DEB_AUTO_UPDATE_AUTOCONF = $(shell dpkg -s autoconf | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
+DEB_AUTO_UPDATE_AUTOMAKE = $(shell dpkg -s automake | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
+DEB_AUTO_UPDATE_AUTOHEADER = $(shell dpkg -s autoheader | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
 
 common-binary-post-install-arch:: list-missing
 

-- 
libmpc packaging