[Pkg-voip-commits] r1991 - in yate/trunk/debian: . patches

[Mikael Magnusson]

Author: mikma-guest
Date: 2006-07-02 12:55:22 +0000 (Sun, 02 Jul 2006)
New Revision: 1991

Added:
   yate/trunk/debian/patches/ptlib.dpatch
Modified:
   yate/trunk/debian/changelog
   yate/trunk/debian/patches/00list
Log:
* Apply ptlib.dpatch from Matej Vela <vela at debian.org>, fixes ptlib
  compile error (Closes: #358131)

Modified: yate/trunk/debian/changelog
===================================================================
--- yate/trunk/debian/changelog	2006-07-02 09:09:09 UTC (rev 1990)
+++ yate/trunk/debian/changelog	2006-07-02 12:55:22 UTC (rev 1991)
@@ -1,10 +1,15 @@
 yate (0.9.0-0.pre4-1) UNRELEASED; urgency=low
 
+  [ Kilian Krause ]
   * New upstream version (0.9.0pre4)
   * Update build-depends to libpri1.2 and libortp4-dev.
 
- -- Kilian Krause <kilian at debian.org>  Fri, 31 Mar 2006 01:28:52 +0300
+  [ Mikael Magnusson ]
+  * Apply ptlib.dpatch from Matej Vela <vela at debian.org>, fixes ptlib
+    compile error (Closes: #358131)
 
+ -- Mikael Magnusson <mikma at users.sourceforge.net>  Sun,  2 Jul 2006 14:40:59 +0200
+
 yate (0.8.7+cvs20050604-4) unstable; urgency=low
 
   * Complete transition of openh323 and pwlib into Etch with the new libstc++.

Modified: yate/trunk/debian/patches/00list
===================================================================
--- yate/trunk/debian/patches/00list	2006-07-02 09:09:09 UTC (rev 1990)
+++ yate/trunk/debian/patches/00list	2006-07-02 12:55:22 UTC (rev 1991)
@@ -2,3 +2,4 @@
 #amd64
 #noapidocs
 #zapchan
+ptlib

Added: yate/trunk/debian/patches/ptlib.dpatch
===================================================================
--- yate/trunk/debian/patches/ptlib.dpatch	2006-07-02 09:09:09 UTC (rev 1990)
+++ yate/trunk/debian/patches/ptlib.dpatch	2006-07-02 12:55:22 UTC (rev 1991)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ptlib.dpatch by Matej Vela <vela at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The lexicographical version check fails with ptlib 1.10 (#358131).
+
+ at DPATCH@
+diff -urNad yate-0.8.7+cvs20050604~/configure.in yate-0.8.7+cvs20050604/configure.in
+--- yate-0.8.7+cvs20050604~/configure.in
++++ yate-0.8.7+cvs20050604/configure.in
+@@ -185,9 +185,9 @@
+ incpw="$ac_cv_use_pwlib/include/ptlib.h"
+ libpw="$ac_cv_use_pwlib/lib/libpt.so"
+ PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib"
+-if [[ "$verpw" '<' "1.6.0" ]]; then
+-    PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib/unix/ptlib -I$ac_cv_use_pwlib/include/ptlib/unix $PWLIB_INC"
+-fi
++case $verpw in
++    [0.*|1.[0-5].*]) PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib/unix/ptlib -I$ac_cv_use_pwlib/include/ptlib/unix $PWLIB_INC";;
++esac
+ if [[ -f "$incpw" -a -f "$libpw" ]]; then
+     HAVE_PWLIB=installed
+     PWLIB_LIB="-L$ac_cv_use_pwlib/lib -lpt"
+diff -urNad yate-0.8.7+cvs20050604~/configure yate-0.8.7+cvs20050604/configure
+--- yate-0.8.7+cvs20050604~/configure
++++ yate-0.8.7+cvs20050604/configure
+@@ -5043,9 +5043,9 @@
+ incpw="$ac_cv_use_pwlib/include/ptlib.h"
+ libpw="$ac_cv_use_pwlib/lib/libpt.so"
+ PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib"
+-if [ "$verpw" '<' "1.6.0" ]; then
+-    PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib/unix/ptlib -I$ac_cv_use_pwlib/include/ptlib/unix $PWLIB_INC"
+-fi
++case $verpw in
++    0.*|1.[0-5].*) PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib/unix/ptlib -I$ac_cv_use_pwlib/include/ptlib/unix $PWLIB_INC";;
++esac
+ if [ -f "$incpw" -a -f "$libpw" ]; then
+     HAVE_PWLIB=installed
+     PWLIB_LIB="-L$ac_cv_use_pwlib/lib -lpt"


Property changes on: yate/trunk/debian/patches/ptlib.dpatch
___________________________________________________________________
Name: svn:executable
   + *