Updated CHANGES file to mention res_fax and res_fax_spandsp.

Also fixed MODULEINFO depends and conflicts for app_fax, res_fax, and res_fax_spandsp.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@250302 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 2189331e2ff4cf0e65036665e9c81107a2fe0dd8..69b0843286af6f37f686ad09482ac8b70b0a7db7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -393,6 +393,13 @@ Security Events Framework
    coming soon.  For more information on the security events framework, see the
    "Security Events" chapter of the included documentation - doc/tex/asterisk.pdf.
 
+Fax
+---
+ * A technology independent fax frontend (res_fax) has been added to Asterisk.
+ * A spandsp based fax backend (res_fax_spandsp) has been added.
+ * The app_fax module has been deprecated in favor of the res_fax module and
+   the new res_fax_spandsp backend.
+
 Miscellaneous
 -------------
  * The transmit_silence_during_record option in asterisk.conf.sample has been removed.

diff --git a/apps/app_fax.c b/apps/app_fax.c
index a5afe87dde1cdb55f460c325c767a469730faa2c..a664b1c96d0eabfd9bf5a5c64b4a976afc293818 100644 (file)
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -13,7 +13,9 @@
  */
 
 /*** MODULEINFO
-        <depend>spandsp</depend>
+       <defaultenabled>no</defaultenabled>
+       <depend>spandsp</depend>
+       <conflict>res_fax</conflict>
 ***/
  
 #include "asterisk.h"

diff --git a/res/res_fax.c b/res/res_fax.c
index 36ca2601b982f70028126e12c71fc01c01fbd6af..e37fe1deda3c2b5abd5baa25d763c0f9f25032a9 100644 (file)
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -17,6 +17,10 @@
  * at the top of the source tree.
  */
 
+/*** MODULEINFO
+       <conflict>app_fax</conflict>
+***/
+
 /*! \file
  *
  * \brief Generic FAX Resource for FAX technology resource modules

diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 630cccb3b28b85a4b11d20915c2a9e94c6a18d7e..9a84d28f6a1bc7c886f7619d9228d7740342ac1f 100644 (file)
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -26,7 +26,8 @@
  */
 
 /*** MODULEINFO
-               <depend>spandsp</depend>
+       <depend>spandsp</depend>
+       <depend>res_fax</depend>
 ***/
 
 #include "asterisk.h"