[Pkg-voip-commits] r5649 - /freepbx-modules/trunk/debian/ /freepbx-modules/trunk/debian/patches/ /freepbx/trunk/debian/astetc/

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Wed Apr 30 13:33:14 2008
New Revision: 5649

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5649
Log:
* Move the extra config files from the freepbx core module into
  asterisk-config-freepbx.
* #include extensions.d/*.conf by default .

Added:
    freepbx-modules/trunk/debian/patches/directory_star411
    freepbx/trunk/debian/astetc/extensions.conf
      - copied, changed from r5512, freepbx-modules/trunk/modules/core/etc/extensions.conf
    freepbx/trunk/debian/astetc/iax.conf
      - copied unchanged from r5512, freepbx-modules/trunk/modules/core/etc/iax.conf
    freepbx/trunk/debian/astetc/sip.conf
      - copied unchanged from r5512, freepbx-modules/trunk/modules/core/etc/sip.conf
Modified:
    freepbx-modules/trunk/debian/changelog
    freepbx-modules/trunk/debian/install
    freepbx-modules/trunk/debian/patches/series

Modified: freepbx-modules/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/changelog?rev=5649&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/changelog (original)
+++ freepbx-modules/trunk/debian/changelog Wed Apr 30 13:33:14 2008
@@ -19,5 +19,6 @@
   * Patch fix_dashboard_warning: fix an annoying typo(?) in the dashboard.
   * Patch system_phpsysinfo: use the system copy of phpsysinfo in the
     dashboard.
+  * Patch directory_star411: use *411 as a directory feature code.
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 09 Apr 2008 12:57:32 +0300
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 30 Apr 2008 15:18:49 +0300

Modified: freepbx-modules/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/install?rev=5649&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/install (original)
+++ freepbx-modules/trunk/debian/install Wed Apr 30 13:33:14 2008
@@ -1,3 +1,2 @@
-modules/*/etc/*	etc/asterisk/
 modules/*/agi-bin/*	usr/share/asterisk/agi-bin/
 modules/*	usr/share/freepbx/modules/

Added: freepbx-modules/trunk/debian/patches/directory_star411
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/directory_star411?rev=5649&op=file
==============================================================================
--- freepbx-modules/trunk/debian/patches/directory_star411 (added)
+++ freepbx-modules/trunk/debian/patches/directory_star411 Wed Apr 30 13:33:14 2008
@@ -1,0 +1,14 @@
+Change the feature code of the directory from 411 to *411 .
+411 is in the global extensions namespace. And specifically collides
+with extension numbers we generate with zapauto .
+--- freepbx-modules-2.3.1.orig/modules/pbdirectory/install.php
++++ freepbx-modules-2.3.1/modules/pbdirectory/install.php
+@@ -3,7 +3,7 @@
+ // Enable phonebook directory as a feature code
+ $fcc = new featurecode('pbdirectory', 'app-pbdirectory');
+ $fcc->setDescription('Phonebook dial-by-name directory');
+-$fcc->setDefault('411');
++$fcc->setDefault('*411');
+ $fcc->update();
+ unset($fcc);
+ 

Modified: freepbx-modules/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/series?rev=5649&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/patches/series (original)
+++ freepbx-modules/trunk/debian/patches/series Wed Apr 30 13:33:14 2008
@@ -1,3 +1,4 @@
+directory_star411
 system_phpsysinfo
 sqlite_trunk_query
 checkperms_indications

Copied: freepbx/trunk/debian/astetc/extensions.conf (from r5512, freepbx-modules/trunk/modules/core/etc/extensions.conf)
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/astetc/extensions.conf?rev=5649&op=diff
==============================================================================
--- freepbx-modules/trunk/modules/core/etc/extensions.conf (original)
+++ freepbx/trunk/debian/astetc/extensions.conf Wed Apr 30 13:33:14 2008
@@ -27,6 +27,7 @@
 ; Customizations to this dialplan should be made in extensions_custom.conf
 ; See extensions_custom.conf.sample for an example
 #include extensions_custom.conf
+#include extensions.d/*.conf
 
 [from-trunk]							; just an alias since VoIP shouldn't be called PSTN
 include => from-pstn