Bug#382152: patch

2006-08-15 Thread Jonas Meyer
Package: bayonne
Version: 1.2.15-2
Severity: important
Tags: patch

this patch fixes it. but i really think that the actual problem are the
packages libccscript-dev and libccaudio-dev putting their headers in the
wrong directory. for libccaudio-dev the bug is #383213. the very same
applies to libccscript-dev.

diff -Naur bayonne-1.2.15.debian.orig/drivers/aculab/driver.h bayonne-1.2.15/drivers/aculab/driver.h
--- bayonne-1.2.15.debian.orig/drivers/aculab/driver.h	2005-01-24 11:51:00.0 +
+++ bayonne-1.2.15/drivers/aculab/driver.h	2006-08-15 20:22:16.0 +
@@ -44,7 +44,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 
 extern C {
 
diff -Naur bayonne-1.2.15.debian.orig/drivers/capi20/driver.h bayonne-1.2.15/drivers/capi20/driver.h
--- bayonne-1.2.15.debian.orig/drivers/capi20/driver.h	2005-01-24 11:51:00.0 +
+++ bayonne-1.2.15/drivers/capi20/driver.h	2006-08-15 20:22:41.0 +
@@ -19,7 +19,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 #include cc++/strchar.h
 #include capi20.h
 
diff -Naur bayonne-1.2.15.debian.orig/drivers/dialogic/driver.h bayonne-1.2.15/drivers/dialogic/driver.h
--- bayonne-1.2.15.debian.orig/drivers/dialogic/driver.h	2005-01-24 11:50:59.0 +
+++ bayonne-1.2.15/drivers/dialogic/driver.h	2006-08-15 20:23:02.0 +
@@ -50,7 +50,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 #include strstream
 
 #include cclib.h
diff -Naur bayonne-1.2.15.debian.orig/drivers/dummy/driver.h bayonne-1.2.15/drivers/dummy/driver.h
--- bayonne-1.2.15.debian.orig/drivers/dummy/driver.h	2005-01-24 11:50:59.0 +
+++ bayonne-1.2.15/drivers/dummy/driver.h	2006-08-15 20:40:54.0 +
@@ -16,7 +16,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 
 extern C {
 #include termios.h
diff -Naur bayonne-1.2.15.debian.orig/drivers/eccs/driver.h bayonne-1.2.15/drivers/eccs/driver.h
--- bayonne-1.2.15.debian.orig/drivers/eccs/driver.h	2005-01-24 11:50:58.0 +
+++ bayonne-1.2.15/drivers/eccs/driver.h	2006-08-15 20:21:04.0 +
@@ -16,7 +16,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 
 class ECCSTrunk;
 
diff -Naur bayonne-1.2.15.debian.orig/drivers/globalcall/driver.h bayonne-1.2.15/drivers/globalcall/driver.h
--- bayonne-1.2.15.debian.orig/drivers/globalcall/driver.h	2005-08-26 13:32:15.0 +
+++ bayonne-1.2.15/drivers/globalcall/driver.h	2006-08-15 20:23:48.0 +
@@ -50,7 +50,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 
 #define DIALOGIC_MT
 
diff -Naur bayonne-1.2.15.debian.orig/drivers/oh323/driver.h bayonne-1.2.15/drivers/oh323/driver.h
--- bayonne-1.2.15.debian.orig/drivers/oh323/driver.h	2005-01-24 11:50:59.0 +
+++ bayonne-1.2.15/drivers/oh323/driver.h	2006-08-15 20:24:06.0 +
@@ -18,7 +18,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 
 #define	PHAS_TEMPLATES
 #define	P_USE_PRAGMA
diff -Naur bayonne-1.2.15.debian.orig/drivers/phonedev/driver.h bayonne-1.2.15/drivers/phonedev/driver.h
--- bayonne-1.2.15.debian.orig/drivers/phonedev/driver.h	2005-01-24 11:50:59.0 +
+++ bayonne-1.2.15/drivers/phonedev/driver.h	2006-08-15 20:38:13.0 +
@@ -16,7 +16,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 
 #ifdef	HAVE_LINUX_TELEPHONY_H
 #include linux/telephony.h
diff -Naur bayonne-1.2.15.debian.orig/drivers/pika/driver.h bayonne-1.2.15/drivers/pika/driver.h
--- bayonne-1.2.15.debian.orig/drivers/pika/driver.h	2005-01-24 11:50:58.0 +
+++ bayonne-1.2.15/drivers/pika/driver.h	2006-08-15 20:21:29.0 +
@@ -43,7 +43,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 #include cc++/strchar.h
 
 #ifdef	have_montecarlo_h
diff -Naur bayonne-1.2.15.debian.orig/drivers/vmodem/driver.h bayonne-1.2.15/drivers/vmodem/driver.h
--- bayonne-1.2.15.debian.orig/drivers/vmodem/driver.h	2005-01-24 11:51:01.0 +
+++ bayonne-1.2.15/drivers/vmodem/driver.h	2006-08-15 20:24:43.0 +
@@ -16,7 +16,7 @@
 
 #include ivrconfig.h
 #include server.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 #include cc++/serial.h
 
 #ifdef	CCXX_NAMESPACES
diff -Naur bayonne-1.2.15.debian.orig/modules/protocols/vpim.cpp bayonne-1.2.15/modules/protocols/vpim.cpp
--- bayonne-1.2.15.debian.orig/modules/protocols/vpim.cpp	2005-01-24 11:51:04.0 +
+++ bayonne-1.2.15/modules/protocols/vpim.cpp	2006-08-15 20:25:17.0 +
@@ -16,7 +16,7 @@
 
 #include server.h
 #include cc++/strchar.h
-#include cc++/audio.h
+#include cc++2/cc++/audio.h
 
 #ifdef	HAVE_SSTREAM
 #include sstream

Bug#382152: patch

2006-08-15 Thread Mark Purcell
On Tuesday 15 August 2006 22:00, Jonas Meyer wrote:
 this patch fixes it. but i really think that the actual problem are the
 packages libccscript-dev and libccaudio-dev putting their headers in the
 wrong directory. for libccaudio-dev the bug is #383213. the very same
 applies to libccscript-dev.

Thanks Jonas,

I would prefer to fixup the ccaudio  ccscript headers..

I'll have a dig around and see what I can do..

Mark


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]