[Pkg-voip-commits] r8864 - in /asterisk/trunk/debian: ast_config/modules.conf changelog patches/hack-multiple-app-voicemail rules

[pabelanger-guest at alioth.debian.org]

Author: pabelanger-guest
Date: Tue Apr 12 17:07:19 2011
New Revision: 8864

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8864
Log:
* Regardless of which asterisk-voicemail* is installed (each package
  conflicts on each other), the name of the module is now
  app_voicemail.so.
* Fix a bug with app_voicemail_*.exports.in not being copied properly.

Modified:
    asterisk/trunk/debian/ast_config/modules.conf
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/hack-multiple-app-voicemail
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/ast_config/modules.conf
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/ast_config/modules.conf?rev=8864&op=diff
==============================================================================
--- asterisk/trunk/debian/ast_config/modules.conf (original)
+++ asterisk/trunk/debian/ast_config/modules.conf Tue Apr 12 17:07:19 2011
@@ -58,11 +58,8 @@
 ;
 noload => cdr_sqlite.so
 ;
-; These conflict with app_voicemail.so/app_directory.so and each other
-; These are for IMAP and ODBC storage for Voicemail
+; These conflict with app_directory.so and each other.
 noload => app_directory_odbc.so
-noload => app_voicemail_odbc.so
-noload => app_voicemail_imap.so
 ;
 ; Enable these if you want to configure Asterisk in a database
 ;

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8864&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Tue Apr 12 17:07:19 2011
@@ -37,8 +37,12 @@
   * When compiling with DEB_BUILD_OPTIONS="debug" enable native Asterisk
     debugging tools.  Specifically DONT_OPTIMIZE, DEBUG_THREADS and
     --enable-dev-mode.
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 11 Apr 2011 12:44:47 +0300
+  * Regardless of which asterisk-voicemail-* is installed (each package
+    conflicts on each other), the name of the module is now
+    app_voicemail.so.
+  * Fix a bug with app_voicemail-*.exports.in not being copied properly.
+
+ -- Paul Belanger <pabelanger at digium.com>  Tue, 12 Apr 2011 13:05:58 -0400
 
 asterisk (1:1.6.2.9-2) unstable; urgency=high
 

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=8864&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Tue Apr 12 17:07:19 2011
@@ -27,7 +27,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)
-@@ -25,6 +27,22 @@ endif
+@@ -25,6 +27,25 @@ endif
  
  all: _all
  
@@ -36,13 +36,16 @@
 +	cp $< $@
 +	$(call add_depends_cmd,imap_tk) $@
 +	$(call add_depends_cmd,openssl) $@
++	cp app_voicemail.exports.in app_voicemail_imapstorage.exports.in
 +app_voicemail_odbcstorage.c: app_voicemail.c
 +	cp $< $@
 +	$(call add_depends_cmd,unixodbc) $@
 +	$(call add_depends_cmd,ltdl) $@
++	cp app_voicemail.exports.in app_voicemail_odbcstorage.exports.in
 +
 +dist-clean::
 +	rm -f app_voicemail_*.c
++	rm -f app_voicemail_*.exports.in
 +
 +app_voicemail_imapstorage.o: _ASTCFLAGS+=-DIMAP_STORAGE
 +app_voicemail_odbcstorage.o: _ASTCFLAGS+=-DODBC_STORAGE

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=8864&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Tue Apr 12 17:07:19 2011
@@ -138,6 +138,13 @@
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/stereorize
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/hashtest*
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/refcounter
+
+	# Rename dh_install file for -imapstorage and -odbcstorage.
+	mv $(CURDIR)/debian/asterisk-voicemail-imapstorage/usr/lib/asterisk/modules/app_voicemail_imapstorage.so \
+		$(CURDIR)/debian/asterisk-voicemail-imapstorage/usr/lib/asterisk/modules/app_voicemail.so
+	mv $(CURDIR)/debian/asterisk-voicemail-odbcstorage/usr/lib/asterisk/modules/app_voicemail_odbcstorage.so \
+		$(CURDIR)/debian/asterisk-voicemail-odbcstorage/usr/lib/asterisk/modules/app_voicemail.so
+
 	touch $@
 
 install-indep: build-indep