[Pkg-voip-commits] r5178 - in /asterisk/trunk/debian/patches/bristuff: zapata-bri+euroisdn zapata_euroisdn_holded zapata_num_spans

[paravoid at alioth.debian.org]

Author: paravoid
Date: Thu Jan 31 10:19:00 2008
New Revision: 5178

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5178
Log:
Manually convert some patches to be in a -p ab --no-timestamps --no-index quilt style

Modified:
    asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
    asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
    asterisk/trunk/debian/patches/bristuff/zapata_num_spans

Modified: asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-bri%2Beuroisdn?rev=5178&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-bri+euroisdn Thu Jan 31 10:19:00 2008
@@ -1,7 +1,5 @@
-Index: asterisk-14/include/asterisk/channel.h
-===================================================================
---- asterisk-14.orig/include/asterisk/channel.h	2008-01-20 21:55:17.000000000 +0200
-+++ asterisk-14/include/asterisk/channel.h	2008-01-20 21:56:58.000000000 +0200
+--- a/include/asterisk/channel.h
++++ b/include/asterisk/channel.h
 @@ -417,6 +417,7 @@
  	unsigned int flags;				/*!< channel flags of AST_FLAG_ type */
  	unsigned short transfercapability;		/*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
@@ -10,10 +8,8 @@
  	int alertpipe[2];
  
  	int nativeformats;				/*!< Kinds of data this channel can natively handle */
-Index: asterisk-14/channels/chan_zap.c
-===================================================================
---- asterisk-14.orig/channels/chan_zap.c	2008-01-20 21:55:17.000000000 +0200
-+++ asterisk-14/channels/chan_zap.c	2008-01-20 22:33:53.000000000 +0200
+--- a/channels/chan_zap.c
++++ b/channels/chan_zap.c
 @@ -11,6 +11,10 @@
   * the project provides a web site, mailing lists and IRC
   * channels for your use.
@@ -2229,10 +2225,8 @@
  	index = zt_get_index(c, p, 0);
  	if (index < 0) {
  		ast_log(LOG_WARNING, "Huh?  I don't exist?\n");
-Index: asterisk-14/configs/zapata.conf.sample
-===================================================================
---- asterisk-14.orig/configs/zapata.conf.sample	2008-01-20 21:55:17.000000000 +0200
-+++ asterisk-14/configs/zapata.conf.sample	2008-01-20 21:56:58.000000000 +0200
+--- a/configs/zapata.conf.sample
++++ b/configs/zapata.conf.sample
 @@ -123,9 +123,20 @@
  ; 
  ; outofband:      Signal Busy/Congestion out of band with RELEASE/DISCONNECT

Modified: asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded?rev=5178&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata_euroisdn_holded Thu Jan 31 10:19:00 2008
@@ -1,7 +1,5 @@
-Index: asterisk-14/main/pbx.c
-===================================================================
---- asterisk-14.orig/main/pbx.c	2008-01-21 12:12:16.000000000 +0200
-+++ asterisk-14/main/pbx.c	2008-01-21 14:43:39.000000000 +0200
+--- a/main/pbx.c
++++ b/main/pbx.c
 @@ -5128,7 +5128,7 @@
  };
  
@@ -11,10 +9,8 @@
  {
  	struct app_tmp *tmp = data;
  	struct ast_app *app;
-Index: asterisk-14/include/asterisk/pbx.h
-===================================================================
---- asterisk-14.orig/include/asterisk/pbx.h	2008-01-21 12:12:16.000000000 +0200
-+++ asterisk-14/include/asterisk/pbx.h	2008-01-21 14:43:39.000000000 +0200
+--- a/include/asterisk/pbx.h
++++ b/include/asterisk/pbx.h
 @@ -145,6 +145,8 @@
   */
  struct ast_app *pbx_findapp(const char *app);
@@ -24,10 +20,8 @@
  /*!
   * \brief Execute an application
   *
-Index: asterisk-14/channels/chan_zap.c
-===================================================================
---- asterisk-14.orig/channels/chan_zap.c	2008-01-21 12:26:22.000000000 +0200
-+++ asterisk-14/channels/chan_zap.c	2008-01-21 14:54:48.000000000 +0200
+--- a/channels/chan_zap.c
++++ b/channels/chan_zap.c
 @@ -304,6 +304,19 @@
  	struct zt_suspended_call *next;
  };

Modified: asterisk/trunk/debian/patches/bristuff/zapata_num_spans
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata_num_spans?rev=5178&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata_num_spans (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata_num_spans Thu Jan 31 10:19:00 2008
@@ -3,10 +3,8 @@
 # For that reason upstream only sort-of merged it: made it a
 # compile-time option in 1.6 .
 
-Index: asterisk-1.4.17/channels/chan_zap.c
-===================================================================
---- asterisk-1.4.17.orig/channels/chan_zap.c
-+++ asterisk-1.4.17/channels/chan_zap.c
+--- a/channels/chan_zap.c
++++ b/channels/chan_zap.c
 @@ -190,7 +194,7 @@ static const char config[] = "zapata.con
  #define SIG_GR303FXOKS	(0x0100000 | ZT_SIG_FXOKS)
  #define SIG_GR303FXSKS	(0x0100000 | ZT_SIG_FXSKS)