[Pkg-voip-commits] r9955 - in /opal/trunk/debian: changelog rules

[msp at alioth.debian.org]

Author: msp
Date: Sat Sep 15 04:25:21 2012
New Revision: 9955

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9955
Log:
* Fixes "Segfault in std::less<unsigned int>::operator() from
  /usr/lib/libopal.so.3.10.4" (Closes: #687079)
* Fixes "segfault of ekiga in libopal" (Closes: #685399)

Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/rules

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=9955&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sat Sep 15 04:25:21 2012
@@ -1,9 +1,14 @@
-opal (3.10.7~dfsg-2) UNRELEASED; urgency=low
-
-  * Remove hack when building simple application
+opal (3.10.7~dfsg-2) experimental; urgency=low
+
+  [ Eugen Dedu ]
   * Enable H263/4 codecs
 
- -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>  Thu, 13 Sep 2012 10:09:01 +1000
+  [ Mark Purcell ]
+  * Fixes "Segfault in std::less<unsigned int>::operator() from
+    /usr/lib/libopal.so.3.10.4" (Closes: #687079)
+  * Fixes "segfault of ekiga in libopal" (Closes: #685399)
+
+ -- Mark Purcell <msp at debian.org>  Sat, 15 Sep 2012 13:20:59 +1000
 
 opal (3.10.7~dfsg-1) experimental; urgency=low
 

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=9955&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Sat Sep 15 04:25:21 2012
@@ -10,6 +10,10 @@
 UPFILENAME := opal_$(UPVERSION).orig.tar.gz
 URL := http://aarnet.dl.sourceforge.net/sourceforge/opalvoip/opal-$(UPVERSION).tar.bz2
 
+# hack to get samples/simple compiled with new build system
+# no := here for we need evaluation at runtime!
+OPAL_LIBDIR=$(shell sed -n -e "/^OPAL_LIBDIR/s,^.*/,$(CURDIR)/,p" opal_defs.mak)
+
 %:
 	dh $@ --parallel --with autotools_dev
 
@@ -21,7 +25,8 @@
 	dh_auto_configure -- --enable-samples --enable-spandsp
 
 override_dh_auto_build:
-	dh_auto_build -- opt docs
+	sed -e 's#^Libs: #Libs: -L$(OPAL_LIBDIR) #' opal.pc >samples/opal.pc
+	dh_auto_build -- PKG_CONFIG_PATH=$(CURDIR)/samples opt docs
 
 #override_dh_auto_test:
 #	if (samples/simple/obj*/simpleopal --help >/dev/null);then \