Bug#419455: Patch for #419455

[Luis Rodrigo Gallardo Cruz]

tag 419455 patch
thanks

The bug was caused because zaptel-source installs zaptel.h in
/usr/include/zaptel, but the configure script expects it in
/usr/include/linux. This disabled the building of modules/zapchan.yate

The following patch fixes this:

-------------------------------------------------------------------------
diff -r eb1ba09dbd92 debian/changelog
--- a/debian/changelog	Sat Apr 21 22:45:47 2007 -0500
+++ b/debian/changelog	Sun Apr 22 01:41:33 2007 -0500
@@ -1,3 +1,11 @@ yate (1.1.0-1.dfsg-1) unstable; urgency=
+yate (1.1.0-1.dfsg-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add debian/patches/zaptel-header.dpatch to look for zaptel.h in
+    the right place (Closes: #419455).
+
+ -- Luis Rodrigo Gallardo Cruz <rodrigo at nul-unu.com>  Sun, 22 Apr 2007 01:40:28 -0500
+
 yate (1.1.0-1.dfsg-1) unstable; urgency=low
 
   [ Mikael Magnusson ]
diff -r eb1ba09dbd92 debian/patches/00list
--- a/debian/patches/00list	Sat Apr 21 22:45:47 2007 -0500
+++ b/debian/patches/00list	Sun Apr 22 01:39:50 2007 -0500
@@ -5,3 +5,4 @@ configure_ilbc
 configure_ilbc
 ymd5_endian
 osschan
+zaptel-header
diff -r eb1ba09dbd92 debian/patches/zaptel-header.dpatch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/zaptel-header.dpatch	Sun Apr 22 01:39:16 2007 -0500
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## zaptel-header.dpatch by  <rodrigo at nul-unu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debian's zaptel-source package places zaptel.h in
+## DP: /usr/include/zaptel, instead of /usr/include/linux
+
+ at DPATCH@
+diff -urNad yate-1.1.0-1.dfsg~/configure yate-1.1.0-1.dfsg/configure
+--- yate-1.1.0-1.dfsg~/configure	2007-04-22 01:34:11.000000000 -0500
++++ yate-1.1.0-1.dfsg/configure	2007-04-22 01:38:01.669933500 -0500
+@@ -5544,7 +5544,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-#include <linux/zaptel.h>
++#include <zaptel/zaptel.h>
+ 
+ int
+ main ()
+diff -urNad yate-1.1.0-1.dfsg~/configure.in yate-1.1.0-1.dfsg/configure.in
+--- yate-1.1.0-1.dfsg~/configure.in	2007-04-22 01:34:11.000000000 -0500
++++ yate-1.1.0-1.dfsg/configure.in	2007-04-22 01:38:01.669933500 -0500
+@@ -294,7 +294,7 @@
+ HAVE_ZAP=no
+ AC_MSG_CHECKING([for Zaptel linux headers])
+ AC_TRY_COMPILE([
+-#include <linux/zaptel.h>
++#include <zaptel/zaptel.h>
+ ],[],
+ HAVE_ZAP="yes"
+ )
+diff -urNad yate-1.1.0-1.dfsg~/modules/zapchan.cpp yate-1.1.0-1.dfsg/modules/zapchan.cpp
+--- yate-1.1.0-1.dfsg~/modules/zapchan.cpp	2007-04-22 01:34:11.000000000 -0500
++++ yate-1.1.0-1.dfsg/modules/zapchan.cpp	2007-04-22 01:38:01.669933500 -0500
+@@ -29,7 +29,7 @@
+ #else
+ 
+ extern "C" {
+-#include <linux/zaptel.h>
++#include <zaptel/zaptel.h>
+ };
+ 
+ #include <stdio.h>
-------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-voip-maintainers/attachments/20070422/eaeec939/attachment.pgp