[Pkg-voip-commits] r3606 - in asterisk-addons/trunk/debian: . patches
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Fri May 25 11:41:59 UTC 2007
Author: tzafrir-guest
Date: 2007-05-25 11:41:58 +0000 (Fri, 25 May 2007)
New Revision: 3606
Added:
asterisk-addons/trunk/debian/asterisk-ooh323c.install
asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch
asterisk-addons/trunk/debian/patches/include_asterisk.dpatch
Modified:
asterisk-addons/trunk/debian/changelog
asterisk-addons/trunk/debian/control
asterisk-addons/trunk/debian/patches/00list
asterisk-addons/trunk/debian/rules
Log:
* New upstream release: 1.4.0 .
* 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 .
Added: asterisk-addons/trunk/debian/asterisk-ooh323c.install
===================================================================
--- asterisk-addons/trunk/debian/asterisk-ooh323c.install (rev 0)
+++ asterisk-addons/trunk/debian/asterisk-ooh323c.install 2007-05-25 11:41:58 UTC (rev 3606)
@@ -0,0 +1 @@
+usr/lib/asterisk/modules/chan_ooh323.so
Modified: asterisk-addons/trunk/debian/changelog
===================================================================
--- asterisk-addons/trunk/debian/changelog 2007-05-25 09:32:55 UTC (rev 3605)
+++ asterisk-addons/trunk/debian/changelog 2007-05-25 11:41:58 UTC (rev 3606)
@@ -1,3 +1,14 @@
+asterisk-addons (1.4.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * 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 .
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Wed, 23 May 2007 22:42:21 -0400
+
asterisk-addons (1.2.5-1) UNRELEASED; urgency=low
* NOT YET RELEASED
Modified: asterisk-addons/trunk/debian/control
===================================================================
--- asterisk-addons/trunk/debian/control 2007-05-25 09:32:55 UTC (rev 3605)
+++ asterisk-addons/trunk/debian/control 2007-05-25 11:41:58 UTC (rev 3606)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libmysqlclient15-dev, asterisk-dev, dpatch, autotools-dev
+Build-Depends: debhelper (>= 4.0.0), libmysqlclient15-dev, asterisk-dev (>= 1.4.0-1), dpatch, autotools-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
Modified: asterisk-addons/trunk/debian/patches/00list
===================================================================
--- asterisk-addons/trunk/debian/patches/00list 2007-05-25 09:32:55 UTC (rev 3605)
+++ asterisk-addons/trunk/debian/patches/00list 2007-05-25 11:41:58 UTC (rev 3606)
@@ -1 +1,3 @@
nomarch.dpatch
+include_asterisk
+h323_ast_extra_params
Added: asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch
===================================================================
--- asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch (rev 0)
+++ asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch 2007-05-25 11:41:58 UTC (rev 3606)
@@ -0,0 +1,20 @@
+#! /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)
Property changes on: asterisk-addons/trunk/debian/patches/h323_ast_extra_params.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: asterisk-addons/trunk/debian/patches/include_asterisk.dpatch
===================================================================
--- asterisk-addons/trunk/debian/patches/include_asterisk.dpatch (rev 0)
+++ asterisk-addons/trunk/debian/patches/include_asterisk.dpatch 2007-05-25 11:41:58 UTC (rev 3606)
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## include_asterisk.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Our asterisk-dev package puts asterisk.h in the asterisk/ include
+## DP: dir. It seems that the files here expect to find it directly under
+## DP: /usr/include . (and no: trying -I/usr/include/asterisk fails ).
+
+ at 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
+@@ -12,7 +12,7 @@
+ * the GNU General Public License
+ */
+
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+
+ #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
+@@ -7,7 +7,7 @@
+ *
+ */
+
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+ #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
+@@ -16,7 +16,7 @@
+ #ifndef _OO_CHAN_H323_H_
+ #define _OO_CHAN_H323_H_
+
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+ #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
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+
+ #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
+@@ -15,7 +15,7 @@
+ * the GNU General Public License
+ */
+
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+
+ #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
+@@ -38,7 +38,7 @@
+ * Code beautification (doc/CODING-GUIDELINES)
+ */
+
+-#include <asterisk.h>
++#include <asterisk/asterisk.h>
+
+ #include <asterisk/channel.h>
+ #include <asterisk/logger.h>
Property changes on: asterisk-addons/trunk/debian/patches/include_asterisk.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: asterisk-addons/trunk/debian/rules
===================================================================
--- asterisk-addons/trunk/debian/rules 2007-05-25 09:32:55 UTC (rev 3605)
+++ asterisk-addons/trunk/debian/rules 2007-05-25 11:41:58 UTC (rev 3606)
@@ -52,7 +52,7 @@
if [ ! -f asterisk-ooh323c/config.h_dist ]; then \
mv asterisk-ooh323c/config.h asterisk-ooh323c/config.h_dist ; \
fi
- cd asterisk-ooh323c; ./configure
+ ./configure
touch $@
#Architecture
@@ -61,10 +61,6 @@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
$(MAKE)
- #cd res_sqlite3; $(MAKE)
- # save the default config.h that is shipped with ooh323c
- # we'll restore it on clean:
- cd asterisk-ooh323c; $(MAKE)
touch $@
build-indep: build-indep-stamp
@@ -82,11 +78,11 @@
# Add here commands to clean up after the build process.
-$(MAKE) clean
- cd asterisk-ooh323c; $(MAKE) distclean || true
- # and now restore the original config.h
- if [ -f asterisk-ooh323c/config.h_dist ]; then \
- mv asterisk-ooh323c/config.h_dist asterisk-ooh323c/config.h ; \
- fi
+ #cd asterisk-ooh323c; $(MAKE) distclean || true
+ ## and now restore the original config.h
+ #if [ -f asterisk-ooh323c/config.h_dist ]; then \
+ # mv asterisk-ooh323c/config.h_dist asterisk-ooh323c/config.h ; \
+ #fi
dh_clean
@@ -103,7 +99,7 @@
#
# dh_install -i
-INST_DIR=/usr/lib/asterisk/modules
+INST_DIR=$(CURDIR)/debian/tmp
install-arch:
dh_testdir
dh_testroot
@@ -113,17 +109,10 @@
# Add here commands to install the arch part of the package into
# debian/tmp.
- mkdir -p $(CURDIR)/debian/tmp$(INST_DIR)
- $(MAKE) install INSTALL_PREFIX=$(CURDIR)/debian/tmp
- cd asterisk-ooh323c; $(MAKE) install DESTDIR=$(CURDIR)/debian/asterisk-ooh323c
+ mkdir -p $(INST_DIR)/usr/lib/asterisk/modules
+ $(MAKE) install DESTDIR=$(INST_DIR)
+ dh_install --sourcedir=$(INST_DIR)
- # Doesn't work Compalains about: 'Unknown option: s'
- #dh_install --source-dir=debian/tmp
- cp $(CURDIR)/debian/tmp/$(INST_DIR)/*_mysql.so \
- $(CURDIR)/debian/asterisk-mysql/$(INST_DIR)
- cp $(CURDIR)/debian/tmp/$(INST_DIR)/format_mp3.so \
- $(CURDIR)/debian/asterisk-mp3/$(INST_DIR)
-
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
# in another 'make' thread.
More information about the Pkg-voip-commits
mailing list