[Pkg-voip-commits] r2625 - in zaptel/branches/sarge/debian: .
patches
Kilian Krause
kilian at costa.debian.org
Tue Oct 24 07:26:18 UTC 2006
Author: kilian
Date: 2006-10-24 07:26:17 +0000 (Tue, 24 Oct 2006)
New Revision: 2625
Added:
zaptel/branches/sarge/debian/patches/dbug391840.dpatch
zaptel/branches/sarge/debian/patches/wct4xxp-dfsg.dpatch
zaptel/branches/sarge/debian/patches/zaptelh_14.dpatch
zaptel/branches/sarge/debian/zaptel-source.links
Removed:
zaptel/branches/sarge/debian/patches/dfsg_firmwarefree.dpatch
zaptel/branches/sarge/debian/zaptel-modules.postinst
zaptel/branches/sarge/debian/zaptel-modules.postrm
zaptel/branches/sarge/debian/zaptel-source.postinst
Modified:
zaptel/branches/sarge/debian/changelog
zaptel/branches/sarge/debian/control
zaptel/branches/sarge/debian/copyright
zaptel/branches/sarge/debian/libtonezone-dev.links
zaptel/branches/sarge/debian/patches/00list
zaptel/branches/sarge/debian/patches/Makefile_bristuff.dpatch
zaptel/branches/sarge/debian/patches/Makefile_uname.dpatch
zaptel/branches/sarge/debian/patches/Makefile_vzaphfc.dpatch
zaptel/branches/sarge/debian/rules
zaptel/branches/sarge/debian/watch
Log:
update sarge backport.
Modified: zaptel/branches/sarge/debian/changelog
===================================================================
--- zaptel/branches/sarge/debian/changelog 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/changelog 2006-10-24 07:26:17 UTC (rev 2625)
@@ -1,11 +1,46 @@
-zaptel (1:1.2.8.dfsg-1) UNRELEASED; urgency=low
+zaptel (1:1.2.10.dfsg-2) UNRELEASED; urgency=low
+ * NOT RELEASED YET
+
+ -- Mark Purcell <msp at debian.org> Sun, 22 Oct 2006 20:37:40 +0100
+
+zaptel (1:1.2.10.dfsg-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Mark Purcell <msp at debian.org> Sun, 22 Oct 2006 20:27:19 +0100
+
+zaptel (1:1.2.9.1.dfsg-2) unstable; urgency=low
+
+ [ Tzafrir Cohen ]
+ * zaptel 1.4 compatibility changes:
+ - place zaptel.h and tonezone.h in /usr/include/zaptel (through symlinks)
+ - zaptelh_14.dpatch: declare some zaptel 1.4 interfaces (not implemented
+ anywhere, though).
+
+ [ Mark Purcell ]
+ * debian/rules patch from Robert Millan
+ - the package doesn't compile (Closes: #390903)
+ * add debian/patches/dbug391840.dpatch
+ - ztcfg segfaults because of -O4 (Closes: #391840)
+ * add debian/patches/wct4xxp-dfsg.dpatch
+ - wct4xxp and other modules are not built anymore on zaptel-
+ 1.2.8.dfsg-1 (Closes: #388756)
+
+ -- Mark Purcell <msp at debian.org> Tue, 10 Oct 2006 09:36:58 +1000
+
+zaptel (1:1.2.9.1.dfsg-1) unstable; urgency=low
+
* New Upstream Release
- * Adjust dpatches: Makefile_uname.dpatch, Makefile_vzaphfc.dpatch
- * bristuff 0.3.0-PRE1s
- * The bristuff patch sets the default echo canceller to MG2
- (Which is Digium's recommendation anyway)
+ * firmware removed from wct4xxp/OCT6114-128D.ima
+ * Lintian cleanup; spelling-error-in-copyright
+ -- Mark Purcell <msp at debian.org> Sat, 23 Sep 2006 13:58:15 +0100
+
+zaptel (1:1.2.8.dfsg-1) unstable; urgency=low
+
+ * New Upstream Release
+
-- Mark Purcell <msp at debian.org> Wed, 23 Aug 2006 07:30:22 +0100
zaptel (1:1.2.7.dfsg-4) unstable; urgency=low
@@ -23,6 +58,10 @@
* Simplified vzaphfc patch.
[ Mark Purcell ]
+ * Build-Depends: debhelper (>= 5.0.37) and dh_installmodules makes
+ zaptel-source.postinst & zaptel-modules.post{inst,rm} obsolete
+ Fixes: postinst/postrm depmod -- update templates to use dh_installmodules
+ instead (Closes: #381754)
* postinst failure (Closes: #361312)
* zaptel-modules from testing don't compile on Sarge (Closes: #376719)
* pciradio.c:1810: error: syntax error before string constant (Closes:
@@ -30,7 +69,7 @@
* Can't recompile zaptel modules on Sarge (Closes: #375581)
* zaptel-modules from testing don't compile on Sarge (Closes: #376719)
- -- Mark Purcell <msp at debian.org> Thu, 10 Aug 2006 22:51:10 +0100
+ -- Mark Purcell <msp at debian.org> Thu, 10 Aug 2006 23:39:58 +0100
zaptel (1:1.2.7.dfsg-2) unstable; urgency=low
Modified: zaptel/branches/sarge/debian/control
===================================================================
--- zaptel/branches/sarge/debian/control 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/control 2006-10-24 07:26:17 UTC (rev 2625)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Santiago Ruano Rincón <santiago at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Build-Depends: debhelper (>> 4.0.4), libnewt-dev, dpatch (>= 2.0.9), bzip2, libusb-dev
+Build-Depends: debhelper (>= 5.0.37), dpatch (>= 2.0.9), bzip2, libusb-dev
Standards-Version: 3.6.2
Package: zaptel
Modified: zaptel/branches/sarge/debian/copyright
===================================================================
--- zaptel/branches/sarge/debian/copyright 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/copyright 2006-10-24 07:26:17 UTC (rev 2625)
@@ -6,8 +6,7 @@
Upstream source has been modified to comply with the Debian Free
Software Guildlines (DFSG), by the removal of the firmware files:
- OCT6114-128D.ima
- xpp/utils/*.hex
+ wct4xxp/OCT6114-128D.ima
xpp/LICENSE.firmware permits redistribution but does not mention
modification, which is a requirement of Debian Policy 2.1 ("Derived works").
@@ -64,6 +63,7 @@
*
* Modify from wctdm.c by MiaoLin<miaolin at openvox.com.cn>
-opvxa1200.c is not available for download from the author's site yet
-(it is distributed with the CD that is included with the product).
-Author promisses to set up a public mirror soon.
+opvxa1200.c is available for download from
+http://www.openvox.com.cn/members_downloads.php
+(requires no login. Does require javascript)
+
Modified: zaptel/branches/sarge/debian/libtonezone-dev.links
===================================================================
--- zaptel/branches/sarge/debian/libtonezone-dev.links 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/libtonezone-dev.links 2006-10-24 07:26:17 UTC (rev 2625)
@@ -1,2 +1,2 @@
usr/lib/libtonezone.so.1.0 usr/lib/libtonezone.so
-
+usr/include/tonezone/tonezone.h usr/include/zaptel/tonezone.h
Modified: zaptel/branches/sarge/debian/patches/00list
===================================================================
--- zaptel/branches/sarge/debian/patches/00list 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/patches/00list 2006-10-24 07:26:17 UTC (rev 2625)
@@ -1,5 +1,3 @@
-dfsg_firmwarefree.dpatch
-#Makefile_deps_kern
Makefile_deps_utils
Makefile_uname
Makefile_targets
@@ -12,4 +10,6 @@
bristuff
bristuff_local_zaptelh
Makefile_vzaphfc.dpatch
-
+zaptelh_14
+wct4xxp-dfsg.dpatch
+dbug391840.dpatch
Modified: zaptel/branches/sarge/debian/patches/Makefile_bristuff.dpatch
===================================================================
--- zaptel/branches/sarge/debian/patches/Makefile_bristuff.dpatch 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/patches/Makefile_bristuff.dpatch 2006-10-24 07:26:17 UTC (rev 2625)
@@ -6,21 +6,22 @@
## DP: Also adds two unrelated modules: opvxa1200
@DPATCH@
-diff -urNad zaptel-1.2.5/Makefile /tmp/dpep.INsmJ5/zaptel-1.2.5/Makefile
---- zaptel-1.2.5/Makefile 2006-05-09 20:59:48.000000000 +0300
-+++ /tmp/dpep.INsmJ5/zaptel-1.2.5/Makefile 2006-05-09 21:00:34.000000000 +0300
-@@ -144,6 +144,10 @@
- MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
- ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
- ztd-loc # wct4xxp ztdummy
-+
+diff -urNad zaptel-1.2.9.1.dfsg~/Makefile zaptel-1.2.9.1.dfsg/Makefile
+--- zaptel-1.2.9.1.dfsg~/Makefile 2006-09-23 13:48:37.000000000 +0100
++++ zaptel-1.2.9.1.dfsg/Makefile 2006-09-23 13:48:37.000000000 +0100
+@@ -129,6 +129,11 @@
+ MODULES+=ztdummy
+ endif
+
+BRIMODS=cwain qozap zaphfc ztgsm
+MODULES+=$(BRIMODS)
+MODULES+=opvxa1200
- #MODULES+=wcfxsusb
- # build ztdummy by default for 2.6 kernels
- ifeq (${BUILDVER},linux26)
-@@ -182,6 +185,8 @@
++BINS+=ztpty
++
+ MODULESO:=$(MODULES:%=%.o)
+ MODULESKO:=$(MODULES:%=%.ko)
+ ifeq ($(BUILDVER),linux26)
+@@ -164,6 +169,8 @@
usbfxstest fxstest fxotune fxsdump ztdiag
UTILSO:=$(UTILS:%=%.o)
@@ -29,7 +30,7 @@
all: modules $(LIBTONEZONE_SO)
programs: $(BINS) $(LIBTONEZONE_SO)
-@@ -235,6 +239,29 @@
+@@ -209,6 +216,28 @@
ztdummy.o: ztdummy.h
@@ -55,7 +56,6 @@
+cwain.%: cwain/cwain.%
+ cp $^ $@
+
-+
- $(filter-out wct4xxp.o,$(MODULESO)) wct4xxp_base.o: %.o: %.c zaptel.h
+ $(MODULESO): %.o: %.c zaptel.h
$(CC) $(KFLAGS) -o $@ -c $<
Modified: zaptel/branches/sarge/debian/patches/Makefile_uname.dpatch
===================================================================
--- zaptel/branches/sarge/debian/patches/Makefile_uname.dpatch 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/patches/Makefile_uname.dpatch 2006-10-24 07:26:17 UTC (rev 2625)
@@ -8,10 +8,10 @@
## DP: no. 2.6.2-4) and will also consider 2.5 as linux26 BUILDVER .
@DPATCH@
-diff -urNad zaptel-1.2.0-rc1~/Makefile zaptel-1.2.0-rc1/Makefile
---- zaptel-1.2.0-rc1~/Makefile 2005-11-09 21:22:00.000000000 +0000
-+++ zaptel-1.2.0-rc1/Makefile 2005-11-09 21:24:20.000000000 +0000
-@@ -7,6 +7,11 @@
+diff -urNad zaptel-1.2.9.1.dfsg~/Makefile zaptel-1.2.9.1.dfsg/Makefile
+--- zaptel-1.2.9.1.dfsg~/Makefile 2006-09-23 13:40:07.000000000 +0100
++++ zaptel-1.2.9.1.dfsg/Makefile 2006-09-23 13:42:13.000000000 +0100
+@@ -9,6 +9,11 @@
HOSTCC=gcc
PWD:=$(shell pwd)
@@ -23,14 +23,14 @@
# If you want to build for a kernel other than the current kernel, set KVERS
ifndef KVERS
KVERS:=$(shell uname -r)
-@@ -19,11 +24,16 @@
- KSRC:=$(shell for dir in $(KSRC_SEARCH_PATH); do if [ -d $$dir ]; then echo $dir; break; fi; done)
+@@ -21,11 +26,16 @@
+ KSRC:=$(shell for dir in $(KSRC_SEARCH_PATH); do if [ -d $$dir ]; then echo $$dir; break; fi; done)
endif
endif
+KVERS_MAJ:=$(shell echo $(KVERS) | cut -d. -f1-2)
KINCLUDES:=$(KSRC)/include
- CFLAGS+=-I. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+ CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
-CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
+ifneq (,$(findstring ppc,$(UNAME_M)))
@@ -40,9 +40,9 @@
+CFLAGS_X86-64:=-m64
+endif
CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
- LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
- KFLAGS=-I$(KINCLUDES) -O6
-@@ -32,9 +42,15 @@
+ LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
+ KFLAGS:=-I$(KINCLUDES) -O6
+@@ -34,9 +44,15 @@
ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
endif
@@ -60,8 +60,8 @@
#
# Features are now configured in zconfig.h
-@@ -49,10 +65,10 @@
- CONFIG_FILE=$(INSTALL_PREFIX)/etc/zaptel.conf
+@@ -53,10 +69,10 @@
+ CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf
CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
-ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
@@ -73,4 +73,4 @@
+ BUILDVER:=linux26
endif
- ifeq ($(BUILDVER),linux26)
+ ifeq ($(BUILDVER),linux24)
Modified: zaptel/branches/sarge/debian/patches/Makefile_vzaphfc.dpatch
===================================================================
--- zaptel/branches/sarge/debian/patches/Makefile_vzaphfc.dpatch 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/patches/Makefile_vzaphfc.dpatch 2006-10-24 07:26:17 UTC (rev 2625)
@@ -5,16 +5,14 @@
## DP: Add vzaphfc to linux-2.6 modules
@DPATCH@
-diff -urN zaptel/Makefile zaptel.tmp/Makefile
---- zaptel/Makefile 2006-08-01 14:28:39.000000000 +0000
-+++ zaptel.tmp/Makefile 2006-08-03 11:26:34.000000000 +0000
-@@ -142,7 +142,8 @@
- MOD_DESTDIR:=zaptel
-
- EXTRA_CFLAGS:=-I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api
+diff -urNad zaptel-1.2.9.1.dfsg~/Makefile zaptel-1.2.9.1.dfsg/Makefile
+--- zaptel-1.2.9.1.dfsg~/Makefile 2006-10-09 10:31:49.000000000 +1000
++++ zaptel-1.2.9.1.dfsg/Makefile 2006-10-09 10:32:29.000000000 +1000
+@@ -151,6 +151,7 @@
+
obj-m:=$(MODULESO)
+ obj-m+=wct4xxp/
+obj-m += vzaphfc/
- wct4xxp-objs:=wct4xxp_base.o vpm450m.o
# Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only
-
+ # for i386. On other archs the module will probably build but panic.
Added: zaptel/branches/sarge/debian/patches/dbug391840.dpatch
===================================================================
--- zaptel/branches/sarge/debian/patches/dbug391840.dpatch (rev 0)
+++ zaptel/branches/sarge/debian/patches/dbug391840.dpatch 2006-10-24 07:26:17 UTC (rev 2625)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dbug391840.dpatch by <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes: Bug#391840: ztcfg segfaults because of -O4
+## DP: http://bugs.debian.org/391840
+
+ at DPATCH@
+diff -urNad zaptel-1.2.9.1.dfsg~/debian/rules zaptel-1.2.9.1.dfsg/debian/rules
+--- zaptel-1.2.9.1.dfsg~/debian/rules 2006-10-09 12:52:10.000000000 +1000
++++ zaptel-1.2.9.1.dfsg/debian/rules 2006-10-09 12:56:32.000000000 +1000
+@@ -12,6 +12,8 @@
+
+ -include /usr/share/dpatch/dpatch.make
+
++export CFLAGS += -fno-inline-functions
++
+ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+ endif
+diff -urNad zaptel-1.2.9.1.dfsg~/ztcfg.c zaptel-1.2.9.1.dfsg/ztcfg.c
+--- zaptel-1.2.9.1.dfsg~/ztcfg.c 2006-02-01 13:33:54.000000000 +1100
++++ zaptel-1.2.9.1.dfsg/ztcfg.c 2006-10-09 12:56:32.000000000 +1000
+@@ -929,6 +929,8 @@
+ if (ind_ioctl(x,fd,ZT_RADIO_GETPARAM,&p) == -1)
+ error("Cannot get number of tones for channel %d\n",x);
+ n = p.data;
++ if (n > NUM_TONES)
++ error("Too many tones for channel %d: %d\n",x,n);
+ p.radpar = ZT_RADPAR_INITTONE;
+ if (ind_ioctl(x,fd,ZT_RADIO_SETPARAM,&p) == -1)
+ error("Cannot init tones for channel %d\n",x);
Property changes on: zaptel/branches/sarge/debian/patches/dbug391840.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: zaptel/branches/sarge/debian/patches/dfsg_firmwarefree.dpatch
===================================================================
--- zaptel/branches/sarge/debian/patches/dfsg_firmwarefree.dpatch 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/patches/dfsg_firmwarefree.dpatch 2006-10-24 07:26:17 UTC (rev 2625)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dfsg_firmwarefree.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove wct4xxp module due to lack of firmware to compile the *.h
-
- at DPATCH@
-diff -urNad zaptel-1.2.7.dfsg~/Makefile zaptel-1.2.7.dfsg/Makefile
---- zaptel-1.2.7.dfsg~/Makefile 2006-07-07 18:03:59.000000000 +0000
-+++ zaptel-1.2.7.dfsg/Makefile 2006-08-03 11:43:21.000000000 +0000
-@@ -98,8 +98,8 @@
- LIBTONEZONE_SO_MINOR_VER:=0
-
- MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
-- ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
-- ztd-loc # ztdummy
-+ ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
-+ ztd-loc # wct4xxp ztdummy
- #MODULES+=wcfxsusb
- # build ztdummy by default for 2.6 kernels
- ifeq ($(BUILDVER),linux26)
-@@ -131,9 +131,9 @@
-
- all: $(BUILDVER) $(LIBTONEZONE_SO)
-
--linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
-+linux24: prereq $(MODULESO) $(BINS)
-
--linux26: prereq vpm450m_fw.h $(BINS)
-+linux26: prereq $(BINS)
- @echo $(KSRC)
- @if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
- $(KMAKE) modules
Added: zaptel/branches/sarge/debian/patches/wct4xxp-dfsg.dpatch
===================================================================
--- zaptel/branches/sarge/debian/patches/wct4xxp-dfsg.dpatch (rev 0)
+++ zaptel/branches/sarge/debian/patches/wct4xxp-dfsg.dpatch 2006-10-24 07:26:17 UTC (rev 2625)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wct4xxp-dfsg.dpatch by <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch builds the wct4xxp module without firmware support
+## DP: The module is completely usable without the firmware, as long
+## DP: as the user does not have the optional Octasic module on their
+## DP: TE4XXP card (and most users do not have those modules).
+
+ at DPATCH@
+diff -urNad trunk~/wct4xxp/Kbuild trunk/wct4xxp/Kbuild
+--- trunk~/wct4xxp/Kbuild 2006-08-27 12:02:42.000000000 +1000
++++ trunk/wct4xxp/Kbuild 2006-10-09 13:14:30.000000000 +1000
+@@ -12,7 +12,7 @@
+ $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
+ $(obj)/base.o: $(src)/../zaptel.h
+
+-$(obj)/vpm450m.o: $(obj)/vpm450m_fw.h $(src)/vpm450m.h
++$(obj)/vpm450m.o: $(src)/vpm450m.h
+ $(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
+
+ $(obj)/vpm450m_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h
Property changes on: zaptel/branches/sarge/debian/patches/wct4xxp-dfsg.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: zaptel/branches/sarge/debian/patches/zaptelh_14.dpatch
===================================================================
--- zaptel/branches/sarge/debian/patches/zaptelh_14.dpatch (rev 0)
+++ zaptel/branches/sarge/debian/patches/zaptelh_14.dpatch 2006-10-24 07:26:17 UTC (rev 2625)
@@ -0,0 +1,153 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## zaptelh_14.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New interfaces of zaptel 1.4. This allows building asterisk 1.4
+
+ at DPATCH@
+diff -urNad zaptel-1.2.9.1.dfsg~/zaptel.h zaptel-1.2.9.1.dfsg/zaptel.h
+--- zaptel-1.2.9.1.dfsg~/zaptel.h 2006-10-08 00:15:11.000000000 +0200
++++ zaptel-1.2.9.1.dfsg/zaptel.h 2006-10-08 00:16:47.000000000 +0200
+@@ -115,6 +115,7 @@
+ #define ZT_SIG_DACS (__ZT_SIG_DACS | ZT_SIG_CLEAR) /* Cross connect */
+ #define ZT_SIG_EM_E1 (1 << 17) /* E1 E&M Variation */
+ #define ZT_SIG_DACS_RBS ((1 << 18) | __ZT_SIG_DACS) /* Cross connect w/ RBS */
++#define ZT_SIG_HARDHDLC ((1 << 19) | ZT_SIG_CLEAR)
+
+ /* tone flag values */
+ #define ZT_REVERSE_RXTONE 1 /* reverse polarity rx tone logic */
+@@ -666,6 +667,11 @@
+ */
+ #define ZT_SETPOLARITY _IOW (ZT_CODE, 92, int)
+
++/*
++ * Transcoder operations
++ */
++#define ZT_TRANSCODE_OP _IOWR(ZT_CODE, 93, int)
++
+ /*
+ * Startup or Shutdown a span
+ */
+@@ -690,11 +696,88 @@
+ #define ZT_TONE_STUTTER 10
+ #define ZT_TONE_MAX 16
+
++#define ZT_TONE_DTMF_BASE 64
++
++/*
++ * These must be in the same order as the dtmf_tones array in tones.h
++ */
++enum {
++ ZT_TONE_DTMF_0 = ZT_TONE_DTMF_BASE,
++ ZT_TONE_DTMF_1,
++ ZT_TONE_DTMF_2,
++ ZT_TONE_DTMF_3,
++ ZT_TONE_DTMF_4,
++ ZT_TONE_DTMF_5,
++ ZT_TONE_DTMF_6,
++ ZT_TONE_DTMF_7,
++ ZT_TONE_DTMF_8,
++ ZT_TONE_DTMF_9,
++ ZT_TONE_DTMF_s,
++ ZT_TONE_DTMF_p,
++ ZT_TONE_DTMF_A,
++ ZT_TONE_DTMF_B,
++ ZT_TONE_DTMF_C,
++ ZT_TONE_DTMF_D
++};
++
++#define ZT_TONE_DTMF_MAX ZT_TONE_DTMF_D
++
+ #define ZT_MAX_CADENCE 16
+
+ #define ZT_TONEDETECT_ON (1 << 0) /* Detect tones */
+ #define ZT_TONEDETECT_MUTE (1 << 1) /* Mute audio in received channel */
+
++#define ZT_TRANSCODE_MAGIC 0x74a9c0de
++
++/* Operations */
++#define ZT_TCOP_RESET 1 /* Reset the channel state / codec selection */
++#define ZT_TCOP_TRANSCODE 2 /* Begin transcoding a block */
++#define ZT_TCOP_GETINFO 3 /* Get information (use zt_transcode_info) */
++
++typedef struct zt_transcode_info {
++ unsigned int op;
++ unsigned int tcnum;
++ char name[80];
++ unsigned int srcfmts;
++ unsigned int dstfmts;
++} ZT_TRANSCODE_INFO;
++
++#define ZT_TCCONF_USETS (1 << 0) /* Use/update timestamp field */
++#define ZT_TCCONF_USESEQ (1 << 1) /* Use/update seqno field */
++
++#define ZT_TCSTAT_DSTRDY (1 << 0) /* Destination data is ready */
++#define ZT_TCSTAT_DSTBUSY (1 << 1) /* Destination data is outstanding */
++
++#define __ZT_TRANSCODE_BUFSIZ 16384
++#define ZT_TRANSCODE_HDRLEN 256
++#define ZT_TRANSCODE_BUFSIZ ((__ZT_TRANSCODE_BUFSIZ) - (ZT_TRANSCODE_HDRLEN))
++#define ZT_TRANSCODE_DSTOFFSET (((ZT_TRANSCODE_BUFSIZ) / 2) + ZT_TRANSCODE_HDRLEN)
++#define ZT_TRANSCODE_SRCOFFSET (((ZT_TRANSCODE_BUFSIZ) / 2) + ZT_TRANSCODE_HDRLEN)
++
++typedef struct zt_transcode_header {
++ unsigned int srcfmt; /* See formats.h -- use TCOP_RESET when you change */
++ unsigned int srcoffset; /* In bytes -- written by user */
++ unsigned int srclen; /* In bytes -- written by user */
++ unsigned int srctimestamp; /* In samples -- written by user (only used if ZT_TCCONF_USETS is set) */
++ unsigned int srcseqno; /* In units -- written by user (only used if ZT_TCCONF_USESEQ is set) */
++
++ unsigned int dstfmt; /* See formats.h -- use TCOP_RESET when you change */
++ unsigned int dstoffset; /* In bytes -- written by user */
++ unsigned int dsttimestamp; /* In samples -- read by user */
++ unsigned int dstseqno; /* In units -- read by user (only used if ZT_TCCONF_USESEQ is set) */
++ unsigned int dstlen; /* In bytes -- read by user */
++ unsigned int dstsamples; /* In timestamp units -- read by user */
++
++ unsigned int magic; /* Magic value -- ZT_TRANSCODE_MAGIC, read by user */
++ unsigned int config; /* Read/write by user */
++ unsigned int status; /* Read/write by user */
++
++ /* XXX: fix this to automatically calculate somehow */
++ unsigned char userhdr[ZT_TRANSCODE_HDRLEN - (sizeof(unsigned int) * 14)]; /* Storage for user parameters */
++ unsigned char srcdata[ZT_TRANSCODE_BUFSIZ / 2]; /* Storage of source data */
++ unsigned char dstdata[ZT_TRANSCODE_BUFSIZ / 2]; /* Storage of destination data */
++} ZT_TRANSCODE_HEADER;
++
+ struct zt_ring_cadence {
+ int ringcadence [ZT_MAX_CADENCE];
+ };
+@@ -1360,6 +1443,33 @@
+ #endif
+ };
+
++struct zt_transcoder_channel {
++ void *pvt;
++ struct zt_transcoder *parent;
++ wait_queue_head_t ready;
++ int errorstatus;
++ int offset;
++ unsigned int flags;
++ unsigned int srcfmt;
++ unsigned int dstfmt;
++ struct zt_transcode_header *tch;
++};
++
++#define ZT_TC_FLAG_BUSY (1 << 0)
++#define ZT_TC_FLAG_TRANSIENT (1 << 1)
++
++
++struct zt_transcoder {
++ struct zt_transcoder *next;
++ char name[80];
++ int numchannels;
++ unsigned int srcfmts;
++ unsigned int dstfmts;
++ int (*operation)(struct zt_transcoder_channel *channel, int op);
++ /* Transcoder channels */
++ struct zt_transcoder_channel channels[0];
++};
++
+ #define ZT_WATCHDOG_NOINTS (1 << 0)
+
+ #define ZT_WATCHDOG_INIT 1000
Property changes on: zaptel/branches/sarge/debian/patches/zaptelh_14.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: zaptel/branches/sarge/debian/rules
===================================================================
--- zaptel/branches/sarge/debian/rules 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/rules 2006-10-24 07:26:17 UTC (rev 2625)
@@ -8,6 +8,7 @@
# This is the debhelper compatibility version to use.
export DH_COMPAT=4
USE_BRISTUFF=1
+export HOTPLUG_FIRMWARE=1
-include /usr/share/dpatch/dpatch.make
@@ -52,20 +53,14 @@
make install-modules KERNELRELEASE=$(KVERS) INSTALL_PREFIX=$(CURDIR)/debian/$(PKGNAME)
ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
# The 2.6 modules are way too big. This is only in kernel 2.6
- find $(CURDIR)/debian/$(PKGNAME)/lib/modules -name '*.ko' |xargs strip -g
+ find debian/$(PKGNAME)/lib/modules -name '*.ko' |xargs strip -g
endif
- rm -f $(CURDIR)/debian/$(PKGNAME)/lib/modules/*/modules.*
# dh_installdocs
dh_installdebconf
dh_installchangelogs
dh_compress
dh_fixperms
dh_installdeb
- # Note: I don't want to edit the file in the debian/ directory itself.
- # I figure that there must be existing fuctionality in dpkg/debhelper. How?
- sed -i -e 's/_KVERS_/$(KVERS)/' \
- debian/$(PKGNAME)/DEBIAN/postinst \
- debian/$(PKGNAME)/DEBIAN/postrm
dh_gencontrol -- -v$(VERSION)
dh_md5sums
dh_builddeb --destdir=$(DEB_DESTDIR)
@@ -135,7 +130,7 @@
# driver source code
mkdir -p $(TARDIR)/debian
cp Makefile .version *.c *.h *.rbt $(TARDIR)/
- for dir in build_tools include cwain qozap vzaphfc xpp zaphfc ztgsm; do \
+ for dir in build_tools include cwain qozap vzaphfc oct612x wct4xxp xpp zaphfc ztgsm; do \
if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
done
dh_install -i zaptel.h torisa.h usr/include/linux/
@@ -145,9 +140,6 @@
debian/control \
debian/control.modules.in \
$(TARDIR)/debian/
- mv $(TARDIR)/debian/zaptel-modules.postinst $(TARDIR)/debian/postinst
- cp debian/zaptel-modules.postinst $(TARDIR)/debian/postinst
- cp debian/zaptel-modules.postrm $(TARDIR)/debian/postrm
tar cjf debian/$(PREFIX)-source/usr/src/$(PREFIX).tar.bz2 \
-C $(TARPARDIR) modules
@@ -225,6 +217,7 @@
@@cd ../tarballs/zaptel-$(UPVERSION).tmp ; \
tar xfz ../$(UPFILENAME)
@@rm -rf ../tarballs/zaptel-$(UPVERSION).tmp/zaptel-$(UPVERSION)/OCT6114-128D.ima
+ @@rm -rf ../tarballs/zaptel-$(UPVERSION).tmp/zaptel-$(UPVERSION)/wct4xxp/OCT6114-128D.ima
@@rm -rf ../tarballs/zaptel-$(UPVERSION).tmp/zaptel-$(UPVERSION)/xpp/utils/*.hex
@@cd ../tarballs/zaptel-$(UPVERSION).tmp ; \
tar cfz ../$(FILENAME) *
Modified: zaptel/branches/sarge/debian/watch
===================================================================
--- zaptel/branches/sarge/debian/watch 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/watch 2006-10-24 07:26:17 UTC (rev 2625)
@@ -5,4 +5,4 @@
#opts=pasv ftp://ftp.asterisk.org/pub/telephony/zaptel/ zaptel-(.*)\.tar\.gz \
# debian svn-upgrade
opts=dversionmangle=s/\.dfsg// \
- http://ftp.digium.com/pub/zaptel/ zaptel-(.*)\.tar\.gz debian svn-upgrade
+ http://ftp.digium.com/pub/zaptel/ zaptel-(1.2.*)\.tar\.gz debian svn-upgrade
Deleted: zaptel/branches/sarge/debian/zaptel-modules.postinst
===================================================================
--- zaptel/branches/sarge/debian/zaptel-modules.postinst 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/zaptel-modules.postinst 2006-10-24 07:26:17 UTC (rev 2625)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# not stopping on error: in the worst case depmod won't be run.
-#set -e
-
-if [ "`uname -r`" = "_KVERS_" ] ; then
- depmod -a
-fi
-
-#DEBHELPER#
Deleted: zaptel/branches/sarge/debian/zaptel-modules.postrm
===================================================================
--- zaptel/branches/sarge/debian/zaptel-modules.postrm 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/zaptel-modules.postrm 2006-10-24 07:26:17 UTC (rev 2625)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# not stopping on error: in the worst case depmod won't be run.
-#set -e
-
-if [ "`uname -r`" = "_KVERS_" ] && [ -x depmod ]; then
- depmod -a
-fi
-
-#DEBHELPER#
Added: zaptel/branches/sarge/debian/zaptel-source.links
===================================================================
--- zaptel/branches/sarge/debian/zaptel-source.links (rev 0)
+++ zaptel/branches/sarge/debian/zaptel-source.links 2006-10-24 07:26:17 UTC (rev 2625)
@@ -0,0 +1 @@
+usr/include/linux/zaptel.h usr/include/zaptel/zaptel.h
Deleted: zaptel/branches/sarge/debian/zaptel-source.postinst
===================================================================
--- zaptel/branches/sarge/debian/zaptel-source.postinst 2006-10-24 06:52:46 UTC (rev 2624)
+++ zaptel/branches/sarge/debian/zaptel-source.postinst 2006-10-24 07:26:17 UTC (rev 2625)
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "`uname -r`" = "_KVERS_" ] ; then
- depmod -a &
-fi
-
-#DEBHELPER#
More information about the Pkg-voip-commits
mailing list