[Pkg-voip-commits] r3741 - in zaptel1.2/trunk/debian: . patches
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Sat Jul 14 20:21:04 UTC 2007
Author: tzafrir-guest
Date: 2007-07-14 20:21:04 +0000 (Sat, 14 Jul 2007)
New Revision: 3741
Modified:
zaptel1.2/trunk/debian/changelog
zaptel1.2/trunk/debian/control
zaptel1.2/trunk/debian/patches/bristuff.dpatch
Log:
* Fixed dependencies.
* Updated bristuff.
Modified: zaptel1.2/trunk/debian/changelog
===================================================================
--- zaptel1.2/trunk/debian/changelog 2007-07-14 19:43:31 UTC (rev 3740)
+++ zaptel1.2/trunk/debian/changelog 2007-07-14 20:21:04 UTC (rev 3741)
@@ -1,7 +1,7 @@
zaptel1.2 (1:1.2.18~dfsg-1) UNRELEASED; urgency=low
* New upstream release.
- * Bristuff 0.3.0-PRE-1y-g .
+ * Bristuff 0.3.0-PRE-1y-h .
* There shouldn't be a conflict between this package and the zaptel-source
of 1.4 (different location for headers).
* The modules packages should provide zaptel-modules (whatever this means).
Modified: zaptel1.2/trunk/debian/control
===================================================================
--- zaptel1.2/trunk/debian/control 2007-07-14 19:43:31 UTC (rev 3740)
+++ zaptel1.2/trunk/debian/control 2007-07-14 20:21:04 UTC (rev 3741)
@@ -34,7 +34,7 @@
Section: libdevel
Architecture: any
Depends: libtonezone1.2 (= ${Source-Version})
-Depends: libtonezone1 (= ${Source-Version})
+Conflicts: libtonezone1-dev
Description: tonezone library (development)
A library for generating tones used for telephone signalling.
.
@@ -45,7 +45,7 @@
Architecture: all
Depends: debhelper (>> 4.0), module-assistant (>= 0.8.1), bzip2
Recommends: zaptel1.2
-Conflicts: zaptel-source (<< 1.4.0-1)
+Conflicts: zaptel-source (<< 1:1.4.0-1)
Suggests: rtai-source
Description: Zapata telephony interface (source code for kernel driver)
This package contains the source code for zaptel kernel module providing
Modified: zaptel1.2/trunk/debian/patches/bristuff.dpatch
===================================================================
--- zaptel1.2/trunk/debian/patches/bristuff.dpatch 2007-07-14 19:43:31 UTC (rev 3740)
+++ zaptel1.2/trunk/debian/patches/bristuff.dpatch 2007-07-14 20:21:04 UTC (rev 3741)
@@ -8,9 +8,9 @@
## DP: Version: bristuff-0.3.0-PRE-1y-g
@DPATCH@
-diff -urN zaptel-1.2.17.1.orig/zaptel-base.c zaptel-1.2.17.1/zaptel-base.c
---- zaptel-1.2.17.1.orig/zaptel-base.c 2007-04-25 17:35:34.000000000 +0200
-+++ zaptel-1.2.17.1/zaptel-base.c 2007-04-29 10:21:42.782123674 +0200
+diff -urN zaptel-1.2.18.orig/zaptel-base.c zaptel-1.2.18/zaptel-base.c
+--- zaptel-1.2.18.orig/zaptel-base.c 2007-05-18 17:48:55.000000000 +0200
++++ zaptel-1.2.18/zaptel-base.c 2007-06-25 10:58:18.405047656 +0200
@@ -138,6 +138,7 @@
EXPORT_SYMBOL(zt_qevent_lock);
EXPORT_SYMBOL(zt_hooksig);
@@ -30,7 +30,7 @@
for (x=1;x<ZT_MAX_CHANNELS;x++) {
if (chans[x]) {
-@@ -2781,6 +2786,30 @@
+@@ -2780,6 +2785,30 @@
}
}
@@ -61,7 +61,7 @@
#define VALID_SPAN(j) do { \
if ((j >= ZT_MAX_SPANS) || (j < 1)) \
return -EINVAL; \
-@@ -5095,11 +5124,40 @@
+@@ -5094,11 +5123,40 @@
*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
}
bytes -= left;
@@ -102,7 +102,7 @@
}
/* Check buffer status */
if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -5144,6 +5202,17 @@
+@@ -5143,6 +5201,17 @@
/* Transmit a flag if this is an HDLC channel */
if (ms->flags & ZT_FLAG_HDLC)
fasthdlc_tx_frame_nocheck(&ms->txhdlc);
@@ -120,7 +120,16 @@
#ifdef CONFIG_ZAPATA_NET
if (ms->flags & ZT_FLAG_NETDEV)
netif_wake_queue(ztchan_to_dev(ms));
-@@ -5200,6 +5269,12 @@
+@@ -5153,7 +5222,7 @@
+ tasklet_schedule(&ms->ppp_calls);
+ }
+ #endif
+- }
++ }
+ } else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
+ left = ms->curtone->tonesamples - ms->tonep;
+ if (left > bytes)
+@@ -5199,6 +5268,12 @@
memset(txb, 0xFF, bytes);
}
bytes = 0;
@@ -133,7 +142,7 @@
} else {
memset(txb, ZT_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */
bytes = 0;
-@@ -5993,6 +6068,13 @@
+@@ -5992,6 +6067,13 @@
int left, x;
int bytes = ZT_CHUNKSIZE;
@@ -147,7 +156,7 @@
while(bytes) {
#if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP)
-@@ -6051,6 +6133,19 @@
+@@ -6050,6 +6132,19 @@
}
}
}
@@ -167,9 +176,9 @@
} else {
/* Not HDLC */
memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -urN zaptel-1.2.17.1.orig/zaptel.h zaptel-1.2.17.1/zaptel.h
---- zaptel-1.2.17.1.orig/zaptel.h 2007-04-24 20:33:29.000000000 +0200
-+++ zaptel-1.2.17.1/zaptel.h 2007-04-29 10:21:42.786124621 +0200
+diff -urN zaptel-1.2.18.orig/zaptel.h zaptel-1.2.18/zaptel.h
+--- zaptel-1.2.18.orig/zaptel.h 2007-04-24 20:33:29.000000000 +0200
++++ zaptel-1.2.18/zaptel.h 2007-06-25 10:58:18.409048603 +0200
@@ -1046,6 +1046,13 @@
int do_ppp_error;
struct sk_buff_head ppp_rq;
@@ -225,9 +234,9 @@
/* Initialize a tone state */
void zt_init_tone_state(struct zt_tone_state *ts, struct zt_tone *zt);
-diff -urN zaptel-1.2.17.1.orig/zconfig.h zaptel-1.2.17.1/zconfig.h
---- zaptel-1.2.17.1.orig/zconfig.h 2007-04-24 20:33:29.000000000 +0200
-+++ zaptel-1.2.17.1/zconfig.h 2007-04-29 10:21:42.786124621 +0200
+diff -urN zaptel-1.2.18.orig/zconfig.h zaptel-1.2.18/zconfig.h
+--- zaptel-1.2.18.orig/zconfig.h 2007-04-24 20:33:29.000000000 +0200
++++ zaptel-1.2.18/zconfig.h 2007-06-25 10:58:18.409048603 +0200
@@ -53,11 +53,11 @@
/* #define ECHO_CAN_MARK */
/* #define ECHO_CAN_MARK2 */
@@ -253,9 +262,9 @@
+#define CONFIG_ZAPATA_BRI_DCHANS
+
#endif
-diff -urN zaptel-1.2.17.1.orig/ztcfg.c zaptel-1.2.17.1/ztcfg.c
---- zaptel-1.2.17.1.orig/ztcfg.c 2007-01-31 20:01:33.000000000 +0100
-+++ zaptel-1.2.17.1/ztcfg.c 2007-04-29 10:21:42.806129356 +0200
+diff -urN zaptel-1.2.18.orig/ztcfg.c zaptel-1.2.18/ztcfg.c
+--- zaptel-1.2.18.orig/ztcfg.c 2007-01-31 20:01:33.000000000 +0100
++++ zaptel-1.2.18/ztcfg.c 2007-06-25 10:58:18.413049550 +0200
@@ -90,6 +90,10 @@
static int stopmode = 0;
@@ -363,9 +372,9 @@
}
}
}
-diff -urN zaptel-1.2.17.1.orig/ztpty.c zaptel-1.2.17.1/ztpty.c
---- zaptel-1.2.17.1.orig/ztpty.c 1970-01-01 01:00:00.000000000 +0100
-+++ zaptel-1.2.17.1/ztpty.c 2007-04-29 10:21:42.806129356 +0200
+diff -urN zaptel-1.2.18.orig/ztpty.c zaptel-1.2.18/ztpty.c
+--- zaptel-1.2.18.orig/ztpty.c 1970-01-01 01:00:00.000000000 +0100
++++ zaptel-1.2.18/ztpty.c 2007-06-25 10:58:18.413049550 +0200
@@ -0,0 +1,112 @@
+#include <stdio.h>
+#include <stdlib.h>
More information about the Pkg-voip-commits
mailing list