[Pkg-voip-commits] r7903 - in /dahdi-linux/trunk/debian: changelog dahdi-source.install lintian/ lintian/dahdi-source patches/series patches/uk_rotary zaptel.init zaptel.lintian zaptel.postinst zaptel.postrm

Sat Dec 19 01:48:37 UTC 2009

Author: tzafrir-guest
Date: Sat Dec 19 01:48:37 2009
New Revision: 7903

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7903
Log:
* New upstream release: 2.2.1-rc2
* Dropped patch wcfxo_reset_fix: merged upstream.
* Patch uk_rotary (Closes: #546329).
* Override the bogus lintian warning for 'm-a a-i dahdi'
* Remove some remaining Zaptel left-overs.

Added:
    dahdi-linux/trunk/debian/dahdi-source.install
    dahdi-linux/trunk/debian/lintian/
    dahdi-linux/trunk/debian/lintian/dahdi-source
    dahdi-linux/trunk/debian/patches/uk_rotary
Removed:
    dahdi-linux/trunk/debian/zaptel.init
    dahdi-linux/trunk/debian/zaptel.lintian
    dahdi-linux/trunk/debian/zaptel.postinst
    dahdi-linux/trunk/debian/zaptel.postrm
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series

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

--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Sat Dec 19 01:48:37 2009
@@ -1,12 +1,17 @@
-dahdi-linux (1:2.2.0.2~dfsg-2) UNRELEASED; urgency=low
+dahdi-linux (1:2.2.1~rc2~dfsg-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
   [ Tzafrir Cohen ]
+  * New upstream release.
+  * Dropped patch wcfxo_reset_fix: merged upstream.
   * Section name of dahdi-source: kernel
   * Also provide an example xpp.conf .
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 11 Nov 2009 16:35:56 +0200
+  * Patch uk_rotary (Closes: #546329). 
+  * Override the bogus lintian warning for 'm-a a-i dahdi'
+  * Remove some remaining Zaptel left-overs.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 19 Dec 2009 03:45:02 +0200
 
 dahdi-linux (1:2.2.0.2~dfsg-1) unstable; urgency=low
 
@@ -19,7 +24,7 @@
     Leave vzaphfc for now as this is practically upstream (Completely 
    closes: #548061).
   * Not applying bri_dchan. Astribank BRI spans will use hardhdlc.
-  * Patch wcfxo_reset_fix: Closes: #546304 .
+  * Patch wcfxo_reset_fix: Closes: #546330 .
   * Replace 'dh_clean -k' with dh_prep
   * Standards version 3.8.3 (no change needed).
   * Patch mmx_auto: relied on ARCH to tell between i386 and x86_64, which 

Added: dahdi-linux/trunk/debian/dahdi-source.install
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/dahdi-source.install?rev=7903&op=file
==============================================================================
--- dahdi-linux/trunk/debian/dahdi-source.install (added)
+++ dahdi-linux/trunk/debian/dahdi-source.install Sat Dec 19 01:48:37 2009
@@ -1,0 +1,1 @@
+debian/lintian/dahdi-source usr/share/lintian/overrides

Added: dahdi-linux/trunk/debian/lintian/dahdi-source
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/lintian/dahdi-source?rev=7903&op=file
==============================================================================
--- dahdi-linux/trunk/debian/lintian/dahdi-source (added)
+++ dahdi-linux/trunk/debian/lintian/dahdi-source Sat Dec 19 01:48:37 2009
@@ -1,0 +1,2 @@
+# Complete phrase: m-a a-i dahdi
+dahdi-source: description-contains-duplicated-word a a

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=7903&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Sat Dec 19 01:48:37 2009
@@ -9,4 +9,4 @@
 oslec_kbuild
 no_firmware_download
 mmx_auto
-wcfxo_reset_fix
+uk_rotary

Added: dahdi-linux/trunk/debian/patches/uk_rotary
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/uk_rotary?rev=7903&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/uk_rotary (added)
+++ dahdi-linux/trunk/debian/patches/uk_rotary Sat Dec 19 01:48:37 2009
@@ -1,0 +1,38 @@
+Subject: Adds a parameter 'dialdebounce' to wctdm.
+Author: Tilghman Lesher <tlesher at digium.com>
+Bug: https://issues.asterisk.org/view.php?id=16339
+Bug-Debian: http://bugs.debian.org/546329
+Last-Update: 2009-12-19
+
+For UK rotary phones, set dialdebounce=32 . E.g. in
+/etc/modprobe.d/dahdi.conf add the line:
+
+  options wctdm dialdebounce=32
+
+--- a/drivers/dahdi/wctdm.c
++++ b/drivers/dahdi/wctdm.c
+@@ -284,6 +284,7 @@ static unsigned int battdebounce;
+ static unsigned int battalarm;
+ static unsigned int battthresh;
+ static int ringdebounce = DEFAULT_RING_DEBOUNCE;
++static int dialdebounce = 8 * 8 /* times 4, because must be a multiple of 4ms */;
+ static int fwringdetect = 0;
+ static int debug = 0;
+ static int robust = 0;
+@@ -1002,7 +1003,7 @@ static inline void wctdm_proslic_check_h
+ 	hook = (res & 1);
+ 	if (hook != fxs->lastrxhook) {
+ 		/* Reset the debounce (must be multiple of 4ms) */
+-		fxs->debounce = 8 * (4 * 8);
++		fxs->debounce = dialdebounce * 4;
+ #if 0
+ 		printk(KERN_DEBUG "Resetting debounce card %d hook %d, %d\n",
+ 		       card, hook, fxs->debounce);
+@@ -2641,6 +2642,7 @@ module_param(battdebounce, uint, 0600);
+ module_param(battalarm, uint, 0600);
+ module_param(battthresh, uint, 0600);
+ module_param(ringdebounce, int, 0600);
++module_param(dialdebounce, int, 0600);
+ module_param(fwringdetect, int, 0600);
+ module_param(alawoverride, int, 0600);
+ module_param(fastpickup, int, 0600);


