[Pkg-voip-commits] r5172 - in /zaptel/trunk/debian: changelog patches/00list patches/kbuild_src.dpatch patches/oslec_zaptel.dpatch rules

Mon Jan 28 15:26:59 UTC 2008

Author: tzafrir-guest
Date: Mon Jan 28 15:26:59 2008
New Revision: 5172

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5172
Log:
* kbuild_src.dpatch: A small build issue already fixed upstream.
* oslec_zaptel.dpatch: Add a compatibility function for the old
  echo_can_create() of zaptel < 1.4.8 .
* Also copy the new wcte12xp/ to the source tarball.

Added:
    zaptel/trunk/debian/patches/kbuild_src.dpatch   (with props)
Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/00list
    zaptel/trunk/debian/patches/oslec_zaptel.dpatch
    zaptel/trunk/debian/rules

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5172&op=diff
==============================================================================

--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Mon Jan 28 15:26:59 2008
@@ -9,8 +9,12 @@
   * Adapted ztcfg-start_stop.dpatch to zaptel 1.4.8 .
   * Removing xpp_m_subdirs.dpatch: merged upstream.
   * tones.h is no longer generated.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 16 Jan 2008 23:57:30 +0200
+  * kbuild_src.dpatch: A small build issue already fixed upstream.
+  * oslec_zaptel.dpatch: Add a compatibility function for the old
+    echo_can_create() of zaptel < 1.4.8 .
+  * Also copy the new wcte12xp/ to the source tarball.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 28 Jan 2008 17:26:16 +0200
 
 zaptel (1:1.4.7.1~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/00list?rev=5172&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/00list (original)
+++ zaptel/trunk/debian/patches/00list Mon Jan 28 15:26:59 2008
@@ -7,3 +7,4 @@
 ztcfg-start_stop
 zaphfc-florz
 zaptel_perl
+kbuild_src

Added: zaptel/trunk/debian/patches/kbuild_src.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/kbuild_src.dpatch?rev=5172&op=file
==============================================================================
--- zaptel/trunk/debian/patches/kbuild_src.dpatch (added)
+++ zaptel/trunk/debian/patches/kbuild_src.dpatch Mon Jan 28 15:26:59 2008
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kbuild_src.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makefiles should be included from $(src) as they are source.
+## DP: Already applied by upstream, and will be included in 1.4.9.
+
+ at DPATCH@
+diff -urNad zaptel-1.4.8~dfsg~/wct4xxp/Makefile zaptel-1.4.8~dfsg/wct4xxp/Makefile
+--- zaptel-1.4.8~dfsg~/wct4xxp/Makefile	2007-12-11 10:43:22.000000000 +0200
++++ zaptel-1.4.8~dfsg/wct4xxp/Makefile	2008-01-28 16:34:53.000000000 +0200
+@@ -2,7 +2,7 @@
+ # We only get here on kernels 2.6.0-2.6.8 .
+ # For newer kernels, Kbuild will be included directly by the kernel
+ # build system.
+-include $(obj)/Kbuild
++include $(src)/Kbuild
+ 
+ else
+ 
+diff -urNad zaptel-1.4.8~dfsg~/wctc4xxp/Makefile zaptel-1.4.8~dfsg/wctc4xxp/Makefile
+--- zaptel-1.4.8~dfsg~/wctc4xxp/Makefile	2007-12-11 10:43:22.000000000 +0200
++++ zaptel-1.4.8~dfsg/wctc4xxp/Makefile	2008-01-28 16:34:58.000000000 +0200
+@@ -2,7 +2,7 @@
+ # We only get here on kernels 2.6.0-2.6.8 .
+ # For newer kernels, Kbuild will be included directly by the kernel
+ # build system.
+-include $(obj)/Kbuild
++include $(src)/Kbuild
+ 
+ else
+ 

Propchange: zaptel/trunk/debian/patches/kbuild_src.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: zaptel/trunk/debian/patches/oslec_zaptel.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/oslec_zaptel.dpatch?rev=5172&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/oslec_zaptel.dpatch (original)
+++ zaptel/trunk/debian/patches/oslec_zaptel.dpatch Mon Jan 28 15:26:59 2008
@@ -9,17 +9,40 @@
 diff -urNad zaptel-1.4.3~dfsg~/zaptel-base.c zaptel-1.4.3~dfsg/zaptel-base.c
 --- zaptel-1.4.3~dfsg~/zaptel-base.c	2007-06-16 21:33:45.000000000 +0300
 +++ zaptel-1.4.3~dfsg/zaptel-base.c	2007-06-16 21:33:47.000000000 +0300
-@@ -424,6 +424,13 @@
+@@ -424,6 +424,14 @@
  #include "kb1ec.h"
  #elif defined(ECHO_CAN_MG2)
  #include "mg2ec.h"
 +#elif defined(ECHO_CAN_OSLEC)
 +#include "oslec/oslec.h"
-+#define echo_can_create oslec_echo_can_create
++#define echo_can_create_noparams oslec_echo_can_create
 +#define echo_can_free oslec_echo_can_free
 +#define echo_can_update oslec_echo_can_update
 +#define echo_can_traintap oslec_echo_can_traintap
 +#define echo_can_identify oslec_echo_can_identify
++#define ECHO_CAN_NO_PARAMS
  #elif defined(ECHO_CAN_JP1)
  #include "jpah.h"
  #else
+@@ -425,6 +425,21 @@
+ 	memset(conf_sums_next, 0, maxconfs * sizeof(sumtype));
+ }
+ 
++#ifdef ECHO_CAN_NO_PARAMS
++/* A wrapper to the original interface, with no parameters */
++static int echo_can_create(struct zt_echocanparams *ecp, struct zt_echocanparam *p,
++			   struct echo_can_state **ec)
++{
++	/* ignore the parameters */
++	/* TODO: maybe fail if the user passes us parameters? or at
++	 * least list their number? */
++	*ec = echo_can_create_noparams(ecp->tap_length, 0);
++	if (!ec)
++		return -EINVAL; /* an arbitrary error */
++	return 0;
++}
++#endif
++
+   /* return quiescent (idle) signalling states, for the various signalling types */
+ static int zt_q_sig(struct zt_chan *chan)
+ {

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=5172&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Mon Jan 28 15:26:59 2008
@@ -173,7 +173,8 @@
 	# driver source code
 	mkdir -p $(TARDIR)/debian/generated
 	cp Makefile Makefile.kernel26 configure install-sh makeopts.in .version *.c *.h *.rbt $(TARDIR)/
-	for dir in build_tools firmware include vzaphfc oct612x oslec wct4xxp wctc4xxp wctdm24xxp xpp; do \
+	for dir in build_tools firmware include vzaphfc oct612x oslec \
+		wct4xxp wctc4xxp wctdm24xxp wcte12xp xpp; do \
 	  if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
 	done
 	cp -a $(GENERATED_SOURCES) $(TARDIR)/debian/generated/


