NMU: Fix FTBS for when building against upcoming lirc-0.9.4.

diff --git a/debian/changelog b/debian/changelog
index 3acabfaa8a28e9b5ab35ffaf0ca780ca4b0ed3d7..9f0d583eb96f9c62b4088843fabb0b2fe1f2d21e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ncmpc (0.25-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release
+    - this release includes the autoreconf fixes
+  * debian/patches/lirc.patch:
+    - Adapt the configure script to detect the new lirc (Closes: #842326).
+      (patch has been accepted upstream)
+
+ -- Alec Leamas <leamas@nowhere.net>  Fri, 28 Oct 2016 07:05:23 +0200
+
 ncmpc (0.24-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 453f2bea3c7d6570414b4110626b0fab13696d4f..885e91bacc83d5cae5222f43724657c851398a72 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ncmpc
 Section: sound
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.14.6), autotools-dev, libncursesw5-dev, libglib2.0-dev, liblircclient-dev, libmpdclient-dev (>= 2.5~), doxygen
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.14.6), autotools-dev, libncursesw5-dev, libglib2.0-dev, liblircclient-dev, libmpdclient-dev (>= 2.5~), doxygen, dh-autoreconf
 Standards-Version: 3.9.5
 Homepage: http://mpd.wikia.com/wiki/Client:Ncmpc
 Vcs-Git: git://git.tokkee.org/pkg-ncmpc.git

diff --git a/debian/patches/lirc.patch b/debian/patches/lirc.patch
new file mode 100644 (file)
index 0000000..1e8ec5b
--- /dev/null
+++ b/debian/patches/lirc.patch
@@ -0,0 +1,29 @@
+From a26898627b93ce15b26d18a18c504a0a021faf58 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas@nowhere.net>
+Date: Fri, 28 Oct 2016 12:22:59 +0200
+Subject: configure.ac: detect lirc 0.9.4
+
+Origin: http://git.musicpd.org/cgit/master/ncmpc.git/commit/?id=a26898627b93ce15b26d18a18c504a0a021faf58
+
+diff --git a/configure.ac b/configure.ac
+index 14edebe..77c4701 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,8 +184,12 @@ AC_ARG_ENABLE([lirc],
+               [Enable LIRC support]),,
+       [enable_lirc=no])
+ if test x$enable_lirc = xyes; then
+-      PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+-              [AC_MSG_ERROR([liblircclient0 not found])])
++      PKG_CHECK_MODULES([LIBLIRCCLIENT], [lirc],,
++              [PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
++                      [AC_MSG_ERROR([lirc not found])]
++              )]
++      )
++
+       AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
+ fi
+ 
+-- 
+cgit v0.10.2
+

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..ad4bff4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lirc.patch

diff --git a/debian/rules b/debian/rules
index 042e001a95056c29fe03b619e3bc9ac79d91178e..2a47178a5a614ad5481ccbf771bab6b48f45e4fa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ endif
 
 config.status: configure
        dh_testdir
+       dh_autoreconf
        ./configure --host=$(DEB_HOST_GNU_TYPE) \
                        --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
                        --mandir=\$${prefix}/share/man \