From 257138c8f99dbb5c6c2167cad882070d029d5333 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 10 Nov 2016 08:34:44 +0100 Subject: [PATCH] NMU: Fix FTBS for when building against upcoming lirc-0.9.4. --- debian/changelog | 11 +++++++++++ debian/control | 2 +- debian/patches/lirc.patch | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 debian/patches/lirc.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 3acabfa..9f0d583 100644 --- 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 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 453f2be..885e91b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ncmpc Section: sound Priority: optional Maintainer: Sebastian Harl -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 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 +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 index 0000000..ad4bff4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +lirc.patch diff --git a/debian/rules b/debian/rules index 042e001..2a47178 100755 --- 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 \ -- 2.30.2