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

[Mikael Magnusson]

Author: mikma-guest
Date: 2006-07-15 14:43:16 +0000 (Sat, 15 Jul 2006)
New Revision: 2057

Added:
   yate/trunk/debian/patches/gcc41.dpatch
Modified:
   yate/trunk/debian/changelog
   yate/trunk/debian/patches/00list
Log:
* New upstream version (1.0.0-1) (Closes: #377778, #358131)
* Fix "extra qualification" compile error

Modified: yate/trunk/debian/changelog
===================================================================
--- yate/trunk/debian/changelog	2006-07-15 14:39:32 UTC (rev 2056)
+++ yate/trunk/debian/changelog	2006-07-15 14:43:16 UTC (rev 2057)
@@ -1,12 +1,10 @@
 yate (1.0.0-1.dfsg-1) UNRELEASED; urgency=low
 
   [ Kilian Krause ]
-  * New upstream version (1.0.0-1)
+  * New upstream version (1.0.0-1) (Closes: #377778, #358131)
   * Update build-depends to libpri1.2.
 
   [ Mikael Magnusson ]
-  * Apply ptlib.dpatch from Matej Vela <vela at debian.org>, fixes ptlib
-    compile error (Closes: #358131)
   * Update module and script paths in *.install
   * Remove libortp2-dev build-depends, ortpchan removed by upstream
     (Closes: #362709)
@@ -23,6 +21,7 @@
   * Add yate-gtk2 package containing the GTK+ 2 YateClient
   * libpri dependency mismatch fixed (Closes: #360656)
   * Fix short package description of yate
+  * Fix "extra qualification" compile error
 
  -- Mikael Magnusson <mikma at users.sourceforge.net>  Mon,  3 Jul 2006 15:41:14 +0200
 

Modified: yate/trunk/debian/patches/00list
===================================================================
--- yate/trunk/debian/patches/00list	2006-07-15 14:39:32 UTC (rev 2056)
+++ yate/trunk/debian/patches/00list	2006-07-15 14:43:16 UTC (rev 2057)
@@ -3,3 +3,4 @@
 #noapidocs
 #zapchan
 configure_ilbc
+gcc41

Added: yate/trunk/debian/patches/gcc41.dpatch
===================================================================
--- yate/trunk/debian/patches/gcc41.dpatch	2006-07-15 14:39:32 UTC (rev 2056)
+++ yate/trunk/debian/patches/gcc41.dpatch	2006-07-15 14:43:16 UTC (rev 2057)
@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc41.dpatch by  <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix building with gcc 4.1
+
+ at DPATCH@
+diff -urNad yate-1.0.0-1.dfsg~/contrib/yiax/yateiax.h yate-1.0.0-1.dfsg/contrib/yiax/yateiax.h
+--- yate-1.0.0-1.dfsg~/contrib/yiax/yateiax.h	2006-07-05 21:29:05.000000000 +0200
++++ yate-1.0.0-1.dfsg/contrib/yiax/yateiax.h	2006-07-13 09:31:29.000000000 +0200
+@@ -1501,14 +1501,14 @@
+      * @param delFrame Delete frame flag. If true on exit, a response was found
+      * @return Pointer to an IAXEvent or 0
+      */
+-    IAXEvent* IAXTransaction::getEventResponse_New(IAXFrameOut* frame, bool& delFrame);
++    IAXEvent* getEventResponse_New(IAXFrameOut* frame, bool& delFrame);
+ 
+     /**
+      * Process an authentication request. If valid, send an authentication reply
+      * @param event Already generated event
+      * @return Pointer to a valid IAXEvent
+      */
+-    IAXEvent* IAXTransaction::processAuthReq(IAXEvent* event);
++    IAXEvent* processAuthReq(IAXEvent* event);
+ 
+     /**
+      * Process an accept. If not valid (call m_engine->acceptFormatAndCapability) send a reject.
+@@ -1516,14 +1516,14 @@
+      * @param event Already generated event
+      * @return Pointer to a valid IAXEvent
+      */
+-    IAXEvent* IAXTransaction::processAccept(IAXEvent* event);
++    IAXEvent* processAccept(IAXEvent* event);
+ 
+     /**
+      * Process an authentication reply
+      * @param event Already generated event
+      * @return Pointer to a valid IAXEvent
+      */
+-    IAXEvent* IAXTransaction::processAuthRep(IAXEvent* event);
++    IAXEvent* processAuthRep(IAXEvent* event);
+ 
+     /**
+      * Find a response for a previously sent frame if the transaction type is RegReq/RegRel
+@@ -1531,14 +1531,14 @@
+      * @param delFrame Delete frame flag. If true on exit, a response was found
+      * @return Pointer to an IAXEvent or 0
+      */
+-    IAXEvent* IAXTransaction::getEventResponse_Reg(IAXFrameOut* frame, bool& delFrame);
++    IAXEvent* getEventResponse_Reg(IAXFrameOut* frame, bool& delFrame);
+ 
+     /**
+      * Update transaction data from the event
+      * @param event Already generated event
+      * @return The received event
+      */
+-    IAXEvent* IAXTransaction::processRegAck(IAXEvent* event);
++    IAXEvent* processRegAck(IAXEvent* event);
+ 
+     /**
+      * Find out if an incoming frame would start a transaction
+@@ -1683,7 +1683,7 @@
+      * @param seqNo Requested sequence number
+      * @return 0
+      */
+-    IAXTransaction* IAXTransaction::retransmitOnVNAK(u_int16_t seqNo);
++    IAXTransaction* retransmitOnVNAK(u_int16_t seqNo);
+ 
+     /**
+      * Generate an Accept event after internally accepting a transaction