[Pkg-voip-commits] r5487 - in /opal/trunk/debian: changelog patches/00list patches/speex-remove-version-cmp.dpatch patches/speexcodec.dpatch

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sat Apr  5 08:13:34 2008
New Revision: 5487

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5487
Log:
Fix configure to never try to use the shipped speex version, even if it
(wrongly) thinks it's newer.

Oh, and actually release this time :-)

Added:
    opal/trunk/debian/patches/speex-remove-version-cmp.dpatch   (with props)
Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/patches/00list
    opal/trunk/debian/patches/speexcodec.dpatch

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=5487&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sat Apr  5 08:13:34 2008
@@ -16,12 +16,14 @@
   * Remove Jose Carlos Garcia Sogo and Santiago Garcia Mantinan from
     Uploaders and add myself.
   * Depend on newly introduced libspeexdsp-dev. (Closes: #474272)
+  * Fix configure to never try to use the shipped speex version, even if it
+    (wrongly) thinks it's newer.
 
   [ Victor Seva ]
   * Add patch from Rober Millan to solve FTBFS on parallel build.
     (Closes: #459742)
 
- -- Faidon Liambotis <paravoid at debian.org>  Fri, 04 Apr 2008 19:49:23 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Sat, 05 Apr 2008 10:59:43 +0300
 
 opal (2.2.11~dfsg1-3) unstable; urgency=high
 

Modified: opal/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/00list?rev=5487&op=diff
==============================================================================
--- opal/trunk/debian/patches/00list (original)
+++ opal/trunk/debian/patches/00list Sat Apr  5 08:13:34 2008
@@ -2,3 +2,4 @@
 notrace
 remove_ilbc
 speexcodec
+speex-remove-version-cmp

Added: opal/trunk/debian/patches/speex-remove-version-cmp.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/speex-remove-version-cmp.dpatch?rev=5487&op=file
==============================================================================
--- opal/trunk/debian/patches/speex-remove-version-cmp.dpatch (added)
+++ opal/trunk/debian/patches/speex-remove-version-cmp.dpatch Sat Apr  5 08:13:34 2008
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## speex-remove-version-cmp.dpatch by Faidon Liambotis <paravoid at debian.org>
+##
+## DP: Remove version compare of system vs. shipped speex versions.
+## DP: It's broken in many ways (e.g. thinks 1.2.0 < 1.1.1) and there's no
+## DP: point in us fixing it since we *always* want to build with system's.
+
+ at DPATCH@
+diff -urNad opal-2.2.11~dfsg1~/configure opal-2.2.11~dfsg1/configure
+--- opal-2.2.11~dfsg1~/configure	2007-03-10 18:47:02.000000000 +0200
++++ opal-2.2.11~dfsg1/configure	2008-04-05 10:57:56.000000000 +0300
+@@ -6284,7 +6284,7 @@
+       print "1";
+ 
+ P_FILE
+-      SPEEX=`perl t.pl $SYSVER $LIBVER`
++      SPEEX=1
+       rm t.pl
+       if test "x$SPEEX" = "x0" ; then
+         { echo "$as_me:$LINENO: result: OPAL version is more recent" >&5
+diff -urNad opal-2.2.11~dfsg1~/configure.ac opal-2.2.11~dfsg1/configure.ac
+--- opal-2.2.11~dfsg1~/configure.ac	2007-03-10 18:47:03.000000000 +0200
++++ opal-2.2.11~dfsg1/configure.ac	2008-04-05 10:57:42.000000000 +0300
+@@ -247,7 +247,7 @@
+       print "1";
+       ]
+ P_FILE
+-      SPEEX=`perl t.pl $SYSVER $LIBVER`
++      SPEEX=1
+       rm t.pl
+       if test "x$SPEEX" = "x0" ; then
+         AC_MSG_RESULT(OPAL version is more recent)

Propchange: opal/trunk/debian/patches/speex-remove-version-cmp.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: opal/trunk/debian/patches/speexcodec.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/speexcodec.dpatch?rev=5487&op=diff
==============================================================================
--- opal/trunk/debian/patches/speexcodec.dpatch (original)
+++ opal/trunk/debian/patches/speexcodec.dpatch Sat Apr  5 08:13:34 2008
@@ -31,7 +31,7 @@
  
 -
 +ifeq ($(OPAL_SYSTEM_SPEEX), 1)
-+ENDLDLIBS       := -lspeex $(ENDLDLIBS)
++ENDLDLIBS       := -lspeex -lspeexdsp $(ENDLDLIBS)
 +endif
  $(TARGET) :	$(OPAL_LIBDIR)/$(OPAL_FILE)