[Pkg-voip-commits] r2406 - in freepbx/trunk/debian: . patches rapid
Diego Iastrubni
elcuco-guest at costa.debian.org
Tue Sep 19 09:47:30 UTC 2006
Author: elcuco-guest
Date: 2006-09-19 09:47:30 +0000 (Tue, 19 Sep 2006)
New Revision: 2406
Added:
freepbx/trunk/debian/patches/fix-reload-on-no-asterisk.dpatch
Removed:
freepbx/trunk/debian/freepbx-admin.postrm
freepbx/trunk/debian/rapid/sounds/
Modified:
freepbx/trunk/debian/asterisk-sounds-moh-freepbx.install
freepbx/trunk/debian/changelog
freepbx/trunk/debian/control
freepbx/trunk/debian/freepbx-admin.dirs
freepbx/trunk/debian/freepbx-admin.install
freepbx/trunk/debian/freepbx-cdr.install
freepbx/trunk/debian/freepbx-panel.dirs
freepbx/trunk/debian/freepbx-panel.install
freepbx/trunk/debian/freepbx-panel.postinst
freepbx/trunk/debian/freepbx-panel.prerm
freepbx/trunk/debian/freepbx-sounds-extra.install
freepbx/trunk/debian/freepbx-vmail.install
freepbx/trunk/debian/freepbx.dirs
freepbx/trunk/debian/patches/00list
freepbx/trunk/debian/patches/check-ast-runnning.dpatch
freepbx/trunk/debian/patches/disable-online-updates.dpatch
freepbx/trunk/debian/patches/fix-fop-config.dpatch
freepbx/trunk/debian/patches/fix-konqueror-blinks.dpatch
freepbx/trunk/debian/rules
Log:
- debian/rules can generate a source tarball
- now the package is a dfsg package (all gpl as far as i can tell)
- deleted some sounds from the debian dir as they are in the upstream source
- mp3s are converted to 8khz wav files
- freepbx admin is now at /usr/share/freepbx
- backported a fix from the branch/trunk into this package (fix-reload-on-no-asterisk)
probably many other fixes... look at the changelog.
Modified: freepbx/trunk/debian/asterisk-sounds-moh-freepbx.install
===================================================================
--- freepbx/trunk/debian/asterisk-sounds-moh-freepbx.install 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/asterisk-sounds-moh-freepbx.install 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,2 +1 @@
amp_conf/mohmp3/*.wav usr/share/asterisk/mohwav/
-
Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/changelog 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,14 +1,24 @@
-freepbx (2.1.1-1) UNRELEASED; urgency=low
+freepbx (2.1.1.dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
[Diego Iastrubni]
* New upstream release
+ * Repackagedas dfsg
+ * Removed cdr support (QPL licenced)
+ * Build-dep on dpatch
+ * Clean ups of obsolete patches
+ * all mp3 are converted to 16 bit 8khz wav files, also in source
+ * freepbx admin is installed into /usr/share/freepbx (was /usr/share/freepbx/admin)
+
+ * asterisk-config-freepbx: added both manager.d and extensions.d directories (on the same patch)
* freepbx-admin: patched featured codes, to support sqlite
- * added both manager.d and extensions.d directories (on the same patch)
- * freepbx-panel adds another alternative configuration for op-panel
- * applied a patch to remove blinking on Konqueror
- * applied a patch to remove not needed functions in install_amp
+ * freepbx-admin: applied a patch to remove blinking on Konqueror
+ * freepbx-admin: major cleanups to install_amp (does not install files by default now)
+ * freepbx-admin: fixed a bug caused by tring to reload while the manager does not respond
+ backport from the branch, patch fix-reload-on-no-asterisk.dpath
+ * freepbx-admin: depends on adduser
+ * freepbx-panel: add another alternative configuration for op-panel
-- Diego Iastrubni <diego.iastrubni at xorcom.com> Sun, 19 Jun 2006 18:00:00 +0200
Modified: freepbx/trunk/debian/control
===================================================================
--- freepbx/trunk/debian/control 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/control 2006-09-19 09:47:30 UTC (rev 2406)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Diego Iastrubni <diego.iastrubni at xorcom.com>
-Build-Depends-Indep: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 4.0.0), sharutils, sox, dpatch
Standards-Version: 3.6.1
@@ -62,7 +62,7 @@
Package: asterisk-config-freepbx
Architecture: all
-Depends: freepbx-agi, asterisk-sounds-main, asterisk-sounds-extra, freepbx-sounds-extra|amportal-sounds-extra|amportal-sounds-extra-links, sox
+Depends: freepbx-agi, asterisk-sounds-main, asterisk-sounds-extra, freepbx-sounds-extra|amportal-sounds-extra|amportal-sounds-extra-links, sox, php4-cgi|php5-cgi
Provides: asterisk-config-custom
Replaces: asterisk-config, asterisk-config-amportal
Conflicts: asterisk-config-amportal, amportal-agi
@@ -94,32 +94,38 @@
Package: freepbx-agi
Architecture: all
-Depends: php4-cli, asterisk > 1.2
+Depends: php5-cli | php4-cli, asterisk (>= 1.2)
Replaces: amportal-agi
Conflicts: amportal-agi
Description: agi support for FreePBX
FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX.
This package contains some AGI scripts needed by FreePBX dialplan.
- .
- This package contains the new dialparties.agi, which was ported to php,
- and does not need libasteriskperl to run.
-
Package: freepbx-modules
Architecture: all
-Depends: freepbx-admin, freepbx-module-asterisk-cli, freepbx-module-callback, freepbx-module-callforward, freepbx-module-callwaiting, freepbx-module-conferences, freepbx-module-disa, freepbx-module-donotdisturb, freepbx-module-featurecodeadmin, freepbx-module-findmefollow, freepbx-module-gabcast, freepbx-module-infoservices, freepbx-module-irc, freepbx-module-ivr, freepbx-module-logfiles, freepbx-module-manager, freepbx-module-miscdests, freepbx-module-paging, freepbx-module-phpinfo, freepbx-module-pinsets, freepbx-module-queues, freepbx-module-recordings, freepbx-module-ringgroups, freepbx-module-timeconditions, freepbx-module-voicemail
-#Depends: freepbx-admin, freepbx-module-asterisk-cli, freepbx-module-callback, freepbx-module-callforward, freepbx-module-callwaiting, freepbx-module-conferences, freepbx-module-disa, freepbx-module-donotdisturb, freepbx-module-featurecodeadmin, freepbx-module-findmefollow, freepbx-module-gabcast, freepbx-module-infoservices, freepbx-module-irc, freepbx-module-ivr, freepbx-module-logfiles, freepbx-module-manager, freepbx-module-miscdests, freepbx-module-music, freepbx-module-paging, freepbx-module-phpinfo, freepbx-module-pinsets, freepbx-module-queues, freepbx-module-recordings, freepbx-module-ringgroups, freepbx-module-timeconditions, freepbx-module-voicemail
+Depends: freepbx-admin, freepbx-module-asterisk-cli, freepbx-module-callback, freepbx-module-callforward, freepbx-module-callwaiting, freepbx-module-conferences, freepbx-module-disa, freepbx-module-donotdisturb, freepbx-module-featurecodeadmin, freepbx-module-findmefollow, freepbx-module-gabcast, freepbx-module-infoservices, freepbx-module-ivr, freepbx-module-logfiles, freepbx-module-manager, freepbx-module-miscdests, freepbx-module-paging, freepbx-module-phpinfo, freepbx-module-pinsets, freepbx-module-queues, freepbx-module-recordings, freepbx-module-ringgroups, freepbx-module-timeconditions, freepbx-module-voicemail
Description: FreePBX modules
+ This is a meta package which installs all the free modules supplied by
+ FreePBX. This package does not provide any file, by it just installs
+ a bunch of modules.
+ .
+ Some of the modules are not required by this package, because of license
+ issues. If you are looking for the non free modules, the meta package
+ is called freepbx-modules-nonfree.
+
+Package: freepbx-modules-nonfree
+Architecture: all
+Depends: freepbx-module-irc, freepbx-module-javassh
+Description: FreePBX modules - non free
This is a meta package which installs all the modules supplied by
FreePBX. This package does not provide any file, by it just installs
a bunch of modules.
-
Package: freepbx-admin
Architecture: all
Replaces: amportal-common, freepbx-module-core
Conflicts: amportal-common, freepbx-module-core
-Depends: asterisk-config-freepbx, asterisk(>= 1.2), apache|apache2|mathopd, libapache-mod-php4|libapache2-mod-php4|php4-cgi, mysql-server|virtual-mysql-server|sqlite, php4-mysql|php4-sqlite, php4-cli, php4-pear, mime-construct, libdbi-perl
+Depends: adduser, asterisk-config-freepbx, asterisk(>= 1.2), apache|apache2|mathopd, libapache-mod-php4|libapache2-mod-php5|libapache2-mod-php4|php4-cgi, mysql-server|virtual-mysql-server|sqlite, php5-mysql|php4-mysql|php5-mysql|php4-sqlite, php5-cli|php4-cli, php5-pear|php4-pear, mime-construct, libdbi-perl
Description: FreePBX administration panel
FreePBX (formally AMP) is a web-based GUI for Asterisk.
This package contains the common files needed for freepbx, as well as
@@ -127,14 +133,14 @@
By default the panel you get is pretty empty. You probably want to install
some freepbx-modules or only the modules you want.
-Package: freepbx-cdr
-Architecture: all
-Depends: freepbx-admin, asterisk-mysql
-Description: CDR for asterisk - FreePBX integration
- FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX.
- This package contains the CDR pages for AMP.
- When installing this package, don't forget to /etc/php4/apache/php.ini
- to enable mysql using "extension=mysql.so"
+#Package: freepbx-cdr
+#Architecture: all
+#Depends: freepbx-admin, asterisk-mysql
+#Description: CDR for asterisk - FreePBX integration
+# FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX.
+# This package contains the CDR pages for AMP.
+# When installing this package, don't forget to /etc/php4/apache/php.ini
+# to enable mysql using "extension=mysql.so"
Package: freepbx-vmail
Architecture: all
Modified: freepbx/trunk/debian/freepbx-admin.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-admin.dirs 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-admin.dirs 2006-09-19 09:47:30 UTC (rev 2406)
@@ -7,13 +7,13 @@
usr/share/freepbx-common/sql/
usr/share/freepbx-common/upgrades/
usr/share/freepbx-common/upgrades/1.10.010/
-usr/share/freepbx/admin/
-usr/share/freepbx/admin/modules/
-usr/share/freepbx/admin/modules/_cache/
-usr/share/freepbx/admin/i18n/de_DE/
-usr/share/freepbx/admin/i18n/es_ES/
-usr/share/freepbx/admin/i18n/fr_FR/
-usr/share/freepbx/admin/i18n/it_IT/
+usr/share/freepbx/
+usr/share/freepbx/modules/
+usr/share/freepbx/modules/_cache/
+usr/share/freepbx/i18n/de_DE/
+usr/share/freepbx/i18n/es_ES/
+usr/share/freepbx/i18n/fr_FR/
+usr/share/freepbx/i18n/it_IT/
var/spool/asterisk/
var/spool/asterisk/fax/
var/spool/asterisk/monitor/
Modified: freepbx/trunk/debian/freepbx-admin.install
===================================================================
--- freepbx/trunk/debian/freepbx-admin.install 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-admin.install 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,21 +1,17 @@
debian/rapid/astetc/manager.d/freepbx.conf etc/asterisk/manager.d/
amp_conf/bin/* usr/share/asterisk/bin/
-amp_conf/htdocs/admin/images/*.png usr/share/freepbx/
-amp_conf/htdocs/index.html usr/share/freepbx/
-amp_conf/htdocs/*.css usr/share/freepbx/
+amp_conf/htdocs/admin/*.php usr/share/freepbx/
+amp_conf/htdocs/admin/i18n/* usr/share/freepbx/i18n/
+amp_conf/htdocs/admin/common/*.css usr/share/freepbx/common/
+amp_conf/htdocs/admin/common/*.php usr/share/freepbx/common/
+amp_conf/htdocs/admin/common/script.js.php usr/share/freepbx/common/
+amp_conf/htdocs/admin/modules/core usr/share/freepbx/modules/
+amp_conf/htdocs/admin/images/*.png usr/share/freepbx/images/
+amp_conf/htdocs/admin/images/*.gif usr/share/freepbx/images/
+debian/rapid/xorcom-rapid.png usr/share/freepbx/images/
+debian/rapid/xorcom.png usr/share/freepbx/images/
-amp_conf/htdocs/admin/*.php usr/share/freepbx/admin/
-amp_conf/htdocs/admin/i18n/* usr/share/freepbx/admin/i18n/
-amp_conf/htdocs/admin/common/*.css usr/share/freepbx/admin/common/
-amp_conf/htdocs/admin/common/*.php usr/share/freepbx/admin/common/
-amp_conf/htdocs/admin/common/script.js.php usr/share/freepbx/admin/common/
-amp_conf/htdocs/admin/modules/core usr/share/freepbx/admin/modules/
-amp_conf/htdocs/admin/images/*.png usr/share/freepbx/admin/images/
-amp_conf/htdocs/admin/images/*.gif usr/share/freepbx/admin/images/
-debian/rapid/xorcom-rapid.png usr/share/freepbx/admin/images/
-debian/rapid/xorcom.png usr/share/freepbx/admin/images/
-
debian/rapid/freepbx-install-*.sh usr/share/freepbx-common/
debian/rapid/freepbx-remove-*.sh usr/share/freepbx-common/
install_amp usr/share/freepbx-common/
Deleted: freepbx/trunk/debian/freepbx-admin.postrm
===================================================================
--- freepbx/trunk/debian/freepbx-admin.postrm 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-admin.postrm 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,58 +0,0 @@
-#! /bin/sh
-# prerm script for ${package_name}
-#
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-# if [ "$DPKG_DEBUG" = "developer" ]; then
-# set -x
-# fi
-
-case "$1" in
- purge)
- # use this to know which sqlite database to delete
- . /etc/amportal.conf
- if [ "x" != "x$AMPDBFILE" ]; then
- rm -f $AMPDBFILE
- fi
-
- rm -f /etc/amportal.conf || true
-
- # this may fall, no problems
- # TODO WTF? this is already gone
- /usr/share/freepbx-common/freepbx-remove-mysql.sh || true
- /usr/share/freepbx-common/freepbx-remove-freepbx.sh || true
- ;;
-
- remove)
- ;;
-
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Modified: freepbx/trunk/debian/freepbx-cdr.install
===================================================================
--- freepbx/trunk/debian/freepbx-cdr.install 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-cdr.install 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,17 +1,17 @@
-amp_conf/htdocs/admin/cdr/*.php usr/share/freepbx/admin/cdr/
-amp_conf/htdocs/admin/cdr/*.js usr/share/freepbx/admin/cdr/
-amp_conf/htdocs/admin/cdr/css/*.css usr/share/freepbx/admin/cdr/css/
-amp_conf/htdocs/admin/cdr/css/images/*.png usr/share/freepbx/admin/cdr/css/images/
-amp_conf/htdocs/admin/cdr/images/*.png usr/share/freepbx/admin/cdr/images/
-amp_conf/htdocs/admin/cdr/images/*.gif usr/share/freepbx/admin/cdr/images/
-amp_conf/htdocs/admin/cdr/jpgraph_lib/*.php usr/share/freepbx/admin/cdr/jpgraph_lib/
-amp_conf/htdocs/admin/cdr/jpgraph_lib/*.inc usr/share/freepbx/admin/cdr/jpgraph_lib/
-amp_conf/htdocs/admin/cdr/lib/*.php usr/share/freepbx/admin/cdr/lib/
-amp_conf/htdocs/admin/cdr/lib/DB-modules/*.php usr/share/freepbx/admin/cdr/lib/DB-modules/
-amp_conf/htdocs/admin/cdr/lib/font/*.php usr/share/freepbx/admin/cdr/font/
-amp_conf/htdocs/admin/cdr/lib/font/makefont/*.map usr/share/freepbx/admin/cdr/font/makefont/
-amp_conf/htdocs/admin/cdr/lib/font/makefont/makefont.php usr/share/freepbx/admin/cdr/font/makefont/
-amp_conf/htdocs/admin/reports.php usr/share/freepbx/admin/
+amp_conf/htdocs/admin/cdr/*.php usr/share/freepbx/cdr/
+amp_conf/htdocs/admin/cdr/*.js usr/share/freepbx/cdr/
+amp_conf/htdocs/admin/cdr/css/*.css usr/share/freepbx/cdr/css/
+amp_conf/htdocs/admin/cdr/css/images/*.png usr/share/freepbx/cdr/css/images/
+amp_conf/htdocs/admin/cdr/images/*.png usr/share/freepbx/cdr/images/
+amp_conf/htdocs/admin/cdr/images/*.gif usr/share/freepbx/cdr/images/
+amp_conf/htdocs/admin/cdr/jpgraph_lib/*.php usr/share/freepbx/cdr/jpgraph_lib/
+amp_conf/htdocs/admin/cdr/jpgraph_lib/*.inc usr/share/freepbx/cdr/jpgraph_lib/
+amp_conf/htdocs/admin/cdr/lib/*.php usr/share/freepbx/cdr/lib/
+amp_conf/htdocs/admin/cdr/lib/DB-modules/*.php usr/share/freepbx/cdr/lib/DB-modules/
+amp_conf/htdocs/admin/cdr/lib/font/*.php usr/share/freepbx/cdr/font/
+amp_conf/htdocs/admin/cdr/lib/font/makefont/*.map usr/share/freepbx/cdr/font/makefont/
+amp_conf/htdocs/admin/cdr/lib/font/makefont/makefont.php usr/share/freepbx/cdr/font/makefont/
+amp_conf/htdocs/admin/reports.php usr/share/freepbx/
amp_conf/htdocs/admin/cdr/CHANGELOG.txt usr/share/doc/freepbx-cdr
amp_conf/htdocs/admin/cdr/counter.txt usr/share/doc/freepbx-cdr
Modified: freepbx/trunk/debian/freepbx-panel.dirs
===================================================================
--- freepbx/trunk/debian/freepbx-panel.dirs 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-panel.dirs 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,2 +1,3 @@
etc/op-panel/freepbx/
+usr/share/freepbx/
usr/share/op-panel/flash/
Modified: freepbx/trunk/debian/freepbx-panel.install
===================================================================
--- freepbx/trunk/debian/freepbx-panel.install 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-panel.install 2006-09-19 09:47:30 UTC (rev 2406)
@@ -3,6 +3,6 @@
amp_conf/htdocs_panel/op_server.cfg etc/op-panel/freepbx/
amp_conf/htdocs_panel/op_style.cfg etc/op-panel/freepbx/
-amp_conf/htdocs/admin/panel.php usr/share/freepbx/admin/
+amp_conf/htdocs/admin/panel.php usr/share/freepbx/
amp_conf/htdocs_panel/index.php usr/share/op-panel/flash/
amp_conf/htdocs_panel/index_amp.php usr/share/op-panel/flash/
Modified: freepbx/trunk/debian/freepbx-panel.postinst
===================================================================
--- freepbx/trunk/debian/freepbx-panel.postinst 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-panel.postinst 2006-09-19 09:47:30 UTC (rev 2406)
@@ -33,7 +33,7 @@
# make the op-panel aware of the new configuration
- /etc/init.d/op-panel restart
+ invoke-rc.d restart
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: freepbx/trunk/debian/freepbx-panel.prerm
===================================================================
--- freepbx/trunk/debian/freepbx-panel.prerm 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-panel.prerm 2006-09-19 09:47:30 UTC (rev 2406)
@@ -24,29 +24,25 @@
case "$1" in
- purge)
- # remove this alternative configuration
+ purge)
+ # remove this alternative configuration
update-alternatives --remove op-panel /etc/op-panel/freepbx/op_server.cfg
-
- # make the op-panel aware of the new configuration
- /etc/init.d/op-panel restart
- ;;
-
- remove)
- # remove this alternative configuration
+ # make the op-panel aware of the new configuration
+ invoke-rc.d restart
+ ;;
+ remove)
+ # remove this alternative configuration
update-alternatives --remove op-panel /etc/op-panel/freepbx/op_server.cfg
-
- # make the op-panel aware of the new configuration
- /etc/init.d/op-panel restart
- ;;
-
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "${package_name}: prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
+ # make the op-panel aware of the new configuration
+ invoke-rc.d restart
+ ;;
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "${package_name}: prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
Modified: freepbx/trunk/debian/freepbx-sounds-extra.install
===================================================================
--- freepbx/trunk/debian/freepbx-sounds-extra.install 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-sounds-extra.install 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1 +1 @@
-debian/rapid/sounds/*.gsm usr/share/asterisk/sounds/
+amp_conf/sounds/*.gsm usr/share/asterisk/sounds/
Modified: freepbx/trunk/debian/freepbx-vmail.install
===================================================================
--- freepbx/trunk/debian/freepbx-vmail.install 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx-vmail.install 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,3 +1,3 @@
-amp_conf/cgi-bin/vmail.cgi usr/lib/cgi-bin/
-amp_conf/htdocs/_asterisk/* usr/share/freepbx/_asterisk/
+amp_conf/cgi-bin/vmail.cgi usr/lib/cgi-bin/
+amp_conf/htdocs/_asterisk/* usr/share/freepbx/_asterisk/
Modified: freepbx/trunk/debian/freepbx.dirs
===================================================================
--- freepbx/trunk/debian/freepbx.dirs 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/freepbx.dirs 2006-09-19 09:47:30 UTC (rev 2406)
@@ -11,4 +11,3 @@
/usr/share/freepbx/recordings/misc/
/usr/share/freepbx/recordings/modules/
/usr/share/freepbx/recordings/theme/
-
Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/patches/00list 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,10 +1,11 @@
-# fix various things which freepbs just does wrong
+# fix various things which freepbx just does wrong
ast-config-dirs
disable-online-updates
fix-retrieve-op-panel-cfg
fix-fop-config.dpatch
clean-install-amp
-# backports from the trunk, nice features... why not having them as well...?
+# backports from the trunk, nice features, fixes... why not having them as well...?
check-ast-runnning
fix-konqueror-blinks
+fix-reload-on-no-asterisk
Modified: freepbx/trunk/debian/patches/check-ast-runnning.dpatch
===================================================================
--- freepbx/trunk/debian/patches/check-ast-runnning.dpatch 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/patches/check-ast-runnning.dpatch 2006-09-19 09:47:30 UTC (rev 2406)
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## check-ast-runnning.dpatch by <diegolocal at localhost.localdomain>
+## check-ast-runnning.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Display a warning when asterisk is not responding to the manager.
+## DP: This usually means asterisk is down
@DPATCH@
diff -urNad freepbx-2.1.1/amp_conf/htdocs/admin/config.php /tmp/dpep.NjMnkU/freepbx-2.1.1/amp_conf/htdocs/admin/config.php
@@ -29,7 +29,7 @@
+ echo "<br>\n";
+ echo _("Cannot connect to Asterisk Manager with ").$amp_conf["AMPMGRUSER"];
+ echo "<br>";
-+ echo _("Asterisk may not be runnnig.");
++ echo _("Asterisk may not be running.");
+ echo "</div></p>\n";
+ }
+ break;
Property changes on: freepbx/trunk/debian/patches/check-ast-runnning.dpatch
___________________________________________________________________
Name: svn:executable
- *
Property changes on: freepbx/trunk/debian/patches/disable-online-updates.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: freepbx/trunk/debian/patches/fix-fop-config.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-fop-config.dpatch 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/patches/fix-fop-config.dpatch 2006-09-19 09:47:30 UTC (rev 2406)
@@ -8,7 +8,7 @@
## DP: - flash_dir should be the place on the HD. it looks for variables.txt in that dir
## DP: TODO: should be modified to "/var/lib/op-panel/"
## DP: - use a sane default password for the UI
-## DP: - use a default passwords fr the manager
+## DP: - use a default passwords for the manager
@DPATCH@
Property changes on: freepbx/trunk/debian/patches/fix-fop-config.dpatch
___________________________________________________________________
Name: svn:executable
- *
Property changes on: freepbx/trunk/debian/patches/fix-konqueror-blinks.dpatch
___________________________________________________________________
Name: svn:executable
- *
Added: freepbx/trunk/debian/patches/fix-reload-on-no-asterisk.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-reload-on-no-asterisk.dpatch (rev 0)
+++ freepbx/trunk/debian/patches/fix-reload-on-no-asterisk.dpatch 2006-09-19 09:47:30 UTC (rev 2406)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-reload-on-no-asterisk.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## DP: this fixes a problem caused by a "need reload" request when
+## DP: the manager does not respond. backport from the branch.
+
+ at DPATCH@
+diff -urNad freepbx-2.1.1/amp_conf/htdocs/admin/footer.php /tmp/dpep.v2AoWw/freepbx-2.1.1/amp_conf/htdocs/admin/footer.php
+--- freepbx-2.1.1/amp_conf/htdocs/admin/footer.php 2006-04-27 19:11:31.000000000 +0300
++++ /tmp/dpep.v2AoWw/freepbx-2.1.1/amp_conf/htdocs/admin/footer.php 2006-09-13 15:06:37.157453735 +0300
+@@ -80,10 +80,10 @@
+ */
+ //reload asterisk
+ $astman->send_request('Command', array('Command'=>'reload'));
++ $astman->disconnect();
+ } else {
+ echo _("Cannot connect to Asterisk Manager with ").$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"];
+ }
+- $astman->disconnect();
+
+ //bounce op_server.pl
+ $wOpBounce = rtrim($_SERVER['SCRIPT_FILENAME'],$currentFile).'bounce_op.sh';
Modified: freepbx/trunk/debian/rules
===================================================================
--- freepbx/trunk/debian/rules 2006-09-18 16:05:39 UTC (rev 2405)
+++ freepbx/trunk/debian/rules 2006-09-19 09:47:30 UTC (rev 2406)
@@ -11,7 +11,7 @@
# build-arch and build-indep targets by Bill Allombert 2001
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
# This has to be exported to make some magic below work.
@@ -24,8 +24,9 @@
# this hacks are been done for get-orig-source
DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
-UPFILENAME:= freepbx_$(UPVERSION).orig.tar.gz
-URL:= http://superb-east.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)_$(DEBVERSION).tar.gz
+UPFILENAME:= $(PACKAGE)_$(UPVERSION).orig.tar.gz
+DEBFILENAME:=$(PACKAGE)_$(UPVERSION).dfsg.orig.tar.gz
+URL:= http://superb-east.dl.sourceforge.net/sourceforge/amportal/$(PACKAGE)-$(UPVERSION).tar.gz
configure: configure-stamp
configure-stamp:
@@ -38,22 +39,9 @@
%: %.uu
uudecode --output-file=$@ $<
-%-8kh.wav: %.mp3
- sox $< $<-big.wav
- sox "$<-big.wav" -w -c1 -t wav -r 8000 -t wav "$<-8khz.wav" resample -q
- rm -f "$<-big.wav"
- mv "$<-8khz.wav" $@
-
-SOUNDZ_BASE:=dir-intro-fnln.gsm dir-intro-fnln-oper.gsm dir-intro-fn-oper.gsm dir-intro-oper.gsm
-SOUNDZ:=$(SOUNDZ_BASE:%=debian/rapid/sounds/%)
-
-IMAGES_BASE:=xorcom.png xorcom-ts1.png xorcom-rapid.png
+IMAGES_BASE:=xorcom.png xorcom-ts1.png xorcom-rapid.png
IMAGES:=$(IMAGES_BASE:%=debian/rapid/%)
-WAVS_BASE:=QuajiroPromo-8kh.wav TristeAlegriaPromo-8kh.wav
-WAVS:=$(WAVS_BASE:%=amp_conf/mohmp3/%)
-
-
build: build-stamp
build-stamp: patch-stamp
build-indep:
@@ -65,47 +53,52 @@
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
- #-$(MAKE) clean
rm -f $(IMAGES)
- rm -f $(MP3S)
- rm -f $(WAVS)
- rm -f debian/rapid/sounds/*.gsm
- rm -f amp_conf/mohmp3/*.wav*
+# rm -f debian/rapid/sounds/*.gsm
+# rm -f amp_conf/mohmp3/*.wav*
dh_clean
-install: install-indep
-#install-indep: $(IMAGES) $(WAVS) $(SOUNDZ)
-install-indep: $(IMAGES) $(SOUNDZ)
+install: install-indep
+install-indep: $(IMAGES)
dh_testdir
dh_testroot
dh_clean -k -i
dh_installdirs -i
dh_install -i
+ dh_link -p freepbx-admin usr/share/freepbx/ usr/share/freepbx/admin
+ dh_link -p freepbx-panel usr/share/op-panel/flash usr/share/freepbx/panel
dh_link -p freepbx-vmail usr/share/ari/ usr/share/freepbx/recordings
- dh_link -p freepbx-panel usr/share/op-panel/flash usr/share/freepbx/panel
dh_link -p freepbx-admin usr/share/freepbx/ var/www/amportal
dh_link -p freepbx-admin usr/share/freepbx/ var/www/freepbx
-# to be obsoleted soon
+
+# to be obsoleted soon
dh_link -p freepbx-admin usr/share/freepbx/ var/www/amportal
# this file is only part of freepbx-admin, no need to install it on the default package
rm -f debian/asterisk-config-freepbx/etc/asterisk/manager.d/freepbx.conf
# these 2 are in separate packages
- rm -f debian/freepbx-admin/usr/share/freepbx/admin/reports.php
- rm -f debian/freepbx-admin/usr/share/freepbx/admin/panel.php
+ rm -f debian/freepbx-admin/usr/share/freepbx/reports.php
+ rm -f debian/freepbx-admin/usr/share/freepbx/panel.php
# lets clean up the updates dir... deb keeps track of those things
rm -f debian/freepbx-admin/usr/share/freepbx/admin/i18n/*.txt
rm -f debian/freepbx-admin/usr/share/freepbx-common/upgrades/*.md5
rm -f debian/freepbx-admin/usr/share/freepbx-common/upgrades/md5-amp_conf.sh
+
+# lintaian shouts
+ chmod -x debian/freepbx-admin/usr/share/freepbx-common/upgrades/2.1beta1/tables.php
+ chmod -x debian/freepbx-admin/usr/share/freepbx-common/upgrades/2.1beta3/tables.php
+
+ chmod +x debian/freepbx-admin/usr/share/freepbx-common/apply_conf.sh
+ chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-install-mysql.sh
+ chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-install-sqlite.sh
+ chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-post-reload
+ chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-remove-mysql.sh
+ chmod +x debian/freepbx-admin/usr/share/freepbx-common/freepbx-remove-sqlite.sh
-# bad permissions, not good
-# chmod -x debian/freepbx-admin/usr/share/freepbx-common/upgrades/2.1beta1/tables.php
-# chmod -x debian/freepbx-admin/usr/share/freepbx-common/upgrades/2.1beta3/tables.php
-
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
# in another 'make' thread.
@@ -143,6 +136,28 @@
@@echo Downloading $(UPFILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+ tar xfz ../tarballs/$(UPFILENAME)
+ mv $(PACKAGE)-$(UPVERSION) $(PACKAGE)-$(UPVERSION).tmp
+
+# mp3 are bad, lets convert them to wav
+ for i in $(PACKAGE)-$(UPVERSION).tmp/amp_conf/mohmp3/*.mp3; do \
+ j=`echo $$i | sed 's/\\.mp3//g'` ;\
+ sox "$${i}" -w -c1 -t wav -r 8000 -t wav "$${j}-8khz.wav" resample -q ;\
+ rm -f $$i ;\
+ done
+
+# jpgraph is problematic
+ rm -f $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/reports.php
+ rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/cdr
+
+# repackage the new source
+ cd $(PACKAGE)-$(UPVERSION).tmp ; \
+ mkdir $(PACKAGE)_$(UPVERSION).dfsg;\
+ mv * $(PACKAGE)_$(UPVERSION).dfsg; \
+ tar cfz ../$(DEBFILENAME) *
+ mv $(DEBFILENAME) ../tarballs
+ echo Cleaning up...
+ $(RM) -rf $(PACKAGE)-$(UPVERSION).tmp/
+
binary: binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure patch unpatch
-
More information about the Pkg-voip-commits
mailing list