[Pkg-voip-commits] r4286 - in asterisk/trunk/debian: . patches
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Sat Aug 25 10:56:43 UTC 2007
Author: paravoid
Date: 2007-08-25 10:56:42 +0000 (Sat, 25 Aug 2007)
New Revision: 4286
Added:
asterisk/trunk/debian/patches/configure-libc-client
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/control
asterisk/trunk/debian/patches/series
asterisk/trunk/debian/rules
Log:
* Replace Build-Depends libc-client-dev (which wasn't used) with
libc-client2006j2-dev and enable Voicemail IMAP storage
(configure-libc-client).
Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog 2007-08-25 06:39:49 UTC (rev 4285)
+++ asterisk/trunk/debian/changelog 2007-08-25 10:56:42 UTC (rev 4286)
@@ -6,8 +6,11 @@
* Added a 1.4 backport of the DEVSTATE() dialplan function which allows
retrieving any device state in the dialplan, as well as creating custom
device states that are controllable from the dialplan.
+ * Replace Build-Depends libc-client-dev (which wasn't used) with
+ libc-client2006j2-dev and enable Voicemail IMAP storage
+ (configure-libc-client).
- -- Faidon Liambotis <paravoid at debian.org> Fri, 24 Aug 2007 06:40:48 +0300
+ -- Faidon Liambotis <paravoid at debian.org> Sat, 25 Aug 2007 13:56:11 +0300
asterisk (1:1.4.11~dfsg-1) unstable; urgency=low
Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control 2007-08-25 06:39:49 UTC (rev 4285)
+++ asterisk/trunk/debian/control 2007-08-25 10:56:42 UTC (rev 4286)
@@ -4,7 +4,7 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: 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>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4.1-1), quilt, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp10-dev | libsnmp-dev, libc-client-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 5), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4.1-1), quilt, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp10-dev | libsnmp-dev, libc-client2006j2-dev, dpkg-dev (>= 1.13.19)
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/asterisk/
Added: asterisk/trunk/debian/patches/configure-libc-client
===================================================================
--- asterisk/trunk/debian/patches/configure-libc-client (rev 0)
+++ asterisk/trunk/debian/patches/configure-libc-client 2007-08-25 10:56:42 UTC (rev 4286)
@@ -0,0 +1,46 @@
+Dynamically link against libc-client.
+
+Should forward upstream; needs more discussion.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.11~dfsg.orig/configure
++++ asterisk-1.4.11~dfsg/configure
+@@ -18435,7 +18435,7 @@ echo $ECHO_N "checking for UW IMAP Toolk
+ imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
+ fi
+ CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
+- LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
++ LIBS="${LIBS} -lc-client "`echo ${imap_ldflags}`
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -18627,7 +18627,7 @@ rm -f core conftest.err conftest.$ac_obj
+ if test "${ac_cv_imap_tk}" = "yes"; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+- IMAP_TK_LIB="${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
++ IMAP_TK_LIB="-lc-client "`echo ${imap_ldflags}`
+ IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/c-client"
+ PBX_IMAP_TK=1
+
+--- asterisk-1.4.11~dfsg.orig/configure.ac
++++ asterisk-1.4.11~dfsg/configure.ac
+@@ -484,7 +484,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+ imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
+ fi
+ CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
+- LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
++ LIBS="${LIBS} -lc-client "`echo ${imap_ldflags}`
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(
+ [#include "c-client.h"
+@@ -601,7 +601,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+ LIBS="${saved_libs}"
+ if test "${ac_cv_imap_tk}" = "yes"; then
+ AC_MSG_RESULT(yes)
+- IMAP_TK_LIB="${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
++ IMAP_TK_LIB="-lc-client "`echo ${imap_ldflags}`
+ IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/c-client"
+ PBX_IMAP_TK=1
+ AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.])
Modified: asterisk/trunk/debian/patches/series
===================================================================
--- asterisk/trunk/debian/patches/series 2007-08-25 06:39:49 UTC (rev 4285)
+++ asterisk/trunk/debian/patches/series 2007-08-25 10:56:42 UTC (rev 4286)
@@ -1,4 +1,5 @@
# upstream fixes
+configure-libc-client
bashism-safeasterisk
astvarrundir
ast_key_dir
Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules 2007-08-25 06:39:49 UTC (rev 4285)
+++ asterisk/trunk/debian/rules 2007-08-25 10:56:42 UTC (rev 4286)
@@ -65,12 +65,13 @@
chmod 755 $(CURDIR)/debian/dummyprogs/fetch
- # Without --with-gsm the internal gsm will be used
- $(FETCH_ENV) ./configure --with-gsm \
+ $(FETCH_ENV) ./configure \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
+ --with-gsm \
+ --with-imap=/usr/include \
--with-pwlib=/usr/share/pwlib/include/ \
--with-h323=/usr/share/openh323/
@@ -79,6 +80,9 @@
$(FETCH_ENV) $(MAKE) menuselect.makeopts
sed -i -e '/^MENUSELECT_MOH=/d' menuselect.makeopts
+ # enable IMAP storage for Voicemail
+ sed -i -e '/^MENUSELECT_OPTS_app_voicemail=/s/$$/IMAP_STORAGE/' menuselect.makeopts
+
# some voodoo in order to get chan_h323 built, and make it in one
# build pass:
# enable chan_h323 (not enabled by default). Note that modules listed
More information about the Pkg-voip-commits
mailing list