diff -Nru miredo-1.2.3/debian/changelog miredo-1.2.3/debian/changelog --- miredo-1.2.3/debian/changelog 2010-04-10 10:38:03.000000000 +0100 +++ miredo-1.2.3/debian/changelog 2012-08-28 19:33:29.000000000 +0100 @@ -1,3 +1,9 @@ +miredo (1.2.3-1+rpi1) wheezy-staging; urgency=low + + * apply patch from ubuntu to fix FTBFS + + -- Peter Michael Green Tue, 28 Aug 2012 18:33:15 +0000 + miredo (1.2.3-1) unstable; urgency=low * New upstream version: diff -Nru miredo-1.2.3/debian/patches/fix-automake-1.11.3.patch miredo-1.2.3/debian/patches/fix-automake-1.11.3.patch --- miredo-1.2.3/debian/patches/fix-automake-1.11.3.patch 1970-01-01 01:00:00.000000000 +0100 +++ miredo-1.2.3/debian/patches/fix-automake-1.11.3.patch 2012-08-28 19:32:30.000000000 +0100 @@ -0,0 +1,31 @@ +Description: Fix FTBFS with automake >= 1.11.3: + * pkglib_PROGRAMS is incompatible with last version of automake, as a litte + define a new variable will install files in the same place of pkglibdir. +Author: Leo Iannacone +Bug-Ubuntu: https://bugs.launchpad.net/bugs/934950 + +--- + src/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- miredo.orig/src/Makefile.am ++++ miredo/src/Makefile.am +@@ -32,7 +32,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I + -DPKGLIBDIR=\"$(pkglibdir)\" + + sbin_PROGRAMS = miredo miredo-server miredo-checkconf +-pkglib_PROGRAMS = ++programfilesdir = $(pkglibdir) ++programfiles_PROGRAMS = + EXTRA_PROGRAMS = privproc + noinst_LTLIBRARIES = libmiredo.la + TESTS = +@@ -59,7 +60,7 @@ miredo_LDADD = ../libtun6/libtun6.la ../ + miredo_privproc_SOURCES = privproc.c privproc.h + miredo_privproc_LDADD = ../libteredo/libteredo.la $(LIBCAP) + if TEREDO_CLIENT +-pkglib_PROGRAMS += miredo-privproc ++programfiles_PROGRAMS += miredo-privproc + TESTS += miredo-checkconf + endif + diff -Nru miredo-1.2.3/debian/patches/series miredo-1.2.3/debian/patches/series --- miredo-1.2.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ miredo-1.2.3/debian/patches/series 2012-08-28 19:32:51.000000000 +0100 @@ -0,0 +1 @@ +fix-automake-1.11.3.patch