[Pkg-voip-commits] r4660 - in /asterisk-chan-capi/trunk/debian/patches: 00list 02_capi-cmsg2str-mutex.dpatch asterisk.h.dpatch asterisk_1.4.3.dpatch

[kilian at alioth.debian.org]

Author: kilian
Date: Tue Oct  2 07:39:54 2007
New Revision: 4660

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4660
Log:
update patches applying. 
02_capi-cmsg2str-mutex.dpatch included upstream

Removed:
    asterisk-chan-capi/trunk/debian/patches/02_capi-cmsg2str-mutex.dpatch
Modified:
    asterisk-chan-capi/trunk/debian/patches/00list
    asterisk-chan-capi/trunk/debian/patches/asterisk.h.dpatch
    asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch

Modified: asterisk-chan-capi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-chan-capi/trunk/debian/patches/00list?rev=4660&op=diff
==============================================================================
--- asterisk-chan-capi/trunk/debian/patches/00list (original)
+++ asterisk-chan-capi/trunk/debian/patches/00list Tue Oct  2 07:39:54 2007
@@ -1,4 +1,3 @@
 01_debian-patch
-02_capi-cmsg2str-mutex
 asterisk.h
 asterisk_1.4.3

Modified: asterisk-chan-capi/trunk/debian/patches/asterisk.h.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-chan-capi/trunk/debian/patches/asterisk.h.dpatch?rev=4660&op=diff
==============================================================================
--- asterisk-chan-capi/trunk/debian/patches/asterisk.h.dpatch (original)
+++ asterisk-chan-capi/trunk/debian/patches/asterisk.h.dpatch Tue Oct  2 07:39:54 2007
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad asterisk-chan-capi-1.0.1~/chan_capi.c asterisk-chan-capi-1.0.1/chan_capi.c
---- asterisk-chan-capi-1.0.1~/chan_capi.c	2007-04-27 21:16:03.000000000 +1000
-+++ asterisk-chan-capi-1.0.1/chan_capi.c	2007-04-27 21:16:22.000000000 +1000
-@@ -62,7 +62,7 @@
+diff -urNad asterisk-chan-capi-1.0.2~/chan_capi.h asterisk-chan-capi-1.0.2/chan_capi.h
+--- asterisk-chan-capi-1.0.2~/chan_capi.h	2007-09-27 10:09:26.000000000 +0200
++++ asterisk-chan-capi-1.0.2/chan_capi.h	2007-10-02 09:35:57.000000000 +0200
+@@ -19,7 +19,7 @@
  #include "config.h"
  
  #ifdef CC_AST_HAS_VERSION_1_4

Modified: asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch?rev=4660&op=diff
==============================================================================
--- asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch (original)
+++ asterisk-chan-capi/trunk/debian/patches/asterisk_1.4.3.dpatch Tue Oct  2 07:39:54 2007
@@ -1,10 +1,9 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 @DPATCH@
-Index: chan_capi.c
-===================================================================
---- orig/chan_capi.c	(revision 455)
-+++ mod/chan_capi.c	(revision 456)
-@@ -1817,6 +1817,9 @@
+diff -urNad asterisk-chan-capi-1.0.2~/chan_capi.c asterisk-chan-capi-1.0.2/chan_capi.c
+--- asterisk-chan-capi-1.0.2~/chan_capi.c	2007-10-02 09:36:08.000000000 +0200
++++ asterisk-chan-capi-1.0.2/chan_capi.c	2007-10-02 09:36:16.000000000 +0200
+@@ -1728,6 +1728,9 @@
  
  #ifdef CC_AST_HAS_EXT_CHAN_ALLOC
  	tmp = ast_channel_alloc(0, state, i->cid, NULL,
@@ -14,7 +13,7 @@
  		"CAPI/%s/%s-%x", i->vname, i->dnid, capi_counter++);
  #else
  	tmp = ast_channel_alloc(0);
-@@ -1908,7 +1911,6 @@
+@@ -1810,7 +1813,6 @@
  		ast_getformatname_multiple(alloca(80), 80,
  		tmp->nativeformats),
  		(i->rtp) ? " (RTP)" : "");
@@ -22,7 +21,7 @@
  
  	if (!ast_strlen_zero(i->cid)) {
  		if (tmp->cid.cid_num) {
-@@ -1923,9 +1925,12 @@
+@@ -1825,9 +1827,12 @@
  		tmp->cid.cid_dnid = strdup(i->dnid);
  	}
  	tmp->cid.cid_ton = i->cid_ton;
@@ -35,7 +34,7 @@
  	cc_copy_string(tmp->exten, i->dnid, sizeof(tmp->exten));
  #ifdef CC_AST_HAS_STRINGFIELD_IN_CHANNEL
  	ast_string_field_set(tmp, accountcode, i->accountcode);
-@@ -1934,6 +1939,14 @@
+@@ -1836,6 +1841,14 @@
  	cc_copy_string(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode));
  	cc_copy_string(tmp->language, i->language, sizeof(tmp->language));
  #endif
@@ -48,15 +47,14 @@
 +#endif
 +
  	i->owner = tmp;
+ 	i->used = tmp;
  
- #ifdef CC_AST_HAS_VERSION_1_4
-Index: create_config.sh
-===================================================================
---- orig/create_config.sh	(revision 455)
-+++ mod/create_config.sh	(revision 456)
-@@ -83,6 +83,15 @@
- 	echo " * no extended ast_channel_alloc"
+diff -urNad asterisk-chan-capi-1.0.2~/create_config.sh asterisk-chan-capi-1.0.2/create_config.sh
+--- asterisk-chan-capi-1.0.2~/create_config.sh	2007-10-02 09:36:08.000000000 +0200
++++ asterisk-chan-capi-1.0.2/create_config.sh	2007-10-02 09:36:16.000000000 +0200
+@@ -92,6 +92,15 @@
  fi
+ 
  
 +if grep -q "ast_channel_alloc.*amaflag" $INCLUDEDIR/channel.h; then
 +	echo "#define CC_AST_HAS_EXT2_CHAN_ALLOC" >>$CONFIGFILE