Merge lp:~noskcaj/ubuntu/trusty/ekiga/ftbfs into lp:ubuntu/trusty/ekiga

[Jackson Doak]

Take changes from un-uploaded debian NMU. Should fix i386 and PPC64el build failures.

=== removed file '.pc/applied-patches'
=== modified file 'debian/README.security'
--- debian/README.security	2012-12-09 22:43:35 +0000
+++ debian/README.security	2014-02-25 20:11:35 +0000
@@ -1,4 +1,4 @@
-I've noticed that ekiga/3.2.7-5+b1 and ekiga/3.9.90, from its first run,
+I've noticed that ekiga [...], from its first run,
 with default configuration, uses a public STUN service at stun.ekiga.net.
 
 The purpose of that service is to inform the client of its public IP

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-13 13:13:11 +0000
+++ debian/changelog	2014-02-25 20:11:35 +0000
@@ -1,14 +1,25 @@
-ekiga (4.0.1-2ubuntu2) trusty; urgency=low
-
-  * No-change rebuild for new e-d-s
-
- -- Iain Lane <[e-mail]>  Wed, 13 Nov 2013 13:13:11 +0000
-
-ekiga (4.0.1-2ubuntu1) trusty; urgency=low
-
-  * Specify multiarch boost libdir.
-
- -- Dmitrijs Ledkovs <[e-mail]>  Sun, 27 Oct 2013 01:21:33 +0100
+ekiga (4.0.1-3ubuntu1) trusty; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Switch to dh-autoreconf. Enable automake option subdir-objects.
+  * Use explicit --with-boost-libdir since multiarch detection does not work
+    on *-i386 architectures.  (Closes: #735791)
+
+ -- Jackson Doak <[e-mail]>  Wed, 26 Feb 2014 06:26:53 +1100
+
+ekiga (4.0.1-3) unstable; urgency=low
+
+  [ Eugen Dedu ]
+  * Install README.security in doc directory (Closes: #712033)
+  * Fix debian svn/vcs information
+  * Fix FTBFS on powerpcspe (Closes: 701565)
+  * Fix FTBFS with recent boost libraries (Closes: 735791)
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/rules:
+    + Disable silent rules.
+
+ -- Eugen Dedu <[e-mail]>  Sat, 18 Jan 2014 11:28:19 +0100
 
 ekiga (4.0.1-2) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-10-27 01:21:33 +0000
+++ debian/control	2014-02-25 20:11:35 +0000
@@ -2,6 +2,7 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: ekiga
 Section: gnome
 Priority: optional
@@ -9,6 +10,7 @@
 XSBC-Original-Maintainer: Kilian Krause <[e-mail]>
 Uploaders: Eugen Dedu <[e-mail]>, Debian GNOME Maintainers <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                libsasl2-dev,
                gettext,
                libldap2-dev,
@@ -17,7 +19,6 @@
                libloudmouth1-dev,
                libgconf2-dev,
                libxv-dev,
-               autotools-dev,
                gnome-pkg-tools,
                rarian-compat,
                intltool,
@@ -37,10 +38,9 @@
                libboost-dev,
                libboost-signals-dev
 Standards-Version: 3.9.2.0
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/experimental/ekiga/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/ekiga/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/ekiga/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/ekiga/
 Homepage: http://www.ekiga.org/
-DM-Upload-Allowed: yes
 
 Package: ekiga
 Architecture: any

=== modified file 'debian/control.in'
--- debian/control.in	2013-10-27 01:21:33 +0000
+++ debian/control.in	2014-02-25 20:11:35 +0000
@@ -5,6 +5,7 @@
 XSBC-Original-Maintainer: Kilian Krause <[e-mail]>
 Uploaders: Eugen Dedu <[e-mail]>, Debian GNOME Maintainers <[e-mail]>
 Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                libsasl2-dev,
                gettext,
                libldap2-dev,
@@ -13,7 +14,6 @@
                libloudmouth1-dev,
                libgconf2-dev,
                libxv-dev,
-               autotools-dev,
                gnome-pkg-tools,
                rarian-compat,
                intltool,
@@ -33,10 +33,9 @@
                libboost-dev,
                libboost-signals-dev
 Standards-Version: 3.9.2.0
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/experimental/ekiga/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/ekiga/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/ekiga/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/ekiga/
 Homepage: http://www.ekiga.org/
-DM-Upload-Allowed: yes
 
 Package: ekiga
 Architecture: any

=== added file 'debian/ekiga.docs'
--- debian/ekiga.docs	1970-01-01 00:00:00 +0000
+++ debian/ekiga.docs	2014-02-25 20:11:35 +0000
@@ -0,0 +1,1 @@
+debian/README.security

=== added directory 'debian/patches'
=== added file 'debian/patches/autofoo.patch'
--- debian/patches/autofoo.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/autofoo.patch	2014-02-25 20:11:35 +0000
@@ -0,0 +1,15 @@
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@ AC_CANONICAL_TARGET
+ AC_PREREQ([2.53])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(src/ekiga.cpp)
+-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
++AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
+ 
+ AM_MAINTAINER_MODE([enable])
+ AC_CONFIG_HEADERS([config.h])

=== added file 'debian/patches/boost.patch'
--- debian/patches/boost.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/boost.patch	2014-02-25 20:11:35 +0000
@@ -0,0 +1,31 @@
+--- a/m4/ax_boost_base.m4
++++ b/m4/ax_boost_base.m4
+@@ -33,7 +33,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 20
++#serial 22
+ 
+ AC_DEFUN([AX_BOOST_BASE],
+ [
+@@ -91,9 +91,17 @@ if test "x$want_boost" = "xyes"; then
+     dnl are found, e.g. when only header-only libraries are installed!
+     libsubdirs="lib"
+     ax_arch=`uname -m`
+-    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
++    case $ax_arch in
++      x86_64|ppc64|s390x|sparc64|aarch64)
+         libsubdirs="lib64 lib lib64"
+-    fi
++        ;;
++    esac
++
++    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
++    dnl them priority over the other paths since, if libs are found there, they
++    dnl are almost assuredly the ones desired.
++    AC_REQUIRE([AC_CANONICAL_HOST])
++    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
+ 
+     dnl first we check the system location for boost libraries
+     dnl this location ist chosen if boost libraries are installed with the --layout=system option

=== added file 'debian/patches/powerpcspe.patch'
--- debian/patches/powerpcspe.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/powerpcspe.patch	2014-02-25 20:11:35 +0000
@@ -0,0 +1,11 @@
+--- a/configure.ac.orig	2013-05-10 13:11:24.000000000 +0200
++++ a/configure.ac	2013-05-10 13:12:00.000000000 +0200
+@@ -90,7 +90,7 @@
+     gm_platform="solaris"
+     ;;
+ 
+-  linux-gnulp | linux-gnu | linux-gnueabi* | linux | Linux)
++  linux-gnulp | linux-gnu | linux-gnuspe | linux-gnueabi* | linux | Linux)
+     gm_platform="linux"
+     ;;
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-02-25 20:11:35 +0000
@@ -0,0 +1,3 @@
+powerpcspe.patch
+boost.patch
+autofoo.patch

=== modified file 'debian/rules'
--- debian/rules	2013-10-27 01:21:33 +0000
+++ debian/rules	2014-02-25 20:11:35 +0000
@@ -3,26 +3,18 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-include /usr/share/dpkg/default.mk
-
 %:
-	dh $@ --with autotools_dev --parallel
+	dh $@ --with autoreconf --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure --\
 		--with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--disable-schemas-install \
 		--disable-scrollkeeper \
+		--disable-silent-rules \
 		--enable-avahi \
 		--enable-loudmouth
 
-clean::
-	dh_testdir
-	dh_auto_clean
-	-dh_autotools-dev_restoreconfig
-	rm -f gnome-doc-utils.make
-	dh_clean
-
 override_dh_auto_install:
 	cd po/; intltool-update -p
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ekiga