[Pkg-voip-commits] r4471 - in /freepbx/trunk/debian: changelog freepbx-panel.examples patches/fix-fop-config.dpatch

[elcuco-guest at alioth.debian.org]

Author: elcuco-guest
Date: Tue Sep 11 09:07:05 2007
New Revision: 4471

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4471
Log:
 * new upstream release 2.2.3 (that was easy)
 * FOP stock configurations are now backed up as examples
 * fix the path for includes: freeepbx/*_{additional,custom}.conf



Added:
    freepbx/trunk/debian/freepbx-panel.examples
Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/patches/fix-fop-config.dpatch

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=4471&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Tue Sep 11 09:07:05 2007
@@ -1,3 +1,10 @@
+freepbx (2.2.3~dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * freepbx-panel: fix configuration patch
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Sun,  9 Sep 2007 15:15:38 +0300
+
 freepbx (2.2.2~dfsg-1) UNRELEASED; urgency=low
   
   [ Diego Iastrubni ]

Added: freepbx/trunk/debian/freepbx-panel.examples
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-panel.examples?rev=4471&op=file
==============================================================================
--- freepbx/trunk/debian/freepbx-panel.examples (added)
+++ freepbx/trunk/debian/freepbx-panel.examples Tue Sep 11 09:07:05 2007
@@ -1,0 +1,4 @@
+amp_conf/htdocs_panel/op_astdb.cfg
+amp_conf/htdocs_panel/op_buttons.cfg
+amp_conf/htdocs_panel/op_server.cfg
+amp_conf/htdocs_panel/op_style.cfg

Modified: freepbx/trunk/debian/patches/fix-fop-config.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-fop-config.dpatch?rev=4471&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-fop-config.dpatch (original)
+++ freepbx/trunk/debian/patches/fix-fop-config.dpatch Tue Sep 11 09:07:05 2007
@@ -12,9 +12,22 @@
 
 
 @DPATCH@
-diff -urNad freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_server.cfg freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_server.cfg
---- freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_server.cfg	2007-02-26 10:29:49.000000000 +0000
-+++ freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_server.cfg	2007-02-26 10:31:41.000000000 +0000
+diff -urNad upstream~/amp_conf/htdocs_panel/op_buttons.cfg upstream/amp_conf/htdocs_panel/op_buttons.cfg
+--- upstream~/amp_conf/htdocs_panel/op_buttons.cfg	2006-10-16 02:57:56.000000000 +0200
++++ upstream/amp_conf/htdocs_panel/op_buttons.cfg	2007-09-11 12:01:19.000000000 +0300
+@@ -1,7 +1,7 @@
+-include => op_buttons_additional.cfg
++include => freepbx/op_buttons_additional.cfg
+ 
+ ; use this for your customizations to FOP
+-include => op_buttons_custom.cfg
++include => freepbx/op_buttons_custom.cfg
+ 
+ ; queues
+ [rectangle]
+diff -urNad upstream~/amp_conf/htdocs_panel/op_server.cfg upstream/amp_conf/htdocs_panel/op_server.cfg
+--- upstream~/amp_conf/htdocs_panel/op_server.cfg	2006-09-16 11:19:23.000000000 +0300
++++ upstream/amp_conf/htdocs_panel/op_server.cfg	2007-09-11 12:00:55.000000000 +0300
 @@ -11,8 +11,8 @@
  manager_host=127.0.0.1