[Pkg-voip-commits] r7500 - in /asterisk/trunk/debian: TODO.Debian changelog patches/hack-multiple-app-voicemail patches/hardware_dtmf_mute_fix patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Aug 11 18:28:30 2009
New Revision: 7500

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7500
Log:
* New upstream beta: 1.6.0-beta4 .
* Patch hardware_dtmf_mute_fix removed: Applied upstream.
* No need for a separate app_directory_odbc (will use app_voicemail_odbc).

Removed:
    asterisk/trunk/debian/patches/hardware_dtmf_mute_fix
Modified:
    asterisk/trunk/debian/TODO.Debian
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/hack-multiple-app-voicemail
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/TODO.Debian?rev=7500&op=diff
==============================================================================
--- asterisk/trunk/debian/TODO.Debian (original)
+++ asterisk/trunk/debian/TODO.Debian Tue Aug 11 18:28:30 2009
@@ -6,9 +6,8 @@
 * libresample is now an ITP: #531590
   - Test that building Asterisk with it enables codec_resample and app_jack
   - Add it as a build dependency when it get past New.
+* openr2 should now be available. ITP: #524118.
 * Some man pages to write.
 * Remove the TeX sources from the package asterisk-doc .
 * Package sound files properly. Maybe in a separate package altogether?
   See also patch make-clean-fixes.
-* In 1.6.2.0-rc4 (or final) there should no longer be a need for 
-  app_directory_odbc . See Asterisk r201785 . Voicemail ones are still needed.

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7500&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Tue Aug 11 18:28:30 2009
@@ -1,8 +1,14 @@
-asterisk (1:1.6.2.0~dfsg~beta3-2) UNRELEASED; urgency=low
-
+asterisk (1:1.6.2.0~dfsg~beta4-1) UNRELEASED; urgency=low
+
+  [ Faidon Liambotis ]
   * Fix FTBFS on armel. (Closes: #532971)
 
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 28 Jul 2009 18:00:47 +0300
+  [ Tzafrir Cohen ]
+  * New upstream beta.
+  * Patch hardware_dtmf_mute_fix removed: Applied upstream.
+  * No need for a separate app_directory_odbc (will use app_voicemail_odbc).
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 11 Aug 2009 21:26:43 +0300
 
 asterisk (1:1.6.2.0~dfsg~beta3-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=7500&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/trunk/debian/patches/hack-multiple-app-voicemail Tue Aug 11 18:28:30 2009
@@ -20,12 +20,12 @@
  MENUSELECT_CATEGORY=APPS
  MENUSELECT_DESCRIPTION=Applications
  
-+MODS_C_ADDITIONAL=app_directory_odbc app_voicemail_imap app_voicemail_odbc
++MODS_C_ADDITIONAL=app_voicemail_imap app_voicemail_odbc
 +
  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,28 @@ endif
+@@ -27,6 +29,22 @@ endif
  
  all: _all
  
@@ -39,17 +39,11 @@
 +	$(call add_depends_cmd,unixodbc) $@
 +	$(call add_depends_cmd,ltdl) $@
 +
-+app_directory_odbc.c: app_directory.c
-+	cp $< $@
-+	$(call add_depends_cmd,unixodbc) $@
-+	$(call add_depends_cmd,ltdl) $@
-+
 +clean::
 +	rm -f app_voicemail_*.c
 +
 +app_voicemail_imap.o: ASTCFLAGS+=-DIMAP_STORAGE
 +app_voicemail_odbc.o: ASTCFLAGS+=-DODBC_STORAGE
-+app_directory_odbc.o: ASTCFLAGS+=-DODBC_STORAGE
 +
  include $(ASTTOPDIR)/Makefile.moddir_rules
  

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=7500&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Tue Aug 11 18:28:30 2009
@@ -22,5 +22,4 @@
 dahdi_ptmp_nt
 dahdi_pri_debug_spannums
 
-hardware_dtmf_mute_fix
 makefile_appdocs_dtd