[Pkg-voip-commits] r5790 - in /asterisk/trunk/debian: changelog patches/bristuff/app-zapras-fix-audiomode patches/bristuff/isdn-fixes

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sun May 25 19:32:39 2008
New Revision: 5790

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5790
Log:
Rename app-zapras-fix-audiomode to isdn-fixes and include another fix
that we dropped earlier by mistake (r5162).

Added:
    asterisk/trunk/debian/patches/bristuff/isdn-fixes
      - copied, changed from r5776, asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode
Removed:
    asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode
Modified:
    asterisk/trunk/debian/changelog

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5790&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun May 25 19:32:39 2008
@@ -23,9 +23,11 @@
     - Remove disabled chan-capi patch, obsoleted by upstream.
     - Remove uniqueid-01-use-pid-on-uniqueid-generation patch, dropped by
       upstream.
+    - Rename app-zapras-fix-audiomode to isdn-fixes and include another fix
+      that we dropped earlier by mistake (r5162).
     - Other minor and cosmetic fixes.
 
- -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 May 2008 22:05:02 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 May 2008 22:31:46 +0300
 
 asterisk (1:1.4.19.1~dfsg-1) unstable; urgency=low
 

Copied: asterisk/trunk/debian/patches/bristuff/isdn-fixes (from r5776, asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode)
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/isdn-fixes?rev=5790&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/app-zapras-fix-audiomode (original)
+++ asterisk/trunk/debian/patches/bristuff/isdn-fixes Sun May 25 19:32:39 2008
@@ -9,3 +9,16 @@
  			ioctl(chan->fds[0], ZT_AUDIOMODE, &x);
  
  			/* Restore saved values */
+--- a/main/channel.c
++++ b/main/channel.c
+@@ -3925,6 +3925,10 @@ enum ast_bridge_result ast_channel_bridg
+ 			c1->name, c1->_bridge->name);
+ 		return -1;
+ 	}
++
++	if (IS_DIGITAL(c0->transfercapability) || IS_DIGITAL(c1->transfercapability)) {
++	    config->flags = 0;
++	}
+ 	
+ 	/* Stop if we're a zombie or need a soft hangup */
+ 	if (ast_test_flag(c0, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c0) ||