[Pkg-voip-commits] r3956 - in asterisk-addons/trunk/debian: . patches
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Tue Aug 7 08:17:48 UTC 2007
Author: paravoid
Date: 2007-08-07 08:17:48 +0000 (Tue, 07 Aug 2007)
New Revision: 3956
Removed:
asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch
Modified:
asterisk-addons/trunk/debian/README.Debian
asterisk-addons/trunk/debian/changelog
asterisk-addons/trunk/debian/patches/00list
asterisk-addons/trunk/debian/patches/include_asterisk.dpatch
Log:
* Adapt README.Debian to the present.
* Patch configure script to check for asterisk.h in /usr/include/asterisk/.
Modified: asterisk-addons/trunk/debian/README.Debian
===================================================================
--- asterisk-addons/trunk/debian/README.Debian 2007-08-07 07:52:52 UTC (rev 3955)
+++ asterisk-addons/trunk/debian/README.Debian 2007-08-07 08:17:48 UTC (rev 3956)
@@ -2,15 +2,9 @@
--------------------------
This package contains some GPL-ed stuff Digium cannot include in its
-propritary version.
+proprietary version.
format_mp3 is read-only (only Playback, not Record). Anyway, gsm is a
nice lossly-compressed format should you need to record something.
-Both the mp3 and the mysql stuff will be replaced by alternative
-implementations in Asterisk 1.2.
-
-Also note that the tarball omits the CVS directories that were
-(mistakingly?) left in the asterisk-addons tarball.
-
-- Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Wed, 06 Jul 2005 11:31:04 +0300
Modified: asterisk-addons/trunk/debian/changelog
===================================================================
--- asterisk-addons/trunk/debian/changelog 2007-08-07 07:52:52 UTC (rev 3955)
+++ asterisk-addons/trunk/debian/changelog 2007-08-07 08:17:48 UTC (rev 3956)
@@ -5,7 +5,6 @@
[ Tzafrir Cohen ]
* include_asterisk.dpatch: because our asterisk.h is under asterisk/ .
- * h323_ast_extra_params.dpatch: backport a build fix from 1.4 svn.
* Package now has a decent makefile, so a simple 'make' and
'make install' work.
* Require asterisk 1.4 .
@@ -17,8 +16,10 @@
* Add forgotten epoch on asterisk-dev dependency.
* Remove all sqlite references, this is in the main Asterisk package
nowdays.
+ * Adapt README.Debian to the present.
+ * Patch configure script to check for asterisk.h in /usr/include/asterisk/.
- -- Faidon Liambotis <paravoid at debian.org> Tue, 07 Aug 2007 10:52:29 +0300
+ -- Faidon Liambotis <paravoid at debian.org> Tue, 07 Aug 2007 11:12:58 +0300
asterisk-addons (1.2.5-1) UNRELEASED; urgency=low
Modified: asterisk-addons/trunk/debian/patches/00list
===================================================================
--- asterisk-addons/trunk/debian/patches/00list 2007-08-07 07:52:52 UTC (rev 3955)
+++ asterisk-addons/trunk/debian/patches/00list 2007-08-07 08:17:48 UTC (rev 3956)
@@ -1,3 +1,2 @@
nomarch.dpatch
include_asterisk
-h323_ast_extra_params
Deleted: asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch
===================================================================
--- asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch 2007-08-07 07:52:52 UTC (rev 3955)
+++ asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch 2007-08-07 08:17:48 UTC (rev 3956)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## h323_ast_extra_params.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Asterisk's interface has changed. This is taken from upstream
-## DP: changeset 360 and should be removed in asterisk-addons-1.4.1 .
-
- at DPATCH@
-diff -urNad asterisk-addons-1.4.0~/asterisk-ooh323c/src/chan_h323.c asterisk-addons-1.4.0/asterisk-ooh323c/src/chan_h323.c
---- asterisk-addons-1.4.0~/asterisk-ooh323c/src/chan_h323.c 2006-12-14 17:19:53.000000000 -0500
-+++ asterisk-addons-1.4.0/asterisk-ooh323c/src/chan_h323.c 2007-05-25 06:06:24.000000000 -0400
-@@ -247,7 +247,7 @@
-
- /* Don't hold a h323 pvt lock while we allocate a channel */
- ast_mutex_unlock(&i->lock);
-- ch = ast_channel_alloc(1, state, i->callerid_num, i->callerid_name, "OOH323/%s-%04x", host, rand() & 0xffff);
-+ ch = ast_channel_alloc(1, state, i->callerid_num, i->callerid_name, i->accountcode, i->exten, i->context, i->amaflags, "OOH323/%s-%04x", host, rand() & 0xffff);
- ast_mutex_lock(&i->lock);
-
- if(ch)
Modified: asterisk-addons/trunk/debian/patches/include_asterisk.dpatch
===================================================================
--- asterisk-addons/trunk/debian/patches/include_asterisk.dpatch 2007-08-07 07:52:52 UTC (rev 3955)
+++ asterisk-addons/trunk/debian/patches/include_asterisk.dpatch 2007-08-07 08:17:48 UTC (rev 3956)
@@ -7,9 +7,9 @@
## DP: /usr/include . (and no: trying -I/usr/include/asterisk fails ).
@DPATCH@
-diff -urNad asterisk-addons-1.4.0~/app_addon_sql_mysql.c asterisk-addons-1.4.0/app_addon_sql_mysql.c
---- asterisk-addons-1.4.0~/app_addon_sql_mysql.c 2006-11-28 11:40:27.000000000 -0500
-+++ asterisk-addons-1.4.0/app_addon_sql_mysql.c 2007-05-25 05:22:50.000000000 -0400
+diff -urNad asterisk-addons-1.4.2~/app_addon_sql_mysql.c asterisk-addons-1.4.2/app_addon_sql_mysql.c
+--- asterisk-addons-1.4.2~/app_addon_sql_mysql.c 2006-11-28 18:40:27.000000000 +0200
++++ asterisk-addons-1.4.2/app_addon_sql_mysql.c 2007-08-07 11:11:59.000000000 +0300
@@ -12,7 +12,7 @@
* the GNU General Public License
*/
@@ -19,9 +19,9 @@
#include <stdlib.h>
#include <unistd.h>
-diff -urNad asterisk-addons-1.4.0~/app_saycountpl.c asterisk-addons-1.4.0/app_saycountpl.c
---- asterisk-addons-1.4.0~/app_saycountpl.c 2006-09-01 01:03:34.000000000 -0400
-+++ asterisk-addons-1.4.0/app_saycountpl.c 2007-05-25 05:23:34.000000000 -0400
+diff -urNad asterisk-addons-1.4.2~/app_saycountpl.c asterisk-addons-1.4.2/app_saycountpl.c
+--- asterisk-addons-1.4.2~/app_saycountpl.c 2006-09-01 08:03:34.000000000 +0300
++++ asterisk-addons-1.4.2/app_saycountpl.c 2007-08-07 11:11:59.000000000 +0300
@@ -7,7 +7,7 @@
*
*/
@@ -31,9 +31,9 @@
#include <stdio.h>
#include <asterisk/file.h>
#include <asterisk/logger.h>
-diff -urNad asterisk-addons-1.4.0~/asterisk-ooh323c/src/chan_h323.h asterisk-addons-1.4.0/asterisk-ooh323c/src/chan_h323.h
---- asterisk-addons-1.4.0~/asterisk-ooh323c/src/chan_h323.h 2006-07-01 14:39:43.000000000 -0400
-+++ asterisk-addons-1.4.0/asterisk-ooh323c/src/chan_h323.h 2007-05-25 05:26:35.000000000 -0400
+diff -urNad asterisk-addons-1.4.2~/asterisk-ooh323c/src/chan_h323.h asterisk-addons-1.4.2/asterisk-ooh323c/src/chan_h323.h
+--- asterisk-addons-1.4.2~/asterisk-ooh323c/src/chan_h323.h 2007-01-30 18:58:31.000000000 +0200
++++ asterisk-addons-1.4.2/asterisk-ooh323c/src/chan_h323.h 2007-08-07 11:11:59.000000000 +0300
@@ -16,7 +16,7 @@
#ifndef _OO_CHAN_H323_H_
#define _OO_CHAN_H323_H_
@@ -43,9 +43,9 @@
#undef PACKAGE_NAME
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
-diff -urNad asterisk-addons-1.4.0~/cdr_addon_mysql.c asterisk-addons-1.4.0/cdr_addon_mysql.c
---- asterisk-addons-1.4.0~/cdr_addon_mysql.c 2006-09-20 17:26:39.000000000 -0400
-+++ asterisk-addons-1.4.0/cdr_addon_mysql.c 2007-05-25 05:23:56.000000000 -0400
+diff -urNad asterisk-addons-1.4.2~/cdr_addon_mysql.c asterisk-addons-1.4.2/cdr_addon_mysql.c
+--- asterisk-addons-1.4.2~/cdr_addon_mysql.c 2007-06-19 01:40:40.000000000 +0300
++++ asterisk-addons-1.4.2/cdr_addon_mysql.c 2007-08-07 11:11:59.000000000 +0300
@@ -19,7 +19,7 @@
*
*/
@@ -55,9 +55,48 @@
#include <sys/types.h>
#include <asterisk/config.h>
-diff -urNad asterisk-addons-1.4.0~/format_mp3/format_mp3.c asterisk-addons-1.4.0/format_mp3/format_mp3.c
---- asterisk-addons-1.4.0~/format_mp3/format_mp3.c 2006-09-01 01:03:34.000000000 -0400
-+++ asterisk-addons-1.4.0/format_mp3/format_mp3.c 2007-05-25 05:25:49.000000000 -0400
+diff -urNad asterisk-addons-1.4.2~/configure asterisk-addons-1.4.2/configure
+--- asterisk-addons-1.4.2~/configure 2007-05-14 19:22:44.000000000 +0300
++++ asterisk-addons-1.4.2/configure 2007-08-07 11:12:07.000000000 +0300
+@@ -6324,7 +6324,7 @@
+ echo $ECHO_N "checking for asterisk.h... $ECHO_C" >&6; }
+ saved_cppflags="${CPPFLAGS}"
+ if test "x${ASTERISK_DIR}" != "x"; then
+- CPPFLAGS="${CPPFLAGS} -I${ASTERISK_DIR}/include"
++ CPPFLAGS="${CPPFLAGS} -I${ASTERISK_DIR}/include/asterisk"
+ fi
+ cat >conftest.$ac_ext <<_ACEOF
+
+@@ -6333,7 +6333,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+ int
+ main ()
+ {
+diff -urNad asterisk-addons-1.4.2~/configure.ac asterisk-addons-1.4.2/configure.ac
+--- asterisk-addons-1.4.2~/configure.ac 2007-05-14 19:22:44.000000000 +0300
++++ asterisk-addons-1.4.2/configure.ac 2007-08-07 11:12:15.000000000 +0300
+@@ -214,12 +214,12 @@
+ AC_MSG_CHECKING(for asterisk.h)
+ saved_cppflags="${CPPFLAGS}"
+ if test "x${ASTERISK_DIR}" != "x"; then
+- CPPFLAGS="${CPPFLAGS} -I${ASTERISK_DIR}/include"
++ CPPFLAGS="${CPPFLAGS} -I${ASTERISK_DIR}/include/asterisk"
+ fi
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_PROGRAM(
+- [#include <asterisk.h>],
++ [#include <asterisk/asterisk.h>],
+ [])
+ ],
+ [ AC_MSG_RESULT(yes)
+diff -urNad asterisk-addons-1.4.2~/format_mp3/format_mp3.c asterisk-addons-1.4.2/format_mp3/format_mp3.c
+--- asterisk-addons-1.4.2~/format_mp3/format_mp3.c 2006-09-01 08:03:34.000000000 +0300
++++ asterisk-addons-1.4.2/format_mp3/format_mp3.c 2007-08-07 11:11:59.000000000 +0300
@@ -15,7 +15,7 @@
* the GNU General Public License
*/
@@ -67,9 +106,9 @@
#include "mpg123.h"
#include "mpglib.h"
-diff -urNad asterisk-addons-1.4.0~/res_config_mysql.c asterisk-addons-1.4.0/res_config_mysql.c
---- asterisk-addons-1.4.0~/res_config_mysql.c 2006-09-20 17:26:39.000000000 -0400
-+++ asterisk-addons-1.4.0/res_config_mysql.c 2007-05-25 05:24:23.000000000 -0400
+diff -urNad asterisk-addons-1.4.2~/res_config_mysql.c asterisk-addons-1.4.2/res_config_mysql.c
+--- asterisk-addons-1.4.2~/res_config_mysql.c 2007-04-09 23:44:51.000000000 +0300
++++ asterisk-addons-1.4.2/res_config_mysql.c 2007-08-07 11:11:59.000000000 +0300
@@ -38,7 +38,7 @@
* Code beautification (doc/CODING-GUIDELINES)
*/
More information about the Pkg-voip-commits
mailing list