Merge lp:~l3on/ubuntu/precise/miredo/fix-ftbfs into lp:ubuntu/precise/miredo

[Leo Iannacone]

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.

[Luke Yelavich (themuso)]

Thanks for yoru work. Once again you had your patch from debian/patches applied in the source tree.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-04 17:28:08 +0000
+++ debian/changelog	2012-02-19 15:43:20 +0000
@@ -1,3 +1,9 @@
+miredo (1.2.3-1ubuntu1) precise; urgency=low
+
+  * Fix FTBFS with automake 1.11.3 (LP: #934950).
+
+ -- Leo Iannacone <[e-mail]>  Sun, 19 Feb 2012 16:29:40 +0100
+
 miredo (1.2.3-1) unstable; urgency=low
 
   * New upstream version:

=== modified file 'debian/control'
--- debian/control	2010-03-04 17:28:08 +0000
+++ debian/control	2012-02-19 15:43:20 +0000
@@ -1,7 +1,8 @@
 Source: miredo
 Section: net
 Priority: optional
-Maintainer: Rémi Denis-Courmont <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Rémi Denis-Courmont <[e-mail]>
 Build-Depends: dpkg-dev (>= 1.13.2), debhelper (>= 7), cdbs, autotools-dev,
                automake (>= 1.11), libtool, autopoint,
                libjudy-dev,

=== added directory 'debian/patches'
=== added file 'debian/patches/fix-automake-1.11.3.patch'
--- debian/patches/fix-automake-1.11.3.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-automake-1.11.3.patch	2012-02-19 15:43:20 +0000
@@ -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 <[e-mail]>
+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
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-02-19 15:43:20 +0000
@@ -0,0 +1,1 @@
+fix-automake-1.11.3.patch

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-10-21 21:38:02 +0000
+++ src/Makefile.am	2012-02-19 15:43:20 +0000
@@ -32,7 +32,8 @@
 	-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_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