[Pkg-voip-commits] r10501 - in /yate/trunk/debian: changelog patches/series patches/yate-r5852.patch patches/yate-r5853.patch

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Tue Jul  8 22:15:45 2014
New Revision: 10501

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10501
Log:
Apply upstream patches to properly place files in multiarch pathes
(Closes: #750272).

Added:
    yate/trunk/debian/patches/yate-r5852.patch
    yate/trunk/debian/patches/yate-r5853.patch
Modified:
    yate/trunk/debian/changelog
    yate/trunk/debian/patches/series

Modified: yate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/changelog?rev=10501&op=diff
==============================================================================
--- yate/trunk/debian/changelog	(original)
+++ yate/trunk/debian/changelog	Tue Jul  8 22:15:45 2014
@@ -1,7 +1,12 @@
 yate (5.3.0-1-1) UNRELEASED; urgency=low
 
+  [ Mark Purcell ]
   * NOT RELEASED YET
   * New upstream release
+
+  [ Tzafrir Cohen ]
+  * Apply upstream patches to properly place files in multiarch pathes
+    (Closes: #750272).
 
  -- Mark Purcell <msp at debian.org>  Sat, 31 May 2014 15:59:44 +1000
 

Modified: yate/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/series?rev=10501&op=diff
==============================================================================
--- yate/trunk/debian/patches/series	(original)
+++ yate/trunk/debian/patches/series	Tue Jul  8 22:15:45 2014
@@ -2,3 +2,5 @@
 warning-unknown-architecture.patch
 0001-Fix-parallel-make-v2.patch
 0002-Compile-daemon-as-PIE.patch
+yate-r5852.patch
+yate-r5853.patch

Added: yate/trunk/debian/patches/yate-r5852.patch
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/yate-r5852.patch?rev=10501&op=file
==============================================================================
--- yate/trunk/debian/patches/yate-r5852.patch	(added)
+++ yate/trunk/debian/patches/yate-r5852.patch	Tue Jul  8 22:15:45 2014
@@ -0,0 +1,24 @@
+From: Paul Chitescu <paulc at voip.null.ro>
+Subject: Use dpkg-architecture to find multiarch directory name on Debian.
+Origin: http://yate.null.ro/websvn/revision.php?repname=yate&rev=5852
+
+--- a/configure.in	(revision 5851)
++++ b/configure.in	(revision 5852)
+@@ -34,10 +34,15 @@ AC_MSG_RESULT([$uname_os])
+ # Check if we should look for alternate library names
+ AC_ARG_WITH(archlib,AC_HELP_STRING([--with-archlib=NAME],[use NAME as library directory name]),[ac_cv_use_archlib=$withval])
+ AC_MSG_CHECKING([for libraries directory name])
+-archname=`uname -m` 2>/dev/null
+-test -z "$archname" && archname=`arch -k`
++archname=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`
++test -z "$archname" && archname=`uname -m 2>/dev/null`
++test -z "$archname" && archname=`arch -k 2>/dev/null`
++test -z "$archname" && archname=`arch 2>/dev/null`
+ ARCHLIB="lib"
+ case "x$archname" in
++    x*-*-*)
++	ARCHLIB="lib/$archname"
++	;;
+     x*x86_64*)
+ 	ARCHLIB=lib64
+ 	;;

Added: yate/trunk/debian/patches/yate-r5853.patch
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/yate-r5853.patch?rev=10501&op=file
==============================================================================
--- yate/trunk/debian/patches/yate-r5853.patch	(added)
+++ yate/trunk/debian/patches/yate-r5853.patch	Tue Jul  8 22:15:45 2014
@@ -0,0 +1,31 @@
+From: Paul Chitescu <paulc at voip.null.ro>
+Subject: Use AC_TRY_LINK to check if the PostgreSQL library is linkable
+Origin: http://yate.null.ro/websvn/revision.php?repname=yate&rev=5852
+
+--- a/configure.in	(revision 5852)
++++ b/configure.in	(revision 5853)
+@@ -602,10 +602,22 @@ done
+ if [[ ! -f "$incpq/libpq-fe.h" ]]; then
+     incpq="$incpq/pgsql"
+ fi
+-if [[ -f "$incpq/libpq-fe.h" -a -f "$libpq" ]]; then
+-    HAVE_PGSQL=yes
++if [[ -f "$incpq/libpq-fe.h" ]]; then
++if [[ -f "$libpq" ]]; then
++HAVE_PGSQL=yes
++else
++SAVE_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -I$incpq"
++SAVE_LIBS="$LIBS"
++LIBS="$LIBS -lpq"
++AC_TRY_LINK([#include <libpq-fe.h>],[PQconnectStart("");],[HAVE_PGSQL=yes])
++LIBS="$SAVE_LIBS"
++CFLAGS="$SAVE_CFLAGS"
++fi
++if [[ "x$HAVE_PGSQL" = "xyes" ]]; then
+     PGSQL_INC="-I$incpq"
+ fi
++fi
+ AC_MSG_RESULT([$HAVE_PGSQL])
+ fi
+ AC_SUBST(HAVE_PGSQL)