[Pkg-voip-commits] r7713 - in /asterisk/trunk/debian: changelog patches/hack-multiple-app-voicemail

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sun Oct 25 19:36:19 2009
New Revision: 7713

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7713
Log:
Adapt patches/hack-multiple-app-voicemail.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/hack-multiple-app-voicemail

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7713&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Oct 25 19:36:19 2009
@@ -3,6 +3,7 @@
   * New upstream RC.
     - Session timer is not activated if Supported header field in INVITE has
       both "timer" and other option(s) (Closes: #552336)
+    - Adapt patches/hack-multiple-app-voicemail.
   * Switch from libreadline5-dev to libreadline-dev build dependency.
   * No need for repacking anymore; upstream removed the last piece of non-free
     material (IAXy's firmware) from the tarball upon our request.
@@ -12,7 +13,7 @@
   * Temporarily remove OSP support, Asterisk needs a new version (3.5) that
     isn't yet in Debian.
 
- -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 Oct 2009 19:52:11 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 Oct 2009 21:35:51 +0200
 
 asterisk (1:1.6.2.0~dfsg~rc1-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/hack-multiple-app-voicemail
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/hack-multiple-app-voicemail?rev=7713&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Sun Oct 25 19:36:19 2009
@@ -25,7 +25,7 @@
  MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
  ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
    MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
-@@ -27,6 +29,22 @@ endif
+@@ -25,6 +27,22 @@ endif
  
  all: _all
  
@@ -42,8 +42,8 @@
 +clean::
 +	rm -f app_voicemail_*.c
 +
-+app_voicemail_imap.o: ASTCFLAGS+=-DIMAP_STORAGE
-+app_voicemail_odbc.o: ASTCFLAGS+=-DODBC_STORAGE
++app_voicemail_imap.o: _ASTCFLAGS+=-DIMAP_STORAGE
++app_voicemail_odbc.o: _ASTCFLAGS+=-DODBC_STORAGE
 +
  include $(ASTTOPDIR)/Makefile.moddir_rules
  
@@ -59,3 +59,15 @@
      ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
      ALL_CC_MODS:=
      ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))
+--- a/apps/app_voicemail.c
++++ b/apps/app_voicemail.c
+@@ -40,6 +40,9 @@ c-client (http://www.washington.edu/imap
+  *        with a plan to clean this up.
+  */
+ 
++/*** MODULEINFO
++ ***/
++
+ /*** MAKEOPTS
+ <category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so apps/app_directory.o apps/app_directory.so">
+ 	<member name="FILE_STORAGE" displayname="Storage of Voicemail using filesystem">