Merge lp:~ken-vandine/unity-lens-friends/ftbfs_intltool into lp:unity-lens-friends

[Ken VanDine]

Fixed FTBFS with gnome-common 3.10, you can't use both IT_PROG_INTLTOOL and
AM_GNU_GETTEXT. Also cleaned up some automake depreciations.

Specify intltool version dependency in debian/control.

Fixed FTBFS with gnome-common 3.10, you can't use both IT_PROG_INTLTOOL and
AM_GNU_GETTEXT. Also cleaned up some automake depreciations.

Specify intltool version dependency in debian/control.

[Robert Bruce Park (robru)]

lgtm, just waiting for jenkins.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/unity-lens-friends-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-friends-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-friends-trusty-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-friends-trusty-i386-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-lens-friends-ci/13/rebuild

review: Approve (continuous-integration)

=== modified file 'Makefile.am'
--- Makefile.am	2012-10-17 20:13:50 +0000
+++ Makefile.am	2013-11-01 17:02:18 +0000
@@ -1,1 +1,3 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src data po

=== modified file 'autogen.sh'
--- autogen.sh	2012-10-16 04:41:52 +0000
+++ autogen.sh	2013-11-01 17:02:18 +0000
@@ -1,11 +1,39 @@
 #!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
 PKG_NAME="unity-lens-friends"
 
-which gnome-autogen.sh || {
-	echo "You need gnome-common from GNOME SVN"
-	exit 1
+(test -f $srcdir/configure.ac \
+  && test -f $srcdir/autogen.sh) || {
+    echo -n "**Error**: Directory \`$srcdir' does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
 }
 
-USE_GNOME2_MACROS=1 \
-. gnome-autogen.sh
+if which gnome-autogen.sh ; then
+  REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh
+else
+  if which intltoolize && which gtkdocize && which autoreconf ; then
+    intltoolize --copy --force --automake || \
+      (echo "There was an error in running intltoolize." > /dev/stderr;
+       exit 1)
+    autoreconf --force --install || \
+      (echo "There was an error in running autoreconf." > /dev/stderr;
+       exit 1)
+  else
+    echo "No build script available.  You have two choices:"
+    echo "1. You need to install the gnome-common module and make"
+    echo "   sure the gnome-autogen.sh script is in your \$PATH."
+    echo "2. You need to install the following scripts:"
+    echo "   * intltool"
+    echo "   * libtool"
+    echo "   * automake"
+    echo "   * autoconf"
+    echo "   Additionally, you need to make"
+    echo "   sure that they are in your \$PATH."
+    exit 1
+  fi
+fi

=== modified file 'configure.ac'
--- configure.ac	2013-07-25 03:01:50 +0000
+++ configure.ac	2013-11-01 17:02:18 +0000
@@ -1,8 +1,10 @@
+AC_PREREQ(2.65)
 AC_INIT([unity-lens-friends], 0.1)
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 
 LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_PROG_VALAC([0.17])
 AC_PROG_CC
@@ -16,10 +18,7 @@
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain])
 localedir='$(prefix)/$(DATADIRNAME)/locale'
 AC_SUBST(localedir)
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
-IT_PROG_INTLTOOL([0.40])
-
+IT_PROG_INTLTOOL(0.50.0)
 
 AC_DEFINE_UNQUOTED(LOCALE_DIR, "${PREFIX}/${DATADIRNAME}/locale",[Locale directory])
 AC_DEFINE_UNQUOTED(PKGDATADIR, "${PREFIX}/${DATADIRNAME}/${PACKAGE}", [Package data directory])

=== modified file 'debian/control'
--- debian/control	2013-07-11 16:59:44 +0000
+++ debian/control	2013-11-01 17:02:18 +0000
@@ -7,6 +7,7 @@
                dh-autoreconf,
                dh-translations,
                gnome-common,
+               intltool (>= 0.50.0),
                libaccounts-glib-dev,
                libdee-dev (>= 1.0.0),
                libgee-dev,

=== modified file 'debian/rules'
--- debian/rules	2013-08-02 12:05:43 +0000
+++ debian/rules	2013-11-01 17:02:18 +0000
@@ -10,4 +10,5 @@
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_install:
+	rm -f debian/*/usr/lib/*/unity/*.la
 	dh_install --fail-missing -X.la