--- dahdi-tools-2.2.1.1.orig/debian/control.modules.in +++ dahdi-tools-2.2.1.1/debian/control.modules.in @@ -0,0 +1,17 @@ +Source: zaptel +Section: comm +Priority: extra +Maintainer: Debian VoIP Team +Uploaders: Kilian Krause , Jose Carlos Garcia Sogo , Mark Purcell , Santiago Garcia Mantinan , Santiago Ruano Rincon +Build-Depends: debhelper (>> 3.0.0), bzip2 +Standards-Version: 3.6.1.1 + +Package: zaptel-modules-_KVERS_ +Architecture: any +Provides: zaptel-modules +Description: zaptel modules for Linux (kernel _KVERS_). + This package contains the set of loadable kernel modules for the + zapata telephony API. + This package contains the compiled kernel modules for _KVERS_ + . + In order to compile these modules use the module-assistant utility. --- dahdi-tools-2.2.1.1.orig/debian/control +++ dahdi-tools-2.2.1.1/debian/control @@ -0,0 +1,42 @@ +Source: dahdi-tools +Section: comm +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian VoIP Team +# groff, man-db and asciidoc are required for generating documentation +Build-Depends: debhelper (>= 7), dahdi-source (>= 1:2.2.0~dfsg~rc2), libnewt-dev, quilt, bzip2, libusb-dev, + asciidoc, groff, man-db +Standards-Version: 3.8.4 +Homepage: http://www.asterisk.org/ +Vcs-Bzr: http://launchpad.net/~ubuntu-voip/ubuntu-voip/dahdi-tools/ + +Package: dahdi +Architecture: any +#Jmdault 20090601: the init scripts needs the kernel drivers, so we require +#either the dkms module (preferred) or the source pkg (with module-assistant) +Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, procps, fxload, dahdi-linux, dahdi-dkms | dahdi-source +Conflicts: zaptel +Replaces: zaptel +Description: utilities for using the DAHDI kernel modules + DAHDI (formly Zaptel) is an interface for telephony devices used by e.g. + the Asterisk PBX software. The dahdi-* packages provide the kernel + DAHDI kernel modules and their required setup environment. + . + This package includes userspace utilities required to configure DAHDI + modules. + +Package: libtonezone2.0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: tonezone library (runtime) + A library for generating tones used for telephone signalling. + +Package: libtonezone-dev +Section: libdevel +Architecture: any +Depends: libtonezone2.0 (= ${binary:Version}), ${misc:Depends} +Description: tonezone library (development) + A library for generating tones used for telephone signalling. + . + This package contains the development files. --- dahdi-tools-2.2.1.1.orig/debian/libtonezone2.0.install +++ dahdi-tools-2.2.1.1/debian/libtonezone2.0.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* --- dahdi-tools-2.2.1.1.orig/debian/dahdi.doc-base.readme +++ dahdi-tools-2.2.1.1/debian/dahdi.doc-base.readme @@ -0,0 +1,13 @@ +Document: dahdi +Title: DAHDI Telephony Interface Driver +Author: Tzafrir Cohen +Abstract: Basic documentation of the DAHDI telephony interface +Section: Network/Communication + +Format: HTML +Index: /usr/share/doc/dahdi/README.html +Files: /usr/share/doc/dahdi/README.html + +Format: text +Files: /usr/share/doc/dahdi/README.gz + --- dahdi-tools-2.2.1.1.orig/debian/docs +++ dahdi-tools-2.2.1.1/debian/docs @@ -0,0 +1,6 @@ +README +README.html +tonezones.txt +xpp/README.Astribank +README.Astribank.html +doc/* --- dahdi-tools-2.2.1.1.orig/debian/dahdi.postrm +++ dahdi-tools-2.2.1.1/debian/dahdi.postrm @@ -0,0 +1,3 @@ +#! /bin/sh -e + +#DEBHELPER# --- dahdi-tools-2.2.1.1.orig/debian/copyright +++ dahdi-tools-2.2.1.1/debian/copyright @@ -0,0 +1,114 @@ +This package was debianized by Tzafrir Cohen on +Tue, 26 Aug 2008 10:06:40 +0300 + +It was downloaded from + http://downloads.asterisk.org/pub/telephony/dahdi-tools/ + +Copyright: (from dahdi_cfg.c) + + * Written by Mark Spencer + * Based on previous works, designs, and architectures conceived and + * written by Jim Dixon . + * + * Copyright (C) 2001 Jim Dixon / Zapata Telephony. + * Copyright (C) 2001-2008 Digium, Inc. + * + * All rights reserved. + * + * Primary Author: Mark Spencer + * Radio Support by Jim Dixon + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2 as published by the + * Free Software Foundation. See the LICENSE file included with + * this program for more details. + +On Debian systems, a copy of the GNU General Public License Version 2 +may be found in /usr/share/common-licenses/GPL-2 . + +Other Portions: +dahdi_monitor.c: * Copyright (C) 2001 Jim Dixon / Zapata Telephony. +dahdi_monitor.c: * Copyright (C) 2001-2008 Digium, Inc. +dahdi_scan.c: * Copyright (C) 2007 Digium, Inc. +dahdi_tool.c: * Copyright (C) 2001 Jim Dixon / Zapata Telephony. +dahdi_tool.c: * Copyright (C) 2001-2008 Digium, Inc. +sethdlc.c: * Copyright (C) 1999 - 2002 Krzysztof Halasa +sethdlc.c: "Copyright (C) 2000 - 2003 Krzysztof Halasa \n" + +Files in the xpp/ subdirectory: + +* Written by Oron Peled +* Copyright (C) 2004-2010, Xorcom + +Perl programs and modules in the xpp/ directory: +# This program is free software; you can redistribute and/or +# modify it under the same terms as Perl itself. + +Other scripts in the xpp directory: +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + + + +Files in menuselect/: + +menuselect is a GPLed program used in the build process of Asterisk and +other Digium programs. Thus expect to find the same on those packages, +and also not to find it in any binary package. + +menuselect/Makefile:# Copyright (C) 2005-2008, Digium, Inc. +menuselect/menuselect.c: * Copyright (C) 2005 - 2006, Russell Bryant +menuselect/menuselect_curses.c: * Copyright (C) 2005 - 2006, Russell Bryant +menuselect/menuselect.h: * Copyright (C) 2005-2006, Russell Bryant +menuselect/menuselect_newt.c: * Copyright (C) 2008 Sean Bright +menuselect/menuselect_stub.c: * Copyright (C) 2005 - 2006, Russell Bryant +menuselect/missing:# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +menuselect/README:Copyright (C) 2005-2006, Digium, Inc. +menuselect/strcompat.c: * Copyright (C) 1999 - 2006, Digium, Inc. + + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2. See the LICENSE file + * at the top of the source tree. + +Portions of menuselect/strcompat.c: + * Based on Code from bsd-asprintf from OpenSSH + * Copyright (c) 2004 Darren Tucker. + * + * Based originally on asprintf.c from OpenBSD: + * Copyright (c) 1997 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Files under menuselect/mxml/: + +mxml is a minimal XML parsing library used by Asterisk and co. Likewise +used at build time for building menuselect above. + + * Copyright 2003-2005 by Michael Sweet. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + +On Debian systems, a copy of the GNU General Public License may be found in +/usr/share/common-licenses/GPL. --- dahdi-tools-2.2.1.1.orig/debian/TODO.Debian +++ dahdi-tools-2.2.1.1/debian/TODO.Debian @@ -0,0 +1,3 @@ +* Transition from zaptel? +* Fix copyright +* xpp/README.Astribank.html --- dahdi-tools-2.2.1.1.orig/debian/changelog +++ dahdi-tools-2.2.1.1/debian/changelog @@ -0,0 +1,1200 @@ +dahdi-tools (1:2.2.1.1-1ubuntu1) natty; urgency=low + + * Merge from Debian testing. Remaining changes: + - Bug Fix: If linux-headers are not installed, don't block, and print + information for the user. + - added debian/dahdi.postinst + - added --error-handler=init_failed to debian/rules + - Changes from Debian: + - debian/control: Change Maintainer + - debian/control: Removed Uploaders field. + - debian/control: Removed Debian Vcs-Svn entry and replaced with + ubuntu-voip Vcs-Bzr, to reflect divergence in packages. + - debian/control: Package dahdi Depends on dahdi-dkms | dahdi-source + + -- Stefan Lesicnik Thu, 11 Nov 2010 12:43:00 +0200 + +dahdi-tools (1:2.2.1.1-1) unstable; urgency=low + + * New minor upstream release. + * Patch wcb4xxp_extra_trunk: recognize some extra HFC-[248]S PCI IDs. + * DEP3 heaaders for all patches in use. + * Refreshed some patches. + * Standards version 3.8.4 (no change needed). + * Use a @debian.org adderss. + + -- Tzafrir Cohen Sun, 18 Apr 2010 15:53:48 +0300 + +dahdi-tools (1:2.2.1-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * New upstream release (Closes: #536257, #564381). + * Patch 'bashism' dropped: merged upstream. + * Patch xpp_no_extra_at dropped: merged upstream. + * Add an example genconf_parameters. + * Compat level 7. + * Bump standars version to 3.8.3.0 (no change needed) + * Udev rules are now in dahdi-linux. + * Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some + minor perl issues. + * Add the missing ${misc:Depends}, as per lintian. + * Patch astribank_allow_ignoreend: an extra missing patch from upstream. + * Patches init_unload_modules and init_unload_oslec: also unload OSLEC + when unloading all modules. + + -- Tzafrir Cohen Sun, 07 Mar 2010 04:43:13 +1100 + +dahdi-tools (1:2.2.1-0ubuntu2) lucid; urgency=low + + * Bug Fix: If linux-headers are not installed, don't block, and print + information for the user. (LP: #429510, LP: #474350) + - added debian/dahdi.postinst + - added --error-handler=init_failed to debian/rules + + -- Jean-Michel Dault Tue, 13 Apr 2010 16:56:27 -0400 + +dahdi-tools (1:2.2.1-0ubuntu1) lucid; urgency=low + + * Merge from Debian pkg-voip. + * Changes from Debian: + - debian/control: Change Maintainer + - debian/control: Removed Uploaders field. + - debian/control: Removed Debian Vcs-Svn entry and replaced with + ubuntu-voip Vcs-Bzr, to reflect divergence in packages. + - debian/control: Package dahdi Depends on dahdi-dkms | dahdi-source + + * From Debian pkg-voip: + [ Tzafrir Cohen ] + * New upstream release (Closes: #536257, #564381). + * Patch 'bashism' dropped: merged upstream. + * Patch xpp_no_extra_at dropped: merged upstream. + * Add an example genconf_parameters. + * Compat level 7. + * Bump standars version to 3.8.3.0 (no change needed) + * Udev rules are now in dahdi-linux. + * Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some + minor perl issues. + * Add the missing ${misc:Depends}, as per lintian. + * Patch astribank_allow_ignoreend: an extra missing patch from upstream. + * Patches init_unload_modules and init_unload_oslec: also unload OSLEC + when unloading all modules. + + -- Jean-Michel Dault Tue, 16 Feb 2010 13:44:09 -0500 + +dahdi-tools (1:2.2.0-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * New upstream release. + * Patch bashism: fixes bashism in waitfor_xpds (Closes: #535865). + * Patch hardware_rescan: backport Dahdi::Hardware->rescan() + * Patch no_extra_at: backport of a per/xpp fix. + + [ Mark Purcell ] + * Reorder debian/watch to correctly handle upstream -rc + + -- Mark Purcell Sat, 17 Oct 2009 09:12:40 +1100 + +dahdi-tools (1:2.2.0~rc3-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * New upstream release candidate. + + [ Mark Purcell ] + * Cleanup debian/watch to point to upstream dahdi-tools ;-) + * Update Standards version -> 3.8.1 + * Fix binary-control-field-duplicates-source + + -- Mark Purcell Mon, 01 Jun 2009 08:23:38 +1000 + +dahdi-tools (1:2.2.0~rc2-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * New upstream release. A matching dahdi-source is needed. + * Patch echocan_oslec: set oslec as default EC in generated config + * A proper README.Debian + * Updated debian/copyright document internal differences in package + - meet ftp-master needs for NEW + + [ Victor Seva ] + * fix debian/watch. + + -- Mark Purcell Wed, 20 May 2009 07:35:30 +1000 + +dahdi-tools (1:2.1.0.2-1) experimental; urgency=low + + [ Tzafrir Cohen ] + * Zaptel renamed DAHDI and split to dahdi-linux and dahdi-tools. + * This package no longer includes drivers and m-a magic. + * DAHDI is incompatible (ABI and API) with Zaptel. + * NEW libtonezone2.0 due to its usage of DAHDI. + * Programs renamed. E.g. dahdi_cfg instead of ztcfg. + * Configurations files are now under /etc/dahdi . + * Using the upstream init.d script. This script is responsible for + loading modules unlike the Zaptel one. + * Depend on groff and man-db for man -Thtml used in the upstream + 'docs' target. + * Delete false(?) libtonezone.so.1 symlinks. + * Add missing dh_perl check (for perl modules). + + [ Mark Purcell ] + * Add myself to uploaders + * Upload to experimental while we await NEW & debian-release + + -- Mark Purcell Sun, 29 Mar 2009 18:07:57 +1100 + +zaptel (1:1.4.11~dfsg-3) unstable; urgency=low + + * zaptel.init: exit on a different condition: Nicer handling of ztdummy. + * zaptel.init: Give a sane default to XPP_SYNC. + + -- Tzafrir Cohen Mon, 03 Nov 2008 09:35:23 +0200 + +zaptel (1:1.4.11~dfsg-2) unstable; urgency=low + + * Patch xpp_fxs_power: Fixed an issue with hook detection of the Astribank + FXS module. + * Don't fail init.d script if fxotune fails. This may happen if running it + when Asterisk is already running. + * Bump standards version to 3.8.0.0 . + * Ignore false lintian warning ("m-a a-i" has "a a"). + * Patch xpp_fxo_cid_always: do always pass PCM if that's what the user + asked. + * Patch vzaphfc_proc_root_dir: fix vzaphfc on 2.6.26. + * Patch wcte12xp_flags: Proper time for irq save flags. + * Patch headers_2627: Fix location of semaphore.h for 2.6.27 . + * Patch xpp_fxs_dtmf_leak: Don't play DTMFs to the wrong channel. + * Patch wctdm_fix_alarm: Fix sending channel alarms. + * Patch device_class_2626: Fix building 2.6.26 (Closes: #493397). + * Using dh_lintian for lintian overrides, hence requiring debhelper 6.0.7. + * Lintian: we know we have direct changes. Too bad we're half-upstream :-( + * Fix doc-base section names. + + -- Tzafrir Cohen Thu, 28 Aug 2008 22:58:23 +0300 + +zaptel (1:1.4.11~dfsg-1) unstable; urgency=medium + + [ Faidon Liambotis ] + * Update qozap from bristuff-0.4.0-RC1. + - fixed duoBRI miniPCI detection in qozap. + - added support for PCIe variants of duoBRI and quadBRI. + * Update cwain from bristuff-0.4.0-RC1. + * Update ztgsm from bristuff-0.4.0-RC1. + - reduced baudrate (serial interface to gsm modules) to be more robust + against irq misses in loaded systems + - improved serial debug output + - added module parameter "baudrate" (the default is 19200) + - added AT commands for SIM card selection + - added AT commands for shutting down/starting GSM modules + + [ Tzafrir Cohen ] + * New upstream release. + * Patch xpp_fix_t1 dropped: merged upstream. + * Finally removing 00list. + * Patch sigcap_dacs: tell zaphfc and vzaphfc to report support for + ZT_SIG_DACS. Makes ztscan report then as digital spans. + * Patch bri_dchan: change ZT_FLAG_BRIDCHAN as ZT_FLAG_MTP2 is also + defined to be 19 as of zaptel 1.4.11 . + * Patch chan_release_check: fixes a regression from 1.4.10.1 that causes + a panic if disconnecting an Astribank device with a channel still open. + * Patch florz-vmalloc: proper includes for zaphfc on non-x86 platforms. + (Closes: #488513) + * oslec_wrap.c: cycles code for powerpc by Stelios Koroneos. + * And dummy cycles code for other architectures. + + [ Mark Purcell ] + * Build-Depends: asciidoc (>= 8.2.6-1.1) + - asciidoc 8.2.6-1 is broken + - FTBFS: ERROR: unsafe: include file: + /etc/asciidoc/./javascripts/toc.js (Closes: #487011) + * Urgency medium as we fix RC bug + + -- Mark Purcell Mon, 30 Jun 2008 20:22:37 +1000 + +zaptel (1:1.4.10.1~dfsg-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * New upstream bugfix release. + * Note the buid "error" from http://bugs.digium.com/12426 . + * Fix the generation of tonezone.txt. + * Patch xpp_fix_t1: allow the xpp pri module to initialize as T1. + * Set OSLEC as the default echo canceller. + * The "unload" init.d script operation will now also attempt to unload + oslec. + + -- Tzafrir Cohen Thu, 8 May 2008 02:03:34 +0300 + +zaptel (1:1.4.10~dfsg-1) unstable; urgency=low + + [ Mark Purcell ] + * New upstream release + + [ Tzafrir Cohen ] + * Added NEWS.Debian about zaptel modules incompatibility. + * Do run 'make dist-clean' on modules build. It prints an ugly error, but + only after the actualy relevant clean. + * Watching downloads.digium.com directly again. + + -- Tzafrir Cohen Mon, 14 Apr 2008 14:07:54 +0300 + +zaptel (1:1.4.9.2~dfsg-1) unstable; urgency=low + + * New upstream release (Closes: #464900). + - All kernel modules moved to under kernel/ + * Converting patches to quilt (because bristuff uses them). + * Include the separate xpp changelog file. + * Fix a possible crash with oslec when a fax tone is detected: + http://sourceforge.net/mailarchive/message.php?msg_name=20080217212421.GT15415%40xorcom.com + (Closes: #447245). + * Adjusted lintian overrides: mknod is now called from a function. + * Adjust vzaphfc to netdevice API changes in kernel 2.6.24. + * Once again ignoring 'make distclean' errors: it will fail if we don't + have kernel sources / headers for current kernel :-( . + * Remove some unnecessary changes from the florz zaphfc patch - fixes zaphfc + warning. + + -- Tzafrir Cohen Thu, 20 Mar 2008 16:31:25 +0200 + +zaptel (1:1.4.8~dfsg-1) unstable; urgency=low + + * New upstream release + * bristuff.dpatch broken to smaller patches, as in bristuff 0.4.0-test6. + - ztpty.c is added as a source file. + - bri_dchan.dpatch, proc_read.dpatch, ztcfg-start_stop.dpatch and + zt_alarm_notify_no_master_change.dpatch . + * beronet.dpatch: Support for Bero.net cards (Closes: #453496). + * Adapted ztcfg-start_stop.dpatch to zaptel 1.4.8 . + * Removing xpp_m_subdirs.dpatch: merged upstream. + * tones.h is no longer generated. + * 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. + * Delete old created files on purge (Closes: #454388). + + -- Tzafrir Cohen Tue, 29 Jan 2008 13:32:11 +0200 + +zaptel (1:1.4.7.1~dfsg-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * New upstream release. + - New upstream version 1.4.6 (Closes: #452315, #442414). + * Add Voicetronix OpenPCI Zaptel driver (wcopenpci.c) . + * Explicitly delete depmod results (modules.dep at el.) + * ztdiag.dpatch: removed (applied by upstream). + * xpp_m_subdirs.dpatch: removed (applied by upstream). + * Makefile_fix_clean.dpatch: removed (applied by upstream). + * Makefile_opt_level.dpatch: removed (applied by upstream, except for 2.4 + kernel modules). + * Call 'make dist-clean' rather than 'make clean'. + * Don't run 'make dist-clean' on zaptel-modules build. + * Document zaptel-modules build test. + * Don't run ztcfg if zaptel was not loaded. But do fail if ztcfg has failed. + (Closes: #407996). + * Don't build wcopenpci on big endian platforms (Module gives #error there). + * Actually fix building xpp with M instead of SUBDIRS. + * Updates to bristuff zap modules from bristuff-0.3.0-1y-l: + - Fix build warnings. + - Allow sharing interrupts. + * Update cwain from recent bristuff. + + [ Faidon Liambotis ] + * Don't delete old device nodes on installations since it's needed only for + upgrades from <= sarge which isn't supported. Shuts up lintian error. + * Correctly detect udev/devfsd and chrooted environments at postinst time. + * Fix debian/watch by using a pkg-voip wrapper to avoid upstream's silly + redirections. (Closes: #449673) + * Fix OSLEC so that audio works again on x86_64 systems. + * Update Standards-Version to 3.7.3, no changes needed. + * Refresh Uploaders: add myself, remove Jose Carlos Garcia Sogo, Santiago + Garcia Mantinan and Santiago Ruano Rincon. + + -- Faidon Liambotis Fri, 28 Dec 2007 17:59:57 +0200 + +zaptel (1:1.4.5.1~dfsg-2) unstable; urgency=low + + [ Kilian Krause ] + * Update oslec to r942. Add mmx.h (disabled for now). + * Do export oslec_echo_can_identify from oslec.ko (Closes: #439814). + * Add Homepage field as added in dpkg-dev 1.14.6. + * Fix debian-rules-uses-pwd + + [ Mark Purcell ] + * Remove Build-Depends restrictions for packages in stable + + [ Tzafrir Cohen ] + * vzaphfc: update to 1.44, and apply our fixes. + * vzaphfc: fix building with Sarge 2.6 kernels. + * Fix asciidoc buildign in Sarge (temporary fix, until we get upstream fix + in 1.4.6). + * Don't build oslec if it is not the Zaptel echo canceller. + * Adjust line numbers in Lintian ignore file. + * Include oslec-ctrl-panel.sh as an example (Closes: #443363). + + -- Kilian Krause Sat, 22 Sep 2007 12:08:52 +0200 + +zaptel (1:1.4.5.1~dfsg-1) unstable; urgency=low + + * New upstream release. + + [ Kilian Krause ] + * Add dpkg-dev (>= 1.13.19) to Build-Depends for binary:Version + * Correct the zaptel.init to point to correct path of fxotune + (Closes: #439310) + * Put opt level back to -O2 in accordance with Debian Policy. + + [ Tzafrir Cohen ] + * Pass extra modules / subdirs to modules make. + * Re-add zaptel_perl.dpatch. Clarified patch's description in hope to aviod + re-re-re-removal of this patch. + * There's now an HTML version of README.Astribank . And upstream Makefile is + better at cleaning. + * Don't install man pages. 'make install' does that already (Closes: #422943) + * Fixed building vzaphfc, opvx1200p and ds1x1f of kernel >=2.6.22 + (>= 2.6.19?). + * xpp_m_subdirs.dpatch: Fixed building of xpp modules with M= . + * modulestest -r: test current kernel. + + -- Kilian Krause Sun, 26 Aug 2007 12:08:10 +0200 + +zaptel (1:1.4.5~dfsg-1) unstable; urgency=low + + * New Upstream Maintenance Release + - support for Digium's new 32 channel hardware echo canceler + (VPMADT032) for the TDM800P and TDM2400P + + [ Tzafrir Cohen ] + * zaptel_perl.dpatch: install perl modules to vendorlib rather than to + sitelib. This fixes the zaptel-perl utilities (e.g: zaptel_hardware). + * Build-depend on asciidoc to produce some package documentation. + * Mark doc-base documentation. + * Simplify Astribank initialization with zaptel-perl. + * provide symlinks for headers files: compatibility with zaptel 1.2 + locations of zaptel.h and tonezone.h . + + [ Faidon Liambotis ] + * bristuff 0.4.0-test4 + - Add zaptel.patch as debian/patches/bristuff.dpatch. + - Update zaphfc, qozap, cwain and ztgsm. + * Add florz' patch to zaphfc; removes RTAI support. (Closes: #382227) + * Don't fail on mknod errors; helps on vserver setups. (Closes: #411850) + + [ Mark Purcell ] + * Remove echocan_env.dpatch - merged upstream + * Remove zaptel_perl.dpatch - merged upstream + * Add debian/patches/inlcude.dpatch - upstream typo + * debian/rules: upstream change INSTALL_PREFIX->DESTDIR + * debian/zaptel.doc-base.readme add Index: doc-base-file-no-index + * Ship new wctdm24xxp modules + + -- Mark Purcell Sat, 18 Aug 2007 13:20:31 +0100 + +zaptel (1:1.4.4~dfsg-1) unstable; urgency=low + + * New Upstream Release + + [ Tzafrir Cohen ] + * echocan_env.dpatch: set the echo canceller from the environment. + * oslec/ The bulk of the oslec files. + * oslec_zaptel.dpatch: Minimal changes to zaptel to add oslec, beyond + the oslec directory. + * oslec_zaptap.dpatch: The oslec zaptap echo sampling device (probably + still does not apply). + * man_fixes.dpatch: Documentation fixes from upstream. + * Removing unrequired/harmful and useless modprobe / modutils config. + * README.Debian updates. + + [ Mark Purcell ] + * debian/patches/zaptel_perl.dpatch now included upstream + * Switch to ${binary:Version} substvar-source-version-is-deprecated + + -- Mark Purcell Wed, 18 Jul 2007 21:41:51 +0100 + +zaptel (1:1.4.3~dfsg-2) unstable; urgency=low + + [ Tzafrir Cohen ] + * Fixed and re-added zaptel_perl. + * And added zaptel_hardware (zaptel hardware lister), just for fun. + + -- Tzafrir Cohen Sat, 09 Jun 2007 03:36:17 +0300 + +zaptel (1:1.4.3~dfsg-1) unstable; urgency=low + + * New upstream release + - A fix for the potential for a rare deadlock between zaptel and the + wct4xxp, wcte11xp, and wct1xxp drivers + - Fixes for the VPM450M module on FC6 to correct a potential stack + overflow scenario at load time. + - Many updates to the Astribank driver + * disable debian/patches/zaptel_perl as it doesnt apply cleanly + + -- Mark Purcell Sat, 09 Jun 2007 00:01:55 +0100 + +zaptel (1:1.4.2.1~dfsg-2) unstable; urgency=low + + * Include debian/compat in zaptel-sources + - missing debian/compat file in archive (Closes: #422153) + + -- Mark Purcell Sat, 02 Jun 2007 10:22:04 +0100 + +zaptel (1:1.4.2.1~dfsg-1) unstable; urgency=low + + * New upstream release + - Added the ability to monitor pre-echo cancellation audio with ztmonitor + - Fixed some places where there was the potential for memory corruption + on SMP systems + - FTBFS with 2.6.19-1 (Closes: #405562) + * zaptel 1.4 provides wcfxs->wctdm alias + - No mention of wcfxs -> wctdm module rename (Closes: #419161) + - Missing modutils/modprobe rules for wctdm (Closes: #419162) + * provide debian/compat fixes lintian: debian-rules-sets-DH_COMPAT + * Cleanup debian/patches/ + + -- Mark Purcell Thu, 26 Apr 2007 09:07:48 +1000 + +zaptel (1:1.4.1~dfsg-3) unstable; urgency=low + + [ TzafrirCohen ] + * Better shape for ztdiag.dpatch. Don't forget to free. + + -- Mark Purcell Wed, 04 Apr 2007 22:51:24 +0100 + +zaptel (1:1.4.1~dfsg-2) experimental; urgency=low + + * $(MAKE) install-libs needed to install libs to libtonezone + + -- Mark Purcell Sat, 24 Mar 2007 14:17:22 +0000 + +zaptel (1:1.4.1~dfsg-1) experimental; urgency=low + + [ Tzafrir Cohen ] + * New upstream release. + * Fix installation of tonezone.h . + * merges from trunk: + * Update standards version to 3.7.2 . + * ztdiag.dpatch: fix the ioctl ZT_CHANDIAG and eable it. + * Should fix modules building: restore generated files that were + removed by a clean (Closes: #415280). + * Update debian/watch for ~ versions + * zaptel_perl.dpatch: Do install perl modules and scripts. + * zaptel_perl.dpatch: a few other fixes (until next upstream release). + * Add Makefile.kernel26 and wctc4xxp/ to source tarball. + * Don't install /etc/zaptel.conf by default (Closes: #383081) . + * List the tonezones supported by ztcfg and libtonezone in tonezones.txt + (Closes: #379108). + * Remove man pages from debian/, as they are included in upstream. + + -- Tzafrir Cohen Sat, 24 Mar 2007 10:03:54 +0200 + +zaptel (1:1.4.0~dfsg-1) experimental; urgency=low + + * Upgrading to 1.4. + * Watch for 1.4.x tarballs, rather than 1.2.x tarballs. + * Disable most patches: + - ukcid fails to apply. + - bristuff fails to apply. + - No point in patching the Makefile. + * Saving my attempts to apply bristuff. + * .h files moved to /usr/include/zaptel + + -- Tzafrir Cohen Mon, 1 Jan 2007 21:31:18 +0200 + +zaptel (1:1.2.12~dfsg-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + * Remove -O4 from all Makefiles (Closes: #391840) + * Remove gcc hardcoded as HOSTCC + + -- Kilian Krause Thu, 28 Dec 2006 13:12:16 +0100 + +zaptel (1:1.2.12~dfsg-1) unstable; urgency=low + + * New upstream release. (Closes: #403326) + + -- Kilian Krause Wed, 27 Dec 2006 23:23:40 +0100 + +zaptel (1:1.2.11.dfsg-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * Reverting my changes from 1:1.2.9.1.dfsg-2. Moved to the experimental + branch. + + [ Kilian Krause ] + * Remove bogus zaptel-modules from being Recommends (Closes: #387961) + * Update vzaphfc as proposed by Jens Wilke + + [ Mark Purcell ] + * New Upstream Release + - Fixes: Fails to build with pristine upstream kernel, very recent version + (Closes: #400705) + - Fixes: Please package version 1.2.11 (Closes: #399634) + - Fixes: vzaphfc: error: 'CHECKSUM_HW' undeclared (Closes: #386498) + * Cleanup debian/patches/wct4xxp-dfsg.dpatch + * debian/rules call dh_installmodules from binary_modules: + - Fixes: I had to do depmod -a manually after doing m-a a-i zaptel (Closes: + #332787) + * Update debian/patches/Makefile_uname.dpatch to force -O2 + - Fixes: Cannot initiate a call to BRI (Closes: #386052) + * Remove Depends: zaptel from debian/control.modules.in + - please don't depend on zaptel (Closes: #391826) + + -- Mark Purcell Sat, 2 Dec 2006 14:33:30 +0000 + +zaptel (1:1.2.10.dfsg-2) unstable; urgency=low + + * bristuff-0.3.0-PRE-1v + * Remove redundant GPL LICENCE text + + -- Mark Purcell Tue, 24 Oct 2006 22:41:01 +0100 + +zaptel (1:1.2.10.dfsg-1) unstable; urgency=low + + * New upstream release + + -- Mark Purcell 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 Tue, 10 Oct 2006 09:36:58 +1000 + +zaptel (1:1.2.9.1.dfsg-1) unstable; urgency=low + + * New Upstream Release + * firmware removed from wct4xxp/OCT6114-128D.ima + * Lintian cleanup; spelling-error-in-copyright + + -- Mark Purcell Sat, 23 Sep 2006 13:58:15 +0100 + +zaptel (1:1.2.8.dfsg-1) unstable; urgency=low + + * New Upstream Release + + -- Mark Purcell Wed, 23 Aug 2006 07:30:22 +0100 + +zaptel (1:1.2.7.dfsg-4) unstable; urgency=low + + * Install zaptel.conf.sample as a confile under /etc + * Add Recommends: zaptel-modules + * Improve error handling and conf file checking in init.d. (Closes: + Bug#382604) + + -- Mark Purcell Thu, 17 Aug 2006 08:34:43 +0100 + +zaptel (1:1.2.7.dfsg-3) unstable; urgency=low + + [ Kilian Krause ] + * 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: + #368145) + * Can't recompile zaptel modules on Sarge (Closes: #375581) + * zaptel-modules from testing don't compile on Sarge (Closes: #376719) + + -- Mark Purcell Thu, 10 Aug 2006 23:39:58 +0100 + +zaptel (1:1.2.7.dfsg-2) unstable; urgency=low + + * Fix get-orig-source target to make dfsg repacking work + * Fix zaptel-source to build without firmware again. Required dropping + wct4xxp module. Added vzaphfc to linux-2.6 modules. (Closes: #381123) + + -- Kilian Krause Thu, 3 Aug 2006 11:48:14 +0000 + +zaptel (1:1.2.7.dfsg-1) unstable; urgency=high + + * Urgency high as this is blocking a security fix for asterisk + * Remove non-modifiable firmware to make DFSG compliant. Does + anyone need this firmware? (Closes: #379458) + + -- Mark Purcell Tue, 1 Aug 2006 15:27:09 +0100 + +zaptel (1:1.2.7-2) unstable; urgency=low + + * Copying Makefile as before to the source package, + Copying some extra files now needed for building (Closes: #378864) + + -- Mark Purcell Tue, 1 Aug 2006 06:29:39 +0100 + +zaptel (1:1.2.7-1) unstable; urgency=low + + * New upstream release + + [ Kilian Krause ] + * Add vzaphfc driver (enhanced zaphfc) by Jens Wilke. + + [ Tzafrir Cohen ] + * Separating ZapBRI modules to directories, rather than patches + * Example configs moved from zaptel-source to zaptel + * Removing some unneeded dirs from zaptel-source + * debian/patches/Makefile_kbuild: a small part of the original one. + Fixes building on Sarge + * genzaptelconf is now in zaptel + * xpp/utils/Makefile has a decent install target + * debian/rules: Use CURDIR + * debian/modulestest: Building modules for -3 kernels + * fix x bit of files in /usr/share/zaptel + * removed genzaptelconf from debian/ + * Added support for the OpenVox A1200P card (http://www.openvox.com.cn/) + * debian/control: require libusb-dev for building xpp firmware loader. + * debian/control: Recommend package xpp-firmware (should be added to + non-free) + * bristuff_local_zaptelh.dpatch: Build bristuff modules with correct + zaptel.conf (in Sarge) + * Makefile_uname.dpatch: Updated. Note: watch for PWD issues. + * Makefile_bristuff.dpatch: updated to reflect Makefile change. + + -- Mark Purcell Mon, 17 Jul 2006 21:48:21 +0100 + +zaptel (1:1.2.6-2) unstable; urgency=high + + * Urgency high as this is blocking a security fix for asterisk [CVE-2006-2898] + + * Add debian/libtonezone-dev.links + - Realy fix: missing libtonezone.so.1 symlink (Closes: #372887) + + -- Mark Purcell Wed, 14 Jun 2006 13:40:31 +1000 + +zaptel (1:1.2.6-1) unstable; urgency=high + + [ Mark Purcell ] + * Urgency high as this is blocking a security fix for asterisk [CVE-2006-2898] + + * New upstream release. + - can't find zaptel.h during build (Closes: #330137) + - errors in fxotune.c (Closes: #370213) + - Cannot make zaptel-source: SUBDIR not found (Closes: #368561) + + [ Kilian Krause ] + * Weed out old unused patches. Add comments which patches have been included + upstream for next release. + + [ Lionel Elie Mamane ] + * Load ztdummy when needed, not when not needed. + + [ Tzafrir Cohen ] + * bristuff: 0.3.0-PRE1p + * We have another ZapBRI module: ztgsm + * Experimental support in genzaptelconf for ztgsm (from sample files) + * genzaptelconf: 0.5.1 (does not require restart of asterisk) + * zaptel.init: 'unload' operation. Better support for Astribank + * moduletest script fixes + * bristuff added ztpty + * genzaptelconf: wait for xpp (astribank) module to register after loadin it + * minor xpp driver fixes (already in 1.2 branch) + + [ Julien BLACHE ] + * debian/libtonezone1.links: + + Create the libtonezone.so.1 symlink (closes: #372887). + + -- Mark Purcell Wed, 14 Jun 2006 10:59:52 +1000 + +zaptel (1:1.2.5-1) unstable; urgency=low + + [ Tzafrir Cohen ] + * New upstream version + * Only build xpp for i386, as it currently crashes on other arches. + * Fix compilation of xpp for 2.6.14 + + [ Kilian Krause ] + * Fix gendigits to write to stdout. + + -- Kilian Krause Thu, 30 Mar 2006 23:52:38 +0300 + +zaptel (1:1.2.4-1) unstable; urgency=low + + * New upstrream release (Closes: #353094) + * removing xpp.dpatch: merged in upstream + * removing dot_version: bug fixed upstream + * Makefile_kbuild.dpatch: modified, as it was not properly merged in + upstream + * Makefile_bristuff.dpatch: really build zaptel modules again + * Makefile_xpp: fixed. + * debian/modulestest: a script for postbuild of zaptel modules from a svn + build + * zaptel-source: removing unnecessary dependency on dpatch + + -- Tzafrir Cohen Thu, 23 Feb 2006 09:40:47 +0200 + +zaptel (1:1.2.3-2) unstable; urgency=low + + * bristuff 0.3.0-PRE1k. Also, renamed the dpatch to simply "bristuff" + * updated version in dot_version.dpatch. + * Include build_tools and .version in copied files + * newer versions of genzaptelconf and xpp.dpatch + + -- Tzafrir Cohen Mon, 6 Feb 2006 15:30:06 +0200 + +zaptel (1:1.2.3-1) unstable; urgency=low + + * new upstrream release + * ukcid.dpatch: for UK Caller ID support (Zaptel part, closes: #302380) + * newer versions of genzaptelconf and xpp.dpatch + * Makefile_pscmd.dpatch disabled due to a small upstream change. Revive it? + * dot_version.dpatch: the tarball is missing the .version file. Remove + it when it provides one + + -- Tzafrir Cohen Mon, 6 Feb 2006 14:02:04 +0200 + +zaptel (1:1.2.1-3) unstable; urgency=low + + * Fix compilation with binary-only mode. + * bristuff 0.3.0-PRE-1f + * make lintian override apply + + -- Tzafrir Cohen Sat, 7 Jan 2006 20:39:33 +0200 + +zaptel (1:1.2.1-2) unstable; urgency=low + + * Added bristuff 0.3.0-PRE1d patch. bristuff re-enabled. + (Closes: #340627, #344432) + * Documentation fixes (Closes: #316801) + * Makefile_targets.dpatch is ba its small self + * readded bristuff examples. with cwain this time + * zaptel.init: a slightly different test for a zaptel timing source + * Depend on procps due to using ps in postinst (Closes: #342699) + + -- Tzafrir Cohen Fri, 30 Dec 2005 19:12:54 +0200 + +zaptel (1:1.2.1-1) unstable; urgency=low + + * New upstream release + * Disable bristuff for new upstream + + -- Mark Purcell Wed, 7 Dec 2005 21:28:23 +0000 + +zaptel (1:1.2.0-rc2-1) experimental; urgency=low + + * New upstream release + + -- Mark Purcell Sun, 13 Nov 2005 18:24:17 +0000 + +zaptel (1:1.2.0-rc1-1) experimental; urgency=low + + * New upstream release + * Update Makefile_uname.dpatch + * FTBFS: missing or incorrect directory modexamples/ (Closes: #329084) + * debian/rules export DH_COMPAT=4 + + -- Mark Purcell Wed, 9 Nov 2005 21:37:47 +0000 + +zaptel (1:1.2.0-beta2-3) experimental; urgency=low + + * Not Released Yet + * Copyright audit to debian/copyright + + -- Mark Purcell Mon, 7 Nov 2005 19:19:27 +0000 + +zaptel (1:1.2.0-beta2-2) experimental; urgency=low + + * Suggestions from Tzafrir Cohen + - Makefile_man.dpatch can be removed: fixed by upstream + - fxotune.tmpfile.dpatch can be removed: fixed by upstream + - a small manual fix to Makefile_targets.dpatch: s/ manpages$// + - debian/rules: dh_installman: 's/debian/doc/' a number of times + (don't use doc/*.8 as there is no reason to install the pathetic + torisatool.8 man page) + + -- Mark Purcell Tue, 1 Nov 2005 21:26:36 +0000 + +zaptel (1:1.2.0-beta2-1) experimental; urgency=low + + * New upstream release + * Update Makefile_targets.dpatch + * Update Makefile_man + * Update fxotune_tmpfile.dpatch + + -- Mark Purcell Tue, 1 Nov 2005 20:51:02 +0000 + +zaptel (1:1.2.0-0beta1-1) experimental; urgency=low + + * New upstream release + * Disable bristuff for experimental upload + * Apply patch from Tzafrir Cohen for 1.2.0 build + + -- Mark Purcell Sun, 18 Sep 2005 12:48:59 +0100 + +zaptel (1:1.2.0-2) unstable; urgency=low + + [ Kilian Krause ] + * Added bristuff 0.3.0-PRE1 for Asterisk 1.2.0 support. + + [Tzafrir Cohen] + * fix Makefile_deps_kern.dpatch + * remove .rej from Makefile.uname.dpatch + * do install genzaptelconf man page + * update genzaptelconf and its man page + * echocan_env.dpatch: allow changing the echo canceller at zaptel-modules + build time + * Makefile_kbuild.dpatch: use kbuild for 2.6 modules build. used for: + * Makefile_xpp.dpatch: (not applied by default) + a small patch to enable the build of: + * xpp.dpatch: drivers for Xorcom Asteribank + + [ Mark Purcell ] + * Build and package libtonezone.so + + -- Mark Purcell Wed, 30 Nov 2005 16:28:51 +0000 + +zaptel (1:1.2.0-1) unstable; urgency=low + + * New upstream release + * Remove Makefile_deps_kern.dpatch as it doesnt apply upstream + + -- Mark Purcell Thu, 17 Nov 2005 17:50:00 +0000 + +zaptel (1:1.0.9.2-1) unstable; urgency=low + + * New Upstream Release + + -- Mark Purcell Tue, 8 Nov 2005 20:47:48 +0000 + +zaptel (1:1.0.9.1-4) unstable; urgency=low + + (NOT YET RELEASED - needs still some tweaking with florz' patches) + * debian/patches/ztcfg_init.dpatch: Make ztcfg not kill the channels when + executed twice. + * debian/patches/zaphfc_0.2.0-RC8n_florz-8.dpatch: Add florz' improved + zaphfc implementation as zaphfc-florz. This should reduce system IO load + among other improvements. Taken from http://zaphfc.florz.dyndns.org/ + + -- Kilian Krause Sat, 27 Aug 2005 21:32:50 +0200 + +zaptel (1:1.0.9.1-3) unstable; urgency=low + + * debian/control: fixed overrides disparity with zaptel-source belonging to + devel rather than comm. + + -- Kilian Krause Sat, 27 Aug 2005 14:35:48 +0200 + +zaptel (1:1.0.9.1-2) unstable; urgency=low + + * Closes: #302836: zaptel-source: zaphfc module missing after + compiling modules. + * Closes: #323753: zaptel-source: cannot compile zaphfc in unstable + with gcc-4.0.1. + + -- Santiago Ruano Rincon Fri, 19 Aug 2005 00:40:56 -0500 + +zaptel (1:1.0.9.1-1) unstable; urgency=low + + * New upstream release + * Update debian/watch + * Please package version 1.0.9.1 (Closes: #320600) + * FXO hardware stops working after 25 days (Closes: #321239) + + -- Mark Purcell Mon, 8 Aug 2005 18:34:10 +0100 + +zaptel (1:1.0.9-5) unstable; urgency=low + + * Import bristuff-0.2.0-RC8l.dpatch + + -- Santiago Ruano Rincon Sat, 30 Jul 2005 11:26:42 -0500 + +zaptel (1:1.0.9-4) unstable; urgency=low + + Santiago Ruano Rincon: + * Man pages are builded from sgml's using docbook-utils + Deleted the *.8 files + * Closes: #317297: Applied a patch to improve the ztdummy + accuracy on kernel 2.6 + + Mark Purcell: + * Reinstate debian/zaptel.install + - Closes: #318575: this package does not install ztcfg, ztmonitor, + ztspeed, zttest, zttool. + + -- Mark Purcell Sun, 17 Jul 2005 07:11:27 +1000 + +zaptel (1:1.0.9-3) unstable; urgency=low + + * Import bristuff-0.2.0-RC8j.dpatch + * Closes: #315251: zaptel should be in group comm + * Note that the cloned report is still active against ftp.debian.org + * Closes: #316800: zaptel package 1.0.9 ships headers + + -- Mark Purcell Thu, 14 Jul 2005 12:19:10 +0100 + +zaptel (1:1.0.9-2) unstable; urgency=low + + * Import bristuff-0.2.0-RC8h.dpatch + * Enable rtia.dpatch + + -- Mark Purcell Mon, 4 Jul 2005 02:35:37 +0100 + +zaptel (1:1.0.9-1) unstable; urgency=low + + * New upstream release + * Disable bristuff to allow 1.0.9 upload + * Disable rtia to allow 1.0.9 upload + + -- Mark Purcell Sun, 3 Jul 2005 15:51:32 +0100 + +zaptel (1:1.0.7-5) unstable; urgency=low + + * ACK NMUs. Thanks for helping with this. (Closes: #305731, #310150) + * Actually doesn't fail if dpatch is not installed when building modules. + * zaptel-modules.postinst: New. Run depmod -a on modules install + * zaptel: should build-dep on debhelper (>= 4.0.4). (Closes: #310788) + * zaptel: should build-dep on dpatch >= 2.0.9 (Closes: #314549) + * zaptel: bashism in postinst (Closes: #314552) + * zaptel-source: compilation error in zaphfc.c (Closes: #305193) + * zaptel-source Build-Depends on dpatch, should Depend on + it though. (Closes: #309258) + * zaptel-source: Fails to enable RTAI support (Closes: #304648) + + -- Kilian Krause Sun, 19 Jun 2005 15:38:25 +0200 + +zaptel (1:1.0.7-4.1) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for sarge-targetted RC bugfix + * Make sure directories are created mode 755 instead of mode 644, as + this otherwise causes problems for building (apparently on xfs + filesystems). Closes: #310150. + * Tweak debian/patches/Makefile.dpatch fix from the previous NMU so + that it isn't unnecessarily fragile: -fsigned-char is *always* + either a no-op or required, so lose the architecture checking and + enable it unconditionally. Closes: #305731. + + -- Steve Langasek Sun, 22 May 2005 02:48:44 -0700 + +zaptel (1:1.0.7-4) unstable; urgency=high + + * NMU as VOIP team taking so long. Fix compiler flags so that ztcfg + works. (Closes: #305731) + + -- Matthew Grant Fri, 22 Apr 2005 07:35:28 +1200 + +zaptel (1:1.0.7-3) unstable; urgency=medium + + * Closes: #302903: libtonezone1 package is empty + * Closes: #302833: binary files missing, e.g. /sbin/ztcfg + * Move debian/*.files -> debian/*.install + * Closes: #302847: zaptel command ztcfg freezes on Debian PowerPC + causing boot failure. + + -- Mark Purcell Sun, 3 Apr 2005 19:44:25 +0100 + +zaptel (1:1.0.7-2) unstable; urgency=medium + + * Debian VoIP Team upload. + * Jose Carlos: + + Working support for module-assistant included in zaptel-source. + Thanks to Eduard Bloch for his help (Closes: #301665) + + debian/control.modules.in: + - make generated modules package depend on zaptel binary package. + - updated description to refer to module-assistant. + + debian/control: + - build-depend on bzip2. + - zaptel-source depends on module-assistant tool and bzip2. + - updated and improved descriptions. + + debian/rules: + - remaked with the new m-a stuff. + - don't need dpatch installed for building the modules (Closes: #301666) + + debian/postinst: doesn't output garbage (Closes: #296958) + + debian/postrm: don't remove creeated devices. Only box admin can do + that, per Policy 10.6 + + Removed zaphfc and qozap examples from zaptel-source. Only ship them + in zaptel binary package. + + README.Debian: file added. Talk about how compile modules and + use them with udev (Closes: #163857) + + Don't install zaptel.h file in zaptel-modules packages. (Closes: #297306) + + * Kilian Krause: + + Increased urgency for fixing RC-bug and this is the last deb to + allow the whole Debian VoIP suit proceed to testing. + + -- Jose Carlos Garcia Sogo Sat, 2 Apr 2005 01:14:23 +0200 + +zaptel (1:1.0.7-1) unstable; urgency=low + + * New upstream version. + + -- Kilian Krause Sat, 19 Mar 2005 23:28:07 +0100 + +zaptel (1:1.0.6-1) unstable; urgency=low + + * New upstream version. (zaptel 1.0.6, bristuff RC7k) + * added zaphfc and qozap modules. + + -- Kilian Krause Sat, 5 Mar 2005 20:05:35 +0100 + +zaptel (1:1.0.4-3) unstable; urgency=low + + * Debian VoIP team upload. + * debian/rules, debian/zaptel-source.files: fixed zaptel.h includes problem + * debian/patches/Makefile.dpatch: imported from old package (now dpatch + instead directly in the diff). Fixed building on hosts with differring + userland and kernel arch. Now also including symlink for SONAME. + * debian/patches/bristuff.dpatch: imported bristuff patch to include zaphfc. + (Closes: #294183) + * debian/zaptel.postinst: Fixed permissions issue problem. + * debian/zaptel.modprobe.d: Added zaphfc RC7f. + + -- Kilian Krause Thu, 24 Feb 2005 01:42:36 +0100 + +zaptel (1:1.0.4-2) experimental; urgency=low + + * Better "use" of uname -r in Makefile for zaptel-source + + -- Santiago Ruano Rincon Mon, 21 Feb 2005 00:27:14 -0500 + +zaptel (1:1.0.4-1) experimental; urgency=low + + * New upstream release (zaptel-1.0.4) + * Included zttest and ztspeed binaries + * Added Depends on debhelper and Recomends zaptel for zaptel-source + * Added /etc/modprobe.d/zaptel and corrected the path for the binaries, + /sbin instead of /usr/sbin + + -- Santiago Ruano Rincon Wed, 26 Jan 2005 23:05:20 -0500 + +zaptel (1:1.0.2-2) unstable; urgency=low + + * libtonezone out of zaptel-source + * /dev/zap/ are now created by zaptel.postinst and deleted by + zaptel.postrm. Now, the zap devices match with the upstream version + (Closes: #274384). + * Added lintian overrides for mknod-in-maintainer-script warnings + * docbook-to-man out of the Build-Depends + + -- Santiago Ruano Rincon Wed, 24 Nov 2004 22:05:52 -0500 + +zaptel (1:1.0.2-1) unstable; urgency=low + + * New upstream release (zaptel-1.0.2) + + -- Santiago Ruano Rincon Sat, 30 Oct 2004 00:51:54 -0500 + +zaptel (1:1.0.0-2) unstable; urgency=low + + * New maintainer (Closes: #251938). + * Man pages created for ztcfg, ztmonitor and zttool + (Closes: #274632, #274633, #274634). + * Mark Purcell made the package for version 1.0 + (Closes: #273255, #251929). + * zaptel-modules can be build from zaptel-source with + make-kpkg (Closes: #274085). + * Now it compiles for 2.6 Kernels (Closes: #251930). + + -- Santiago Ruano Rincon Sun, 26 Sep 2004 02:05:44 -0500 + +zaptel (1:1.0.0-1) unstable; urgency=low + + * NMU (See Bug#251938) + * New upstream release + + -- Mark Purcell Fri, 24 Sep 2004 22:46:55 +1000 + +zaptel (1:0.8.1+1.0-RC2-1) unstable; urgency=low + + * New upstream release + + -- Mark Purcell Thu, 9 Sep 2004 19:17:28 +1000 + +zaptel (1:0.8.1+1.0-RC1-1) unstable; urgency=low + + * New upstream release + * Add a debian/watch file + + -- Mark Purcell Wed, 21 Jul 2004 17:51:22 +1000 + +zaptel (1:0.8.1-1) unstable; urgency=low + + * New upstream release + + -- Matt Zimmerman Wed, 11 Feb 2004 15:29:20 -0800 + +zaptel (1:0.8.0-2) unstable; urgency=low + + * Create usr/include ahead of time so that tonezone.h is installed + correctly (Closes: #227795) + + -- Matt Zimmerman Wed, 14 Jan 2004 17:24:26 -0800 + +zaptel (1:0.8.0-1) unstable; urgency=low + + * New upstream release + + -- Matt Zimmerman Tue, 13 Jan 2004 14:44:56 -0800 + +zaptel (1:0.6.0-2) unstable; urgency=low + + * Rebuild with new libnewt + + -- Matt Zimmerman Mon, 30 Jun 2003 22:51:18 -0400 + +zaptel (1:0.6.0-1) unstable; urgency=low + + * New upstream release, needed for new asterisk (Closes: #189661) + + -- Matt Zimmerman Sat, 19 Apr 2003 23:56:59 -0400 + +zaptel (1:0.4.0-2) unstable; urgency=low + + * Break out into {build,install,binary}-indep targets + (Closes: #184528) + * libtonezone-dev Section: libdevel + * Escape $ properly in instructions in postinst + + -- Matt Zimmerman Wed, 12 Mar 2003 19:16:10 -0500 + +zaptel (1:0.4.0-1) unstable; urgency=low + + * New upstream release + + -- Matt Zimmerman Sun, 16 Feb 2003 15:12:02 -0500 + +zaptel (0.cvs.20021029-1) unstable; urgency=low + + * New upstream CVS + * Use MARK2 echo canceller + + -- Matt Zimmerman Tue, 29 Oct 2002 10:37:53 -0500 + +zaptel (0.cvs.20020729-1) unstable; urgency=low + + * New upstream CVS + * Include ztmonitor binary + + -- Matt Zimmerman Mon, 29 Jul 2002 12:36:58 -0400 + +zaptel (0.cvs.20020708-1) unstable; urgency=low + + * New upstream CVS + + -- Matt Zimmerman Mon, 8 Jul 2002 15:32:20 -0400 + +zaptel (0.cvs.20020624-2) unstable; urgency=low + + * Include Makefile in the -source package (oops, Closes: #152014) + + -- Matt Zimmerman Fri, 5 Jul 2002 11:00:08 -0400 + +zaptel (0.cvs.20020624-1) unstable; urgency=low + + * Initial Release (Closes: #150874) + + -- Matt Zimmerman Mon, 17 Jun 2002 10:31:21 -0400 + --- dahdi-tools-2.2.1.1.orig/debian/README.Debian +++ dahdi-tools-2.2.1.1/debian/README.Debian @@ -0,0 +1,57 @@ +Echo Canceller +-------------- +In DAHDI (software) echo cancellers are separate modules, that are +automatically loaded if their name is used in /etc/dahdi/system.conf . +dahdi_genconf, the configuration generator, thus defaults to creating a +system.conf with an echocanceller line for each channel. By default it is +'mg2' (the MG2 echo canceller) but this can be changed by setting +'echocanceller' (see the sample genconf_parameters file). + +The Debian package of dahdi-linux is patched to include support of the +echo canceller OSLEC. Thus dahdi-tools has been patched accordingly to +make it the default echo canceller, and to remove 'echo' as well when +unloading modules. + +However if you, for any strange reason, use a version of the DAHDI +kernel modules that does not include a working dahdi_echocan_oslec.ko, +just set in /etc/dahdi/genconf_parameters: + + echo_can mg2 + + +FXOTune +------- +FXOTune is a utility provided by Digium for fine-tuning parameters of the +FXO modules of their TDM cards and compatibles, as well as of those of the +Xorcom Astribank. + +This package includes the fxotune utility. It will also load configuration +from /etc/fxotune.conf if fxotune was used to tune the FXO modules. Note +that fxotune will not work with X100P and similar cards. + + +Supported tone-zones +-------------------- +DAHDI is capable of playing ring tone, buy tone etc. for a large variety of +countries. This is done using the loadzone and defaultzone settings in +zaptel.conf. A list of tone-zones supported by zaptel and libtonezone is +included in the file tonezones.txt in the documentation directory. + +Example section of system.conf: +loadzone=us,uk,de +defaultzone=us + + +dahdi vs. dahdi-linux +--------------------- +Upstream DAHDI is split to two parts: dahdi-linux are parts that are +supposed to be linux-specific, whereas dahdi-tools are supposed to be +generic utilities to use the DAHDI interface. + +DAHDI-linux includes mostly kernel modules, but also udev rules, xpp +initialization scripts and firmwares (latter are stripped from the +Debian package). Those are included in the package dahdi-linux. + +Most of the dahdi utilities, e.g. dahdi_cfg, dahdi_test, dahdi_monitor +and the dahdi-perl utilities are included in the package 'dahdi' that is +built from the source package dahdi-tools. --- dahdi-tools-2.2.1.1.orig/debian/dahdi.doc-base.astribank +++ dahdi-tools-2.2.1.1/debian/dahdi.doc-base.astribank @@ -0,0 +1,13 @@ +Document: dahdi.astribank +Title: Xorcom Astribank Documentation +Author: Tzafrir Cohen +Abstract: Technical Documentation of the Xorcom Astribank +Section: Network/Communication + +Format: HTML +Index: /usr/share/doc/dahdi/README.Astribank.html +Files: /usr/share/doc/dahdi/README.Astribank.html + +Format: text +Files: /usr/share/doc/dahdi/README.Astribank.gz + --- dahdi-tools-2.2.1.1.orig/debian/watch +++ dahdi-tools-2.2.1.1/debian/watch @@ -0,0 +1,4 @@ +version=3 +opts=uversionmangle=s/-rc/\~rc/; \ + http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-(.*)\.tar\.gz\ + debian svn-upgrade --- dahdi-tools-2.2.1.1.orig/debian/compat +++ dahdi-tools-2.2.1.1/debian/compat @@ -0,0 +1 @@ +7 --- dahdi-tools-2.2.1.1.orig/debian/libtonezone2.0.docs +++ dahdi-tools-2.2.1.1/debian/libtonezone2.0.docs @@ -0,0 +1 @@ +tonezones.txt --- dahdi-tools-2.2.1.1.orig/debian/dahdi.lintian +++ dahdi-tools-2.2.1.1/debian/dahdi.lintian @@ -0,0 +1 @@ +dahdi: mknod-in-maintainer-script postinst:16 --- dahdi-tools-2.2.1.1.orig/debian/modulestest +++ dahdi-tools-2.2.1.1/debian/modulestest @@ -0,0 +1,71 @@ +#!/bin/sh + +# debian/modulestest: a postbuild script to build zaptel modules +# example usage: +# +# svn-buildpackage --svn-postbuild='debian/modulestest -r' --svn-ignore-new + +# At least one of the following two must be set to a sensible value: +# If both are empty, the script does nothing useful) +# +# kernel versions: Comma-separated. Use those if you have their +# kernel-headers/linux-headers packages installed +# + +# Full pathes to trees: +# Use this to provide a full path to a custom kernel tree: +#KERNEL_SOURCES=$HOME/Proj/Debs/Kernel/SwSusp/linux-2.6.15-rc5 +KERNEL_HEADERS= +KERNEL_SOURCES= +# run module-asustant with environment params that will generate +# .changes files even without signing +MODASS="env SIGNCHANGES=1 DEBSIGNCOMMAND=not_an_executable m-a" +me=`basename $0` + +# workaround for silly bash parsing issue in our build scripts: +if [ "$#" -lt 1 ]; then + set -- $MODULESTEST_ARGS +fi + +while getopts ah:rs:t arg +do + case "$arg" in + a) # All of the kernel-headers packages installed: + KERNEL_HEADERS=`COLUMNS=160 dpkg -l 'kernel-headers-2.[46].*-*-*' | awk '/^.i/{print $2}' | sed -e 's/^kernel-headers-//'| xargs| tr ' ' ,` + ;; + h) KERNEL_HEADERS=$OPTARG;; + s) KERNEL_SOURCES=$OPTARG;; + r) KERNEL_HEADERS=`uname -r`;; + t) # TODO: make this test per-distro or something + KERNEL_HEADERS=2.4.27-2-386,2.6.8-2-686-smp + ;; + esac +done +shift $(( $OPTIND-1 )) + +echo "Building for: Headers: $KERNEL_HEADERS, Sources: $KERNEL_SOURCES" + +if [ "$KERNEL_HEADERS" != '' ]; then hdrs_sw="-l $KERNEL_HEADERS"; fi +if [ "$KERNEL_SOURCES" != '' ]; then srcs_sw="-k $KERNEL_SOURCES"; fi + +# must be absolute for m-a ta accept TARBALL: +# Also note that $PWD is ugly and is about to be deleted. We need +# $PWD/.. +TOP_DIR=`dirname $PWD` +MODS_DIR=$TOP_DIR/modules +TAR_BALL=$MODS_DIR/usr/src/zaptel.tar.bz2 +DEB=$TOP_DIR/$PACKAGE-source_${TAG_VERSION}_all.deb +LOG_FILE=$TOP_DIR/$PACKAGE-modules-build-$TAG_VERSION.log + +rm -f $LOG_FILE +dpkg -x $DEB $MODS_DIR + +if [ "$hdrs_sw" != '' ]; then + TARBALL=$TAR_BALL $MODASS -u $TOP_DIR -t -i -f $hdrs_sw build $PACKAGE >>$LOG_FILE +fi +if [ "$srcs_sw" != '' ]; then + TARBALL=$TAR_BALL $MODASS -u $TOP_DIR -t -i -f $srcs_sw build $PACKAGE >>$LOG_FILE +fi + +ls -l $TOP_DIR/$PACKAGE-modules-*_$TAG_VERSION+*.deb +echo "$me: Log file: $LOG_FILE" --- dahdi-tools-2.2.1.1.orig/debian/dahdi.dirs +++ dahdi-tools-2.2.1.1/debian/dahdi.dirs @@ -0,0 +1 @@ +etc/init.d --- dahdi-tools-2.2.1.1.orig/debian/dahdi.prerm +++ dahdi-tools-2.2.1.1/debian/dahdi.prerm @@ -0,0 +1,3 @@ +#! /bin/sh -e + +#DEBHELPER# --- dahdi-tools-2.2.1.1.orig/debian/rules +++ dahdi-tools-2.2.1.1/debian/rules @@ -0,0 +1,140 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatibility version to use. +USE_BRISTUFF=1 +export HOTPLUG_FIRMWARE=1 + +-include /usr/share/quilt/quilt.make + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif + +## MODULE-ASSISTANT STUFF +# prefix of the target package name +PREFIX:=dahdi +SKPG:=$(PREFIX)-source +PACKAGE:=$(PREFIX) +PACKAGE_SRC:=$(PREFIX)-tools +# modifieable for experiments or debugging m-a + +DEBVERSION:=$(shell head -n 1 debian/changelog \ + | sed -e 's/^[^(]*(\([^)]*\)).*/\1/') +DEB_BASE_VERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//') +UPVERSION:=$(shell echo $(DEB_BASE_VERSION) | sed -e 's/~dfsg\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/') + +UPFILENAME := $(PACKAGE_SRC)_$(UPVERSION).orig.tar.gz +FILENAME := $(PACKAGE_SRC)_$(DEB_BASE_VERSION).orig.tar.gz +URL := http://downloads.asterisk.org/pub/telephony/$(PACKAGE_SRC)/releases/$(PACKAGE_SRC)-$(UPVERSION).tar.gz + +build: patch build-stamp +build-stamp: + dh_testdir + + cp -a dahdi.init debian/ + ./configure + $(MAKE) programs docs + # FIXME: xpp/README.Astribank.html + touch $@ + +clean: clean-unpatched unpatch +clean-unpatched: + dh_testdir + dh_testroot + rm -f *-stamp + + # * Makefile does not exist when running svn-buildpackage + # as the source tree is not there. + # FIXME: This will fail with an ugly warning on the clean of the + # modules build. However only fter the actuual clean. + [ ! -f Makefile ] || $(MAKE) dist-clean || true + rm -f debian/dahdi.init + #rm -f debian/manpage.links debian/manpage.refs debian/*.8 + dh_clean + +install: install-arch install-indep + +install-arch: build-stamp + dh_testdir + dh_testroot + dh_prep -a + dh_installdirs -a + + # Add here commands to install the package into debian/tmp + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + # Until upstream kill this stupid thing: + rm -f $(CURDIR)/debian/tmp/usr/sbin/dahdi_speed + # Revert upstream r5533: + rm -f $(CURDIR)/debian/tmp/usr/lib/libtonezone.so.1* + + dh_install -a --sourcedir=$(CURDIR)/debian/tmp + dh_installinit --update-rcd-params="defaults 15 30" --error-handler=init_failed + +install-indep: build-stamp + dh_testdir + dh_testroot + dh_prep -i + dh_installdirs -i + + +# Build architecture-independent files here. +binary-indep: build install-indep + dh_testdir + dh_testroot + + dh_installdocs -i + dh_installchangelogs -i ChangeLog + dh_installexamples -i $(BRISTUFF_EXAMPLES) + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install-arch + dh_testdir + dh_testroot + + dh_installdocs -a + + # should be removed, eventually. Still left for compatibility + dh_installexamples -a + + + #dh_installmodules -a + dh_installchangelogs -a ChangeLog + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + # perl modules are in the arch-dep dahdi + dh_perl -a + dh_makeshlibs -a -V + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +print-version: + @@echo "Debian version: $(DEBVERSION)" + @@echo "Upstream version: $(UPVERSION)" + +TARBALL_DIR=../tarballs/zaptel-$(UPVERSION).tmp +get-orig-source: + @@dh_testdir + @@[ -d ../tarballs/. ]||mkdir -p ../tarballs + @@echo Downloading $(UPFILENAME) from $(URL) ... + @@wget -nv -T10 -t3 --verbose -O ../tarballs/$(FILENAME) $(URL) + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch --- dahdi-tools-2.2.1.1.orig/debian/dahdi.examples +++ dahdi-tools-2.2.1.1/debian/dahdi.examples @@ -0,0 +1,2 @@ +xpp/genconf_parameters +*.conf.sample --- dahdi-tools-2.2.1.1.orig/debian/libtonezone-dev.install +++ dahdi-tools-2.2.1.1/debian/libtonezone-dev.install @@ -0,0 +1,3 @@ +usr/include/dahdi/tonezone.h +usr/lib/lib*.a +usr/lib/lib*.so --- dahdi-tools-2.2.1.1.orig/debian/dahdi.postinst +++ dahdi-tools-2.2.1.1/debian/dahdi.postinst @@ -0,0 +1,25 @@ +#!/bin/sh +set -e + +init_failed() { +echo +echo 'Dahdi drivers not found!' +echo + +if [ -e /usr/share/doc/dahdi-dkms ]; then +echo "Make sure you have the right kernel headers installed by running:" +echo " apt-get install linux-headers-`uname -r`" +echo +echo "This should automatically compile your drivers." +echo +echo "Then restart the dadhi service:" +echo " /etc/init.d/dahdi start" +echo +echo "If that fails, try to reconfigure dahdi by running" +echo " /var/lib/dpkg/info/dahdi-dkms.postinst configure" +echo "and file a bug in launchpad with the error log." +echo +fi +} + +#DEBHELPER# --- dahdi-tools-2.2.1.1.orig/debian/dahdi.install +++ dahdi-tools-2.2.1.1/debian/dahdi.install @@ -0,0 +1,4 @@ +usr/sbin/* +usr/share/perl5/Dahdi* +usr/share/dahdi/* +usr/share/man/man8/* --- dahdi-tools-2.2.1.1.orig/debian/patches/series +++ dahdi-tools-2.2.1.1/debian/patches/series @@ -0,0 +1,11 @@ +# Patch needs to be revised anyway: +#ztcfg-start_stop +zaptel_perl +echocan_oslec +hardware_rescan +perl_fix_noserial +perl_fix_transportdir +astribank_allow_ignoreend +init_unload_modules +init_unload_oslec +wcb4xxp_extra_trunk --- dahdi-tools-2.2.1.1.orig/debian/patches/init_unload_modules +++ dahdi-tools-2.2.1.1/debian/patches/init_unload_modules @@ -0,0 +1,83 @@ +From: Tzafrir Cohen +Date: Sun, 7 Feb 2010 09:13:50 +0000 +Subject: dahdi.init: allow specifying the module(s) to download. +Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7997 + +At the 'stop' command, the dahdi init.d service unloads dahdi +(and any module it depends in). + +With this change, the user will be able to specify the modules to +unload, by setting DAHDI_UNLOAD_MODULES in init.conf. This allows: + +* Disabling module unloading altogether +* Allowing the user to unload other modules as well, e.g. the 'echo' + module of OSLEC, if you build it as part of DAHDI. + +Note that unless you explicitly set DAHDI_UNLOAD_MODULES, the script +behaves exatly as before. + +This patch is included in current trunk of dahdi-tools (will become 2.3). + +--- + dahdi.init | 14 ++++++++++++-- + init.conf.sample | 5 +++++ + 2 files changed, 17 insertions(+), 2 deletions(-) + +--- a/dahdi.init ++++ b/dahdi.init +@@ -37,6 +37,10 @@ XPP_SYNC=auto + # device nodes after the modules have loaded and before running dahdi_cfg. + DAHDI_DEV_TIMEOUT=20 + ++# A list of modules to unload when stopping. ++# All of their dependencies will be unloaded as well. ++DAHDI_UNLOAD_MODULES="dahdi" ++ + # + # Determine which kind of configuration we're using + # +@@ -86,6 +90,12 @@ unload_module() { + rmmod $module + } + ++unload_modules() { ++ for module in $DAHDI_UNLOAD_MODULES; do ++ unload_module $module ++ done ++} ++ + # In (xpp) hotplug mode, the init script is also executed from the + # hotplug hook. In that case it should not attempt to loade modules. + # +@@ -262,7 +272,7 @@ case "$1" in + # Unload drivers + #shutdown_dynamic # FIXME: needs test from someone with dynamic spans + echo -n "Unloading DAHDI hardware modules: " +- if unload_module dahdi; then ++ if unload_modules; then + echo "done" + else + echo "error" +@@ -272,7 +282,7 @@ case "$1" in + fi + ;; + unload) +- unload_module dahdi ++ unload_modules + ;; + restart|force-reload) + $0 stop +--- a/init.conf.sample ++++ b/init.conf.sample +@@ -8,6 +8,11 @@ + # device nodes after the modules have loaded and before running dahdi_cfg. + #DAHDI_DEV_TIMEOUT=40 + ++# A list of modules to unload when stopping. ++# All of their dependencies will be unloaded as well. ++#DAHDI_UNLOAD_MODULES="" # Disable module unloading ++#DAHDI_UNLOAD_MODULES="dahdi echo" # If you use OSLEC ++ + # Override settings for xpp_fxloader + #XPP_FIRMWARE_DIR=/usr/share/dahdi + #XPP_HOTPLUG_DISABLED=yes --- dahdi-tools-2.2.1.1.orig/debian/patches/hardware_rescan +++ dahdi-tools-2.2.1.1/debian/patches/hardware_rescan @@ -0,0 +1,31 @@ +Subject: xpp: Dahdi::Hardware->rescan() - refresh hardware list +Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7012 + +Allow refreshing the list of hardware even after the initial scan. +(E.g. a script that resets firmware for Astribanks) + +Backport from current trunk. Will be included in dahdi-tools 2.3. + +--- a/xpp/perl_modules/Dahdi/Hardware.pm ++++ b/xpp/perl_modules/Dahdi/Hardware.pm +@@ -183,6 +183,20 @@ sub scan($) { + } + } + ++=head1 rescan ++ ++Rescan for devices. In case new devices became available since the script ++has started. ++ ++=cut ++ ++sub rescan($) { ++ my $pack = shift || die; ++ ++ $hardware_scanned = 0; ++ $pack->scan(); ++} ++ + sub import { + Dahdi::Hardware->scan unless grep(/\bnoscan\b/i, @_); + } --- dahdi-tools-2.2.1.1.orig/debian/patches/zaptel_perl +++ dahdi-tools-2.2.1.1/debian/patches/zaptel_perl @@ -0,0 +1,22 @@ +Subject: Set perl installation path to vendorlib +Author: Tzafrir Cohen +Forwarded: no + +Point Zaptel PERL modules to the right directory under which to install +perl modules. + +(sitelib in Debian is under /usr/local. We don't want to install there) + +Debian-specific configuration. + +--- a/xpp/Makefile ++++ b/xpp/Makefile +@@ -28,7 +28,7 @@ SBINDIR = $(prefix)/sbin + DATADIR = $(datadir)/dahdi + MANDIR = $(mandir)/man8 + HOTPLUG_USB_DIR = /etc/hotplug/usb +-PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib") ++PERLLIBDIR := $(shell eval `perl -V:vendorlib`; echo "$$vendorlib") + PERL_DIRS := $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs) + PERL_MODS_PAT := *.pm $(PERL_DIRS:%=%/*.pm) + PERL_MODS := $(shell cd perl_modules; echo $(PERL_MODS_PAT)) --- dahdi-tools-2.2.1.1.orig/debian/patches/perl_fix_transportdir +++ dahdi-tools-2.2.1.1/debian/patches/perl_fix_transportdir @@ -0,0 +1,34 @@ +From: Tzafrir Cohen +Subject: A better test for the Astribank transport directory +Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7954 +Last-Update: 2010-01-24 + +* On some kernels there's no 'usb_endpoint' under the USB device's SysFS + node. Use 'idVendor' which is far less likely to fail. +* Actively resolve the symlink 'transport' to its name (e.g. '1-2'). + +Backport from current trunk. Will be included in dahdi-tools 2.3. + +--- + xpp/perl_modules/Dahdi/Hardware/USB.pm | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/xpp/perl_modules/Dahdi/Hardware/USB.pm b/xpp/perl_modules/Dahdi/Hardware/USB.pm +index dff25ef..8b84243 100644 +--- a/xpp/perl_modules/Dahdi/Hardware/USB.pm ++++ b/xpp/perl_modules/Dahdi/Hardware/USB.pm +@@ -93,8 +93,9 @@ sub set_transport($$) { + } else { + warn "Bad USB transportdir='$transportdir' usbdev='$usbdev'\n"; + } +- } elsif(-d "$transportdir/usb_endpoint") { +- $transportdir =~ m|/(\d+)-\d+$|; ++ } elsif(-f "$transportdir/idVendor" ) { ++ my $transport_link = readlink($transportdir); ++ $transport_link =~ m|/(\d+)-\d+$|; + $busnum = $1; + $devnum = readval("$transportdir/devnum"); + } +-- +1.6.5 + --- dahdi-tools-2.2.1.1.orig/debian/patches/perl_diet +++ dahdi-tools-2.2.1.1/debian/patches/perl_diet @@ -0,0 +1,97 @@ +Remove the dependency on the module File::Basename. + +This provides the ability to run the scripts using a local modules +directory. While that ability is very handy with the source distribution +and in testing environments, it is useless on a Debian package. + +It is removed in a (currently still failed) attempt to remove the +dependency on perl and depend on perl-base alone. + +--- a/xpp/dahdi.cgi ++++ b/xpp/dahdi.cgi +@@ -6,8 +6,6 @@ + # modify it under the same terms as Perl itself. + + use strict; +-use File::Basename; +-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } + + use CGI::Pretty qw/:standard start_ul start_li start_div start_pre/; + use Dahdi; +--- a/xpp/dahdi_drivers ++++ b/xpp/dahdi_drivers +@@ -1,7 +1,5 @@ + #! /usr/bin/perl -w + use strict; +-use File::Basename; +-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } + + use Dahdi::Hardware; + +--- a/xpp/dahdi_genconf ++++ b/xpp/dahdi_genconf +@@ -8,8 +8,6 @@ + # $Id: dahdi_genconf 5440 2008-12-05 00:24:09Z tzafrir $ + # + use strict; +-use File::Basename; +-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } + + use Dahdi; + use Dahdi::Hardware; +--- a/xpp/dahdi_hardware ++++ b/xpp/dahdi_hardware +@@ -8,9 +8,7 @@ + # $Id: dahdi_hardware 4484 2008-06-29 16:57:48Z tzafrir $ + # + use strict; +-use File::Basename; + use Getopt::Std; +-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } + + use Dahdi; + use Dahdi::Span; +--- a/xpp/dahdi_registration ++++ b/xpp/dahdi_registration +@@ -8,8 +8,6 @@ + # $Id: dahdi_registration 4533 2008-07-03 08:22:02Z tzafrir $ + # + use strict; +-use File::Basename; +-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } + + use Dahdi; + use Dahdi::Span; +--- a/xpp/lsdahdi ++++ b/xpp/lsdahdi +@@ -8,8 +8,6 @@ + # $Id: lsdahdi 4764 2008-08-12 10:21:53Z tzafrir $ + # + use strict; +-use File::Basename; +-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } + + use Dahdi; + use Dahdi::Span; +--- a/xpp/xpp_blink ++++ b/xpp/xpp_blink +@@ -8,8 +8,6 @@ + # $Id: xpp_blink 4416 2008-06-19 17:34:36Z tzafrir $ + # + use strict; +-use File::Basename; +-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } + + use Dahdi; + use Dahdi::Span; +--- a/xpp/xpp_sync ++++ b/xpp/xpp_sync +@@ -8,8 +8,6 @@ + # $Id: xpp_sync 4484 2008-06-29 16:57:48Z tzafrir $ + # + use strict; +-use File::Basename; +-BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } + + use Dahdi::Xpp; + use Dahdi::Xpp::Xbus; --- dahdi-tools-2.2.1.1.orig/debian/patches/ztcfg-start_stop +++ dahdi-tools-2.2.1.1/debian/patches/ztcfg-start_stop @@ -0,0 +1,161 @@ +## DP: ztcfg: Add options to activate a specific span (or all of them) or +## DP: shut down just a specific span (not just all of them). + +@DPATCH@ +diff -urN zaptel-1.4.4.orig/ztcfg.c zaptel-1.4.4/ztcfg.c +--- zaptel-1.4.4.orig/dahdi_cfg.c 2007-02-07 17:51:27.000000000 +0100 ++++ zaptel-1.4.4/dahdi_cfg.c 2007-07-18 14:33:17.884803750 +0200 +@@ -96,6 +96,10 @@ + + static int stopmode = 0; + ++static int stopwhich = -1; ++ ++static int startwhich = -1; ++ + static int numdynamic = 0; + + static char zonestoload[ZT_TONE_ZONE_MAX][10]; +@@ -1261,7 +1265,8 @@ + " -d [level] -- Generate debugging output. (Default level is 1.)\n" + " -f -- Always reconfigure every channel\n" + " -h -- Generate this help statement\n" +- " -s -- Shutdown spans only\n" ++ " -s[span] -- Deactivate/shutdown span [span]. Deactivates all spans if no [span] is given.\n" ++ " -a[span] -- Activate/start span [span]. Activates all spans if no [span] is given.\n" + " -t -- Test mode only, do not apply\n" + " -v -- Verbose (more -v's means more verbose)\n" + ,c); +@@ -1274,7 +1279,7 @@ + char *buf; + char *key, *value; + int x,found; +- while((c = getopt(argc, argv, "fthc:vsd::")) != -1) { ++ while((c = getopt(argc, argv, "fthc:vs::a::d::")) != -1) { + switch(c) { + case 'c': + filename=optarg; +@@ -1295,8 +1300,20 @@ + fo_real = 0; + break; + case 's': ++ if (optarg) { ++ stopwhich = atoi(optarg); ++ } else { ++ stopwhich = -1; ++ } + stopmode = 1; + break; ++ case 'a': ++ if (optarg) { ++ startwhich = atoi(optarg); ++ } else { ++ startwhich = -1; ++ } ++ break; + case 'd': + if (optarg) + debug = atoi(optarg); +@@ -1358,29 +1375,42 @@ + ioctl(fd, ZT_DYNAMIC_DESTROY, &zds[x]); + } + if (stopmode) { +- for (x=0;x 0){ ++ if ((stopwhich > spans) || (ioctl(fd, ZT_SHUTDOWN, &lc[stopwhich - 1].span))) { ++ fprintf(stderr, "Zaptel shutdown failed: %s\n", strerror(errno)); ++ close(fd); ++ exit(1); ++ } else { ++ if (verbose) { ++ printf("Deactivated span %d\n", stopwhich); ++ } ++ } ++ } else { ++ for (x=0;x -1) { ++ } ++ if (deftonezone > -1) { + if (ioctl(fd, ZT_DEFAULTZONE, &deftonezone)) { + fprintf(stderr, "ZT_DEFAULTZONE failed: %s (%d)\n", strerror(errno), errno); + close(fd); + exit(1); + } ++ } + } +- for (x=0;x 0) { ++ if ((startwhich > spans) || (ioctl(fd, ZT_STARTUP, &lc[startwhich - 1].span))) { ++ fprintf(stderr, "Zaptel startup failed: %s\n", strerror(errno)); ++ close(fd); ++ exit(1); ++ } else { ++ if (verbose) { ++ printf("Activated span %d\n", startwhich); ++ } ++ } ++ } else { ++ for (x=0;x { DRIVER => 'qozap', DESCRIPTION => 'Junghanns DuoBRI ISDN card' }, +- '1397:08b4' => { DRIVER => 'qozap', DESCRIPTION => 'Junghanns QuadBRI ISDN card' }, +- '1397:16b8' => { DRIVER => 'qozap', DESCRIPTION => 'Junghanns OctoBRI ISDN card' }, ++ '1397:08b4/1397:b540' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Swyx 4xS0 SX2 QuadBri' }, ++ '1397:08b4/1397:b556' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns DuoBRI ISDN card' }, ++ '1397:08b4/1397:b520' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns QuadBRI ISDN card' }, ++ '1397:08b4/1397:b550' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns QuadBRI ISDN card' }, ++ '1397:16b8/1397:b552' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns OctoBRI ISDN card' }, ++ '1397:16b8/1397:b55b' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'Junghanns OctoBRI ISDN card' }, ++ '1397:08b4/1397:e884' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'OpenVox B200P' }, ++ '1397:08b4/1397:e888' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'OpenVox B400P' }, ++ '1397:16b8/1397:e998' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'OpenVox B800P' }, ++ '1397:08b4/1397:b566' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN2S0' }, ++ '1397:08b4/1397:b560' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN4S0' }, ++ '1397:16b8/1397:b562' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN8S0' }, ++ '1397:08b4' => { DRIVER => 'qozap', DESCRIPTION => 'Generic Cologne ISDN card' }, ++ '1397:16b8' => { DRIVER => 'qozap', DESCRIPTION => 'Generic OctoBRI ISDN card' }, + '1397:30b1' => { DRIVER => 'cwain', DESCRIPTION => 'HFC-E1 ISDN E1 card' }, + '1397:2bd0' => { DRIVER => 'zaphfc', DESCRIPTION => 'HFC-S ISDN BRI card' }, + # Has three submodels. Tested with 0675:1704: --- dahdi-tools-2.2.1.1.orig/debian/patches/perl_fix_noserial +++ dahdi-tools-2.2.1.1/debian/patches/perl_fix_noserial @@ -0,0 +1,43 @@ +From: Tzafrir Cohen +Subject: Not all Astribanks have a 'serial' attribute. Make it optional. +Origin: http://svn.digium.com/svn/dahdi/tools/trunk@7953 +Last-Update: 2010-01-24 + +Backport from current trunk. Will be included in dahdi-tools 2.3. + +--- + xpp/perl_modules/Dahdi/Hardware/USB.pm | 11 ++++++++++- + 1 files changed, 10 insertions(+), 1 deletions(-) + +diff --git a/xpp/perl_modules/Dahdi/Hardware/USB.pm b/xpp/perl_modules/Dahdi/Hardware/USB.pm +index 3eb9fe6..dff25ef 100644 +--- a/xpp/perl_modules/Dahdi/Hardware/USB.pm ++++ b/xpp/perl_modules/Dahdi/Hardware/USB.pm +@@ -121,6 +121,15 @@ sub _get_attr($) { + return $value; + } + ++sub _get_attr_optional($$) { ++ my ($attr_file, $def_val) = $@; ++ ++ eval {return _get_attr($attr_file)}; ++ ++ # If we got here, _get_attr exploded. Return the default value: ++ return $def_val; ++} ++ + sub scan_devices_sysfs($) { + my $pack = shift || die; + my @devices = (); +@@ -137,7 +146,7 @@ sub scan_devices_sysfs($) { + my $model = $usb_ids{"$vendor:$product"}; + next unless defined $model; + my $devnum = _get_attr("$_/devnum"); +- my $serial = _get_attr("$_/serial"); ++ my $serial = _get_attr_optional("$_/serial", ''); + my $devname = sprintf("%03d/%03d", $busnum, $devnum); + my $d = Dahdi::Hardware::USB->new( + IS_ASTRIBANK => ($model->{DRIVER} eq 'xpp_usb')?1:0, +-- +1.6.5 + --- dahdi-tools-2.2.1.1.orig/debian/patches/init_unload_oslec +++ dahdi-tools-2.2.1.1/debian/patches/init_unload_oslec @@ -0,0 +1,26 @@ +Subject: also unload OSLEC (echo) on module unload +From: Tzafrir Cohen +Forwarded: no + +This patch sets the DAHDI init.d script to also unload 'echo' (OSLEC) +in the 'stop' target. This adds to the default of unloading dahdi and +all of its dependent modules. + +The package dahdi-linux includes 'echo' and with the default settings, +will attempts load 'echo', that does not depend on dahdi, and hence +will not be unloaded by default. Thus upgrading to a newer version (of +a newer build) may break. + +This change will not be commited upstream, as OSLEC is not used there. + +--- a/dahdi.init ++++ b/dahdi.init +@@ -39,7 +39,7 @@ DAHDI_DEV_TIMEOUT=20 + + # A list of modules to unload when stopping. + # All of their dependencies will be unloaded as well. +-DAHDI_UNLOAD_MODULES="dahdi" ++DAHDI_UNLOAD_MODULES="dahdi echo" + + # + # Determine which kind of configuration we're using --- dahdi-tools-2.2.1.1.orig/debian/patches/astribank_allow_ignoreend +++ dahdi-tools-2.2.1.1/debian/patches/astribank_allow_ignoreend @@ -0,0 +1,53 @@ +From: Tzafrir Cohen +Date: Tue, 12 Jan 2010 19:05:40 +0000 +Subject: xpp: ignore everything after the end of the license stanza +Origin: http://svn.digium.com/svn/dahdi/tools/branches/2.2@7901 + +Patch merged into branch 2.2 from trunk slightly too late to make it into +2.2.1 . Should be part of any future release. + +--- + xpp/astribank_allow.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/xpp/astribank_allow.c b/xpp/astribank_allow.c +index ec60d4a..b68c3a2 100644 +--- a/xpp/astribank_allow.c ++++ b/xpp/astribank_allow.c +@@ -199,7 +199,7 @@ static int read_from_file(struct eeprom_table *eeprom_table, struct capabilities + * 1: read Version, goto 2. if not version line then error. + * 2: after BEGIN line. split line into key:value. if line is Data:, goto 3. + * 3: read binary data. if line is END_LICENSE_BLOCK goto 4. +- * 4: END_LICENSE_BLOCK - if not EOF - error. otherwise exit loop and success. ++ * 4: END_LICENSE_BLOCK - ignore lines. + */ + while (fgets(buf, 256, f) != NULL) { + lineno++; +@@ -210,7 +210,12 @@ static int read_from_file(struct eeprom_table *eeprom_table, struct capabilities + } + line = trim(buf); + if (line == NULL) { +- ERR("Line %d: Empty line\n", lineno); ++ if (state > 0 && state < 4) { ++ ERR("Line %d: Empty line\n", lineno); ++ return -1; ++ } ++ else ++ continue; + } + switch (state) { + case 0: +@@ -259,8 +264,8 @@ static int read_from_file(struct eeprom_table *eeprom_table, struct capabilities + } + break; + case 4: +- ERR("Extra data after license end block\n"); +- return -1; ++ break; ++ + } + } + if (state != 4) { +-- +1.6.5 + --- dahdi-tools-2.2.1.1.orig/debian/patches/echocan_oslec +++ dahdi-tools-2.2.1.1/debian/patches/echocan_oslec @@ -0,0 +1,21 @@ +Subject: Make OSLEC the default DAHDI echo canceller +Author: Tzafrir Cohen +Forwarded: no + +Our dahdi-linux packages provide OSLEC, which is generally a better echo +canceller than those included with DAHDI. Thus we should make it the +default echo canceller in generated configurations. + +Debian-specific configuration tweak. + +--- a/xpp/perl_modules/Dahdi/Config/Params.pm ++++ b/xpp/perl_modules/Dahdi/Config/Params.pm +@@ -106,7 +106,7 @@ sub item($$) { + group_lines => '0', + brint_overlap => 'no', + bri_sig_style => 'bri_ptmp', +- echo_can => 'mg2', ++ echo_can => 'oslec', + bri_hardhdlc => 'auto', + pri_connection_type => 'PRI', + r2_idle_bits => '1101',