r40420 - in /desktop/unstable/ekiga/debian: changelog patches/boost.patch patches/series

[dedu-guest at users.alioth.debian.org]

Author: dedu-guest
Date: Sat Jan 18 12:19:31 2014
New Revision: 40420

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40420
Log:
Fix FTBFS with recent boost libraries (Closes: 735791)

Added:
    desktop/unstable/ekiga/debian/patches/boost.patch
Modified:
    desktop/unstable/ekiga/debian/changelog
    desktop/unstable/ekiga/debian/patches/series

Modified: desktop/unstable/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/changelog?rev=40420&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/changelog	[utf-8] (original)
+++ desktop/unstable/ekiga/debian/changelog	[utf-8] Sat Jan 18 12:19:31 2014
@@ -1,9 +1,10 @@
-ekiga (4.0.1-3) UNRELEASED; urgency=low
+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:

Added: desktop/unstable/ekiga/debian/patches/boost.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/boost.patch?rev=40420&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/patches/boost.patch	(added)
+++ desktop/unstable/ekiga/debian/patches/boost.patch	[utf-8] Sat Jan 18 12:19:31 2014
@@ -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

Modified: desktop/unstable/ekiga/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/series?rev=40420&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/ekiga/debian/patches/series	[utf-8] Sat Jan 18 12:19:31 2014
@@ -1 +1,2 @@
 powerpcspe.patch
+boost.patch