[Pkg-voip-commits] r1515 - in bayonne/trunk/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2006-03-30 11:05:38 +0000 (Thu, 30 Mar 2006)
New Revision: 1515

Modified:
   bayonne/trunk/debian/changelog
   bayonne/trunk/debian/patches/gcc4-friend-classes.dpatch
   bayonne/trunk/debian/rules
Log:
add fix to build with gcc4.1


Modified: bayonne/trunk/debian/changelog
===================================================================
--- bayonne/trunk/debian/changelog	2006-03-30 10:56:32 UTC (rev 1514)
+++ bayonne/trunk/debian/changelog	2006-03-30 11:05:38 UTC (rev 1515)
@@ -1,3 +1,9 @@
+bayonne (1.2.15-3) UNRELEASED; urgency=low
+
+  * Add fix to build with gcc4.1. (Closes: #356590)
+
+ -- Kilian Krause <kilian at debian.org>  Thu, 30 Mar 2006 14:05:03 +0300
+
 bayonne (1.2.15-2) unstable; urgency=low
 
   [ Mark Purcell ]

Modified: bayonne/trunk/debian/patches/gcc4-friend-classes.dpatch
===================================================================
--- bayonne/trunk/debian/patches/gcc4-friend-classes.dpatch	2006-03-30 10:56:32 UTC (rev 1514)
+++ bayonne/trunk/debian/patches/gcc4-friend-classes.dpatch	2006-03-30 11:05:38 UTC (rev 1515)
@@ -60,3 +60,96 @@
  /**
   * We derive a Bayonne server version of ScriptInterp, "Trunk",
   * which holds most common elements of the script engine for Bayonne
+--- ./server/bayonne.h~ 2006-03-12 21:42:18.000000000 +0000
++++ ./server/bayonne.h  2006-03-12 22:00:48.000000000 +0000
+@@ -781,6 +781,10 @@
+  * @author David Sugar <dyfet at ostel.com>
+  * @short phrase translations dso base for tts.
+  */
++
++class Translator;
++Translator *getTranslator(const char *name);
++
+ class Translator : protected Keydata
+ {
+ private:
+@@ -1423,6 +1427,10 @@
+  * @author David Sugar <dyfet at ostel.com>
+  * @short Request service.
+  */
++
++class Request;
++Request *request(TrunkGroup *group, char **argv, unsigned timeout, const char *tag, const char *pid);
++
+ class Request
+ {
+ private:
+@@ -1473,6 +1481,10 @@
+  * @author David Sugar <dyfet at ostel.com>
+  * @short Trunk group configuration.
+  */
++
++class TrunkGroup;
++TrunkGroup *getGroup(const char *name);
++
+ class TrunkGroup : public Keydata, public CallStat
+ {
+ private:
+@@ -2938,6 +2950,10 @@
+  * @author David Sugar <dyfet at ostel.com>
+  * @short Bayonne audit logging interface.
+  */
++
++void audit(Trunk *trunk, char *detail);
++void alog(Trunk *trunk, char *detail);
++
+ class Audit : public Mutex
+ {
+ private:
+@@ -3553,6 +3569,10 @@
+  * @short threaded server service.
+  * @author David Sugar <dyfet at ostel.com>
+  */
++
++void startServers(void);
++void stopServers(void);
++
+ class Server : public Thread
+ {
+ private:
+@@ -3625,6 +3645,10 @@
+  * @short generated sample tone.
+  * @author David Sugar.
+  */
++
++class phTone;
++phTone *getphTone(const char *name);
++
+ class phTone
+ {
+ private:
+@@ -3705,6 +3729,11 @@
+  * @short TGI interpreter module.
+  * @author David Sugar <dyfet at ostel.com>
+  */
++
++class TGI;
++void getInterp(char *cmd, char **args);
++TGI *getInterp(char *cmd);
++
+ class TGI
+ {
+ private:
+@@ -3782,6 +3811,12 @@
+  * @short Module interface class.
+  * @author David Sugar <dyfet at ostel.com>
+  */
++
++class Module;
++Module *getModule(modtype_t mod, const char *name);
++void detachModules(Trunk *trunk);
++void attachModules(Trunk *trunk);
++
+ class Module : public Script
+ {
+ private:

Modified: bayonne/trunk/debian/rules
===================================================================
--- bayonne/trunk/debian/rules	2006-03-30 10:56:32 UTC (rev 1514)
+++ bayonne/trunk/debian/rules	2006-03-30 11:05:38 UTC (rev 1515)
@@ -23,7 +23,7 @@
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
 FILENAME := bayonne_$(UPVERSION).orig.tar.gz
-URL := http://prdownloads.sourceforge.net/gnutelephony/bayonne-$(UPVERSION).tar.gz
+URL := http://ovh.dl.sourceforge.net/gnutelephony/bayonne-$(UPVERSION).tar.gz
 
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))