[Pkg-voip-commits] r1092 - in gnugk/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2005-12-31 14:38:23 +0000 (Sat, 31 Dec 2005)
New Revision: 1092

Added:
   gnugk/trunk/debian/patches/getMsgDestination.dpatch
Modified:
   gnugk/trunk/debian/changelog
   gnugk/trunk/debian/patches/00list
Log:
prepare new upload. Fix according to upstreams hint with gcc 4.0.3 correction according to their CVS HEAD and 2.2.4 release.


Modified: gnugk/trunk/debian/changelog
===================================================================
--- gnugk/trunk/debian/changelog	2005-12-31 00:46:20 UTC (rev 1091)
+++ gnugk/trunk/debian/changelog	2005-12-31 14:38:23 UTC (rev 1092)
@@ -1,19 +1,17 @@
-gnugk (2:2.2.3-2-3) UNRELEASED; urgency=low
-
-  * Rebuild against latest pwlib and openh323 to complete libstc++ ABI
-    transition.
-
- -- Kilian Krause <kilian at debian.org>  Mon,  5 Dec 2005 20:07:01 +0100
-
 gnugk (2:2.2.3-2-2) unstable; urgency=low
 
+  [ Mark Purcell ]
   * Build-Depends: libmysql++-dev
     - FTBFS: Unsatisfiable build-dependency on libsqlplus-dev (Closes:
     #334162)
   * Copyright audit to debian/copyright
 
- -- Mark Purcell <msp at debian.org>  Mon,  7 Nov 2005 19:07:04 +0000
+  [ Kilian Krause ]
+  * Rebuild against latest pwlib and openh323 to complete libstc++ ABI
+    transition.
 
+ -- Kilian Krause <kilian at debian.org>  Sat, 31 Dec 2005 14:37:04 +0000
+
 gnugk (2:2.2.3-2-1) unstable; urgency=low
 
   * New upstream release

Modified: gnugk/trunk/debian/patches/00list
===================================================================
--- gnugk/trunk/debian/patches/00list	2005-12-31 00:46:20 UTC (rev 1091)
+++ gnugk/trunk/debian/patches/00list	2005-12-31 14:38:23 UTC (rev 1092)
@@ -1,3 +1,4 @@
 01_manual.dpatch
 05_makefile.dpatch
 07_exceptions.dpatch
+getMsgDestination

Added: gnugk/trunk/debian/patches/getMsgDestination.dpatch
===================================================================
--- gnugk/trunk/debian/patches/getMsgDestination.dpatch	2005-12-31 00:46:20 UTC (rev 1091)
+++ gnugk/trunk/debian/patches/getMsgDestination.dpatch	2005-12-31 14:38:23 UTC (rev 1092)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## getMsgDestination.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compilation with gcc 4.0.3. Backported from CVS HEAD.
+
+ at DPATCH@
+diff -urNad gnugk-2.2.3-2~/RasTbl.h gnugk-2.2.3-2/RasTbl.h
+--- gnugk-2.2.3-2~/RasTbl.h	2005-08-09 12:48:48.000000000 +0000
++++ gnugk-2.2.3-2/RasTbl.h	2005-12-31 14:35:04.000000000 +0000
+@@ -377,19 +377,6 @@
+ 	endptr FindByAliases(const H225_ArrayOf_AliasAddress & alias) const;
+ 	endptr FindEndpoint(const H225_ArrayOf_AliasAddress & alias, bool RoundRobin, bool SearchOuterZone = true);
+ 
+-	template<class MsgType> endptr getMsgDestination(const MsgType & msg, unsigned int & reason,
+-	                                                 bool SearchOuterZone = true)
+-	{
+-	  endptr ep;
+-	  bool ok = getGkDestAnalysisList().getMsgDestination(msg, EndpointList, listLock,
+-	                                                      ep, reason);
+-	  if (!ok && SearchOuterZone) {
+-            ok = getGkDestAnalysisList().getMsgDestination(msg, OuterZoneList, listLock,
+-	                                                   ep, reason);
+-	  }
+-	  return (ok) ? ep : endptr(0);
+-	}
+-
+ 	void ClearTable();
+ 	void CheckEndpoints();
+ 


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