[Pkg-voip-commits] r3212 - in freepbx/trunk/debian: . patches

[Chris Halls]

Author: halls
Date: 2007-03-08 17:13:01 +0000 (Thu, 08 Mar 2007)
New Revision: 3212

Modified:
   freepbx/trunk/debian/asterisk-config-freepbx.postrm
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/freepbx-common.prerm
   freepbx/trunk/debian/freepbx-panel.postinst
   freepbx/trunk/debian/freepbx-panel.postrm
   freepbx/trunk/debian/freepbx-panel.prerm
   freepbx/trunk/debian/patches/00list
   freepbx/trunk/debian/patches/fix-recordings.dpatch
Log:
* Remove fix-recordings.patch - already fixed in a different way upstream
* Remove redundant debconf calls in pre/postinst scripts. Prevents hang when restarting op-panel from freepbx-panel


Modified: freepbx/trunk/debian/asterisk-config-freepbx.postrm
===================================================================
--- freepbx/trunk/debian/asterisk-config-freepbx.postrm	2007-03-08 15:30:10 UTC (rev 3211)
+++ freepbx/trunk/debian/asterisk-config-freepbx.postrm	2007-03-08 17:13:01 UTC (rev 3212)
@@ -4,8 +4,6 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-
 # summary of how this script can be called:
 #        * <postrm> `remove'
 #        * <postrm> `purge'

Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-03-08 15:30:10 UTC (rev 3211)
+++ freepbx/trunk/debian/changelog	2007-03-08 17:13:01 UTC (rev 3212)
@@ -10,8 +10,13 @@
   * freepbx-common: renamed freepbx-admin
   * freepbx-admin: apply_conf.sh is now called /usr/sbin/update-freepbx
 
- -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Thu,  8 Mar 2007 11:03:32 +0200
+  [ Chris Halls ]
+  * Remove fix-recordings.patch - already fixed in a different way upstream
+  * Remove redundant debconf calls in pre/postinst scripts. Prevents hang
+    when restarting op-panel from freepbx-panel
 
+ -- Chris Halls <halls at debian.org>  Thu,  8 Mar 2007 17:07:33 +0000
+
 freepbx (2.2.0~dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET

Modified: freepbx/trunk/debian/freepbx-common.prerm
===================================================================
--- freepbx/trunk/debian/freepbx-common.prerm	2007-03-08 15:30:10 UTC (rev 3211)
+++ freepbx/trunk/debian/freepbx-common.prerm	2007-03-08 17:13:01 UTC (rev 3212)
@@ -4,8 +4,6 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-
 # summary of how this script can be called:
 #        * <postrm> `remove'
 #        * <postrm> `purge'

Modified: freepbx/trunk/debian/freepbx-panel.postinst
===================================================================
--- freepbx/trunk/debian/freepbx-panel.postinst	2007-03-08 15:30:10 UTC (rev 3211)
+++ freepbx/trunk/debian/freepbx-panel.postinst	2007-03-08 17:13:01 UTC (rev 3212)
@@ -17,7 +17,6 @@
 CONF_FILE=/etc/op-panel/freepbx/op_server.cfg
 AST_MAN_FILE=/etc/asterisk/manager.d/op-panel.conf
 
-#. /usr/share/debconf/confmodule
 
 case "$1" in
 	configure)

Modified: freepbx/trunk/debian/freepbx-panel.postrm
===================================================================
--- freepbx/trunk/debian/freepbx-panel.postrm	2007-03-08 15:30:10 UTC (rev 3211)
+++ freepbx/trunk/debian/freepbx-panel.postrm	2007-03-08 17:13:01 UTC (rev 3212)
@@ -4,8 +4,6 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-
 # summary of how this script can be called:
 #        * <postrm> `remove'
 #        * <postrm> `purge'

Modified: freepbx/trunk/debian/freepbx-panel.prerm
===================================================================
--- freepbx/trunk/debian/freepbx-panel.prerm	2007-03-08 15:30:10 UTC (rev 3211)
+++ freepbx/trunk/debian/freepbx-panel.prerm	2007-03-08 17:13:01 UTC (rev 3212)
@@ -4,8 +4,6 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-
 # summary of how this script can be called:
 #        * <postrm> `remove'
 #        * <postrm> `purge'

Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list	2007-03-08 15:30:10 UTC (rev 3211)
+++ freepbx/trunk/debian/patches/00list	2007-03-08 17:13:01 UTC (rev 3212)
@@ -8,7 +8,6 @@
 disable-online-updates
 clean-install-amp
 fix-agibin-dir
-fix-recordings
 
 # integration with debian's op-panel
 fix-fop-config.dpatch

Modified: freepbx/trunk/debian/patches/fix-recordings.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-recordings.dpatch	2007-03-08 15:30:10 UTC (rev 3211)
+++ freepbx/trunk/debian/patches/fix-recordings.dpatch	2007-03-08 17:13:01 UTC (rev 3212)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-recordings.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
-##
-## DP: temporary calls should not be saved in /tmp, but in the sounds dir. This way
-## DP: we can rename them to the correct names in an atomic command
-
- at DPATCH@
-diff -urNad freepbx-2.2.0~dfsg~/amp_conf/astetc/extensions.conf freepbx-2.2.0~dfsg/amp_conf/astetc/extensions.conf
---- freepbx-2.2.0~dfsg~/amp_conf/astetc/extensions.conf	2007-02-26 10:29:49.000000000 +0000
-+++ freepbx-2.2.0~dfsg/amp_conf/astetc/extensions.conf	2007-02-26 10:41:41.000000000 +0000
-@@ -653,11 +653,11 @@
- [macro-systemrecording]
- exten => s,1,Goto(${ARG1},1)
- 
--exten => dorecord,1,Record(/tmp/${CALLERID(number)}-ivrrecording:wav)
-+exten => dorecord,1,Record(custom/ivr-tmp-${CALLERID(number)}-ivrrecording:wav)
- exten => dorecord,n,Wait(1)
- exten => dorecord,n,Goto(confmenu,1)
- 
--exten => docheck,1,Playback(/tmp/${CALLERID(number)}-ivrrecording)
-+exten => docheck,1,Playback(custom/ivr-tmp-${CALLERID(number)}-ivrrecording)
- exten => docheck,n,Wait(1)
- exten => docheck,n,Goto(confmenu,1)
-