tags 660488 + patch thanks Dear maintainer,
I've prepared an NMU for miredo (versioned as 1.2.3-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. Raphael Geissert
diff -Nru miredo-1.2.3/debian/changelog miredo-1.2.3/debian/changelog --- miredo-1.2.3/debian/changelog 2010-04-10 04:38:03.000000000 -0500 +++ miredo-1.2.3/debian/changelog 2012-10-18 18:24:32.000000000 -0500 @@ -1,3 +1,12 @@ +miredo (1.2.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + + Based entirely on work by the maintainer. + * Fix build failure with newer automakes (Closes: #660488) + * use_pkglibexec.patch: Use pkglibexec instead of pkglib for PROGRAMS + + -- Raphael Geissert <geiss...@debian.org> Thu, 18 Oct 2012 18:20:19 -0500 + miredo (1.2.3-1) unstable; urgency=low * New upstream version: diff -Nru miredo-1.2.3/debian/patches/series miredo-1.2.3/debian/patches/series --- miredo-1.2.3/debian/patches/series 1969-12-31 18:00:00.000000000 -0600 +++ miredo-1.2.3/debian/patches/series 2012-10-18 18:17:15.000000000 -0500 @@ -0,0 +1 @@ +use_pkglibexec.patch diff -Nru miredo-1.2.3/debian/patches/use_pkglibexec.patch miredo-1.2.3/debian/patches/use_pkglibexec.patch --- miredo-1.2.3/debian/patches/use_pkglibexec.patch 1969-12-31 18:00:00.000000000 -0600 +++ miredo-1.2.3/debian/patches/use_pkglibexec.patch 2012-10-18 18:18:27.000000000 -0500 @@ -0,0 +1,40 @@ +From: Rémi Denis-Courmont <r...@remlab.net> +Date: Fri, 2 Mar 2012 19:17:22 +0200 +http://git.remlab.net/gitweb/?p=miredo-debian.git;a=commit;h=06a57f3c804b78048d13d53dc06a78377f88454b +diff -urpN miredo-1.2.3-1.orig/src/Makefile.am miredo-1.2.3-1/src/Makefile.am +--- miredo-1.2.3-1.orig/src/Makefile.am 2009-07-06 10:56:14.000000000 -0500 ++++ miredo-1.2.3-1/src/Makefile.am 2012-10-18 18:16:31.000000000 -0500 +@@ -29,10 +29,10 @@ LIBCAP = @LIBCAP@ + AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -D_REENTRANT \ + -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DLOCALSTATEDIR=\"$(localstatedir)\" \ +- -DPKGLIBDIR=\"$(pkglibdir)\" ++ -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" + + sbin_PROGRAMS = miredo miredo-server miredo-checkconf +-pkglib_PROGRAMS = ++pkglibexec_PROGRAMS = + EXTRA_PROGRAMS = privproc + noinst_LTLIBRARIES = libmiredo.la + TESTS = +@@ -59,7 +59,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 ++pkglibexec_PROGRAMS += miredo-privproc + TESTS += miredo-checkconf + endif + +diff -urpN miredo-1.2.3-1.orig/src/relayd.c miredo-1.2.3-1/src/relayd.c +--- miredo-1.2.3-1.orig/src/relayd.c 2010-04-10 04:19:10.000000000 -0500 ++++ miredo-1.2.3-1/src/relayd.c 2012-10-18 18:16:31.000000000 -0500 +@@ -217,7 +217,7 @@ create_dynamic_tunnel (const char *ifnam + char ifindex[2 * sizeof (unsigned) + 1]; + snprintf (ifindex, sizeof (ifindex), "%X", tun6_getId (tunnel)); + +- static const char path[] = PKGLIBDIR"/miredo-privproc"; ++ static const char path[] = PKGLIBEXECDIR"/miredo-privproc"; + switch (fork ()) + { + case -1: diff -Nru miredo-1.2.3/debian/rules miredo-1.2.3/debian/rules --- miredo-1.2.3/debian/rules 2009-12-05 07:04:23.000000000 -0600 +++ miredo-1.2.3/debian/rules 2012-10-18 18:20:08.000000000 -0500 @@ -14,6 +14,9 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-assert endif +# Work around Debian bug #661983 +DEB_CONFIGURE_LIBEXECDIR = "\$${prefix}/lib" + # Uho, problem on hppa and m68k pbuilder #ifeq (,$(filter $(DEB_HOST_ARCH_CPU),hppa m68k)) # testsuite is native, would fail if cross-compiling
