[Pkg-voip-commits] r7212 - in /asterisk-gui/trunk/debian: README.Debian asterisk-gui.links changelog checkconfig control example_configs/apache2_asteriskgui.conf install patches/datadir_path patches/series patches/tmpdir patches/trademark rules
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Thu May 14 20:44:25 UTC 2009
Author: tzafrir-guest
Date: Thu May 14 20:44:24 2009
New Revision: 7212
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7212
Log:
Update to rev. 4875 - works with DAHDI.
Now a single tmp symlink
Added:
asterisk-gui/trunk/debian/checkconfig (with props)
asterisk-gui/trunk/debian/patches/tmpdir
Modified:
asterisk-gui/trunk/debian/README.Debian
asterisk-gui/trunk/debian/asterisk-gui.links
asterisk-gui/trunk/debian/changelog
asterisk-gui/trunk/debian/control
asterisk-gui/trunk/debian/example_configs/apache2_asteriskgui.conf
asterisk-gui/trunk/debian/install
asterisk-gui/trunk/debian/patches/datadir_path
asterisk-gui/trunk/debian/patches/series
asterisk-gui/trunk/debian/patches/trademark
asterisk-gui/trunk/debian/rules
Modified: asterisk-gui/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/README.Debian?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/README.Debian (original)
+++ asterisk-gui/trunk/debian/README.Debian Thu May 14 20:44:24 2009
@@ -16,6 +16,10 @@
------------
This package still needs some extra setup in Asterisk.
+To check if your configuration is valid, use:
+
+ /usr/share/asterisk/scripts/checkconfig
+
1) In /etc/asterisk/http.conf:
[general]
@@ -31,8 +35,8 @@
; And a user with at least the following:
[username_to_use]
secret = a_good_password
- read = config
- write = call,config,command
+ read = config,reporting
+ write = originate,config,command,call,system
By default the manager in Debian listens on the loopback interface
(localhost) alone, and thus the web interface will listen on port 8088 of
Modified: asterisk-gui/trunk/debian/asterisk-gui.links
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/asterisk-gui.links?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/asterisk-gui.links (original)
+++ asterisk-gui/trunk/debian/asterisk-gui.links Thu May 14 20:44:24 2009
@@ -1,2 +1,1 @@
-/var/spool/asterisk/tmp/sysinfo_output.html /usr/share/asterisk/static-http/config/sysinfo_output.html
-/var/spool/asterisk/tmp/today_log.html /usr/share/asterisk/static-http/config/today_log.html
+/var/spool/asterisk/tmp /usr/share/asterisk/static-http/config/tmp
Modified: asterisk-gui/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/changelog?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/changelog (original)
+++ asterisk-gui/trunk/debian/changelog Thu May 14 20:44:24 2009
@@ -1,4 +1,4 @@
-asterisk-gui (2.0.4-1) UNRELEASED; urgency=low
+asterisk-gui (2.0.4.9.svn.4785-1) UNRELEASED; urgency=low
[ Tzafrir Cohen ]
* Initial release from digium SVN (Closes: #496258).
Added: asterisk-gui/trunk/debian/checkconfig
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/checkconfig?rev=7212&op=file
==============================================================================
--- asterisk-gui/trunk/debian/checkconfig (added)
+++ asterisk-gui/trunk/debian/checkconfig Thu May 14 20:44:24 2009
@@ -1,0 +1,93 @@
+#!/bin/sh
+
+# Check if the configuration is valid. Based on the makefile
+# target 'checkconfig'
+
+ASTETCDIR=${ASTETCDIR:-/etc/asterisk}
+
+echo " --- Checking Asterisk configuration to see if it will support the GUI ---"
+echo -n "* Checking for http.conf: "
+if [ -f ${ASTETCDIR}/http.conf ]; then
+ echo "OK" ;
+else
+ echo "FAILED";
+ echo " -- Please run 'make samples' in *Asterisk* or " ;
+ echo " -- create your own ${ASTETCDIR}/http.conf" ;
+ exit 1;
+fi
+echo -n "* Checking for manager.conf: "
+if [ -f ${ASTETCDIR}/manager.conf ]; then
+ echo "OK" ;
+else
+ echo "FAILED";
+ echo " -- Please run 'make samples' in *Asterisk* or " ;
+ echo " -- create your own ${ASTETCDIR}/manager.conf" ;
+ exit 1;
+fi
+echo -n "* Checking if HTTP is enabled: "
+if grep -v '^;' ${ASTETCDIR}/http.conf | grep enabled | grep -q yes 2>/dev/null; then
+ echo "OK" ;
+else
+ echo "FAILED";
+ echo " -- Please be sure you have 'enabled = yes'" ;
+ echo " -- in ${ASTETCDIR}/http.conf" ;
+ exit 1;
+fi
+echo -n "* Checking if HTTP static support is enabled: "
+if grep -v '^;' ${ASTETCDIR}/http.conf | grep enablestatic | grep -q yes 2>/dev/null; then
+ echo "OK" ;
+else
+ echo "FAILED";
+ echo " -- Please be sure you have 'enablestatic = yes'" ;
+ echo " -- in ${ASTETCDIR}/http.conf" ;
+ exit 1;
+fi
+echo -n "* Checking if manager is enabled: "
+if grep -v '^;' ${ASTETCDIR}/manager.conf | grep ^enabled | grep -q yes 2>/dev/null; then
+ echo "OK" ;
+else
+ echo "FAILED";
+ echo " -- Please be sure you have 'enabled = yes'" ;
+ echo " -- in ${ASTETCDIR}/manager.conf" ;
+ exit 1;
+fi
+echo -n "* Checking if manager over HTTP is enabled: "
+if grep -v '^;' ${ASTETCDIR}/manager.conf | grep webenabled | grep -q yes 2>/dev/null; then
+ echo "OK" ;
+else
+ echo "FAILED";
+ echo " -- Please be sure you have 'webenabled = yes'" ;
+ echo " -- in ${ASTETCDIR}/manager.conf" ;
+ exit 1;
+fi
+
+HTTPHOST=`hostname`
+HTTPBINDPORT=`grep -v '^;' ${ASTETCDIR}/http.conf | grep bindport | cut -f 2 -d '=' | sed 's/ //g'`
+if [ "${HTTPBINDPORT}" = '' ]; then
+ HTTPBINDPORT=8088
+fi
+HTTPPREFIXBASE=` grep -v '^;' ${ASTETCDIR}/http.conf | grep prefix | sed 's/ //g'`
+HTTPPREFIX=` echo ${HTTPPREFIXBASE} | cut -f 2 -d '='`
+if [ "${HTTPPREFIXBASE}" = '' ]; then
+ HTTPPREFIX='asterisk'
+fi
+HTTPURL="http://${HTTPHOST}:${HTTPBINDPORT}/${HTTPPREFIX}/static/config/index.html"
+HTTPLOCALURL="http://localhost:${HTTPBINDPORT}/${HTTPPREFIX}/static/config/index.html"
+
+echo " --- Everything looks good --- "
+echo " * GUI should be available at ${HTTPURL}"
+echo ""
+echo " * Note: If you have bindaddr=127.0.0.1 in ${ASTETCDIR}/http.conf "
+echo " you will only be able to visit it from the local machine. "
+echo ""
+echo " Example: ${HTTPLOCALURL}"
+echo ""
+echo " * The login and password should be an entry from ${ASTETCDIR}/manager.conf"
+echo " which has 'config' permission in read and write. For example:"
+echo ""
+echo " [admin]"
+echo " secret = mysecret$$$$"
+echo " read = config"
+echo " write = originate,command,config"
+echo ""
+echo " --- Good luck! --- "
Propchange: asterisk-gui/trunk/debian/checkconfig
------------------------------------------------------------------------------
svn:executable = *
Modified: asterisk-gui/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/control?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/control (original)
+++ asterisk-gui/trunk/debian/control Thu May 14 20:44:24 2009
@@ -11,8 +11,8 @@
Package: asterisk-gui
Architecture: all
-Depends: asterisk (>= 1.4.0~0)
-Recommends: zaptel (>= 1.4.8~dfsg)
+Depends: asterisk (>= 1.4.0~0), libjs-jquery
+Recommends: zaptel (>= 1.4.8~dfsg) | dahdi
Description: web-based user interface for the Asterisk PBX
Asterisk <= 1.4 comes with a built-in http server and support for "AJAM":
Asynchronous Javascript Asterisk Manger (AJAX-based manager interface).
Modified: asterisk-gui/trunk/debian/example_configs/apache2_asteriskgui.conf
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/example_configs/apache2_asteriskgui.conf?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/example_configs/apache2_asteriskgui.conf (original)
+++ asterisk-gui/trunk/debian/example_configs/apache2_asteriskgui.conf Thu May 14 20:44:24 2009
@@ -13,8 +13,8 @@
Allow from all
</Proxy>
-ProxyPass /asterisk-gui/ http://localhost:8088/asterisk/
-ProxyPassReverse /asterisk-gui/ http://localhost:8088/asterisk/
+ProxyPass /asterisk-gui/ http://localhost:8088/
+ProxyPassReverse /asterisk-gui/ http://localhost:8088/
# Redirect /asterisk-gui to the start page.
# Doesn't work.
Modified: asterisk-gui/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/install?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/install (original)
+++ asterisk-gui/trunk/debian/install Thu May 14 20:44:24 2009
@@ -1,2 +1,4 @@
+debian/checkconfig usr/share/asterisk/scripts/
debian/images-dec/setup/* usr/share/asterisk/static-http/config/setup/
debian/images-dec/images/* usr/share/asterisk/static-http/config/images/
+debian/example_configs/apache2_asteriskgui.conf etc/apache2/conf.d/
Modified: asterisk-gui/trunk/debian/patches/datadir_path
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/datadir_path?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/datadir_path (original)
+++ asterisk-gui/trunk/debian/patches/datadir_path Thu May 14 20:44:24 2009
@@ -1,32 +1,6 @@
# Fix datadir to be /usr/share/asterisk rather than /var/lib/asterisk
# Upstream issue: http://bugs.digium.com/11629
---- a/config/js/astman.js
-+++ b/config/js/astman.js
-@@ -2531,17 +2531,18 @@ var ASTGUI = {
-
- ASTGUI.paths = {};
-
--ASTGUI.paths['guiInstall'] = '/var/lib/asterisk/static-http/config/';
-+ASTGUI.paths['astDataDir'] = '/usr/share/asterisk';
-+ASTGUI.paths['guiInstall'] = ASTGUI.paths['astDataDir'] + '/static-http/config/';
- ASTGUI.paths['rawman'] = '../../rawman';
- ASTGUI.paths['asteriskConfig'] = '/etc/asterisk/';
- ASTGUI.paths['ConfigBkp'] = '/var/lib/asterisk/gui_backups/';
- ASTGUI.paths['ConfigBkp_dldPath'] = ASTGUI.paths['guiInstall'] + 'private/bkps/'; // path for keeping the bkp files for download
--ASTGUI.paths['AGIBIN'] = '/var/lib/asterisk/agi-bin/';
--ASTGUI.paths['Sounds'] = '/var/lib/asterisk/sounds/';
--ASTGUI.paths['MOH'] = '/var/lib/asterisk/moh/' ; // path for music on hold files
-+ASTGUI.paths['AGIBIN'] = ASTGUI.paths['astDataDir'] + '/agi-bin/';
-+ASTGUI.paths['Sounds'] = ASTGUI.paths['astDataDir'] + '/sounds/';
-+ASTGUI.paths['MOH'] = ASTGUI.paths['astDataDir'] + '/moh/' ; // path for music on hold files
- ASTGUI.paths['menusRecord'] = ASTGUI.paths['Sounds'] + 'record/' ;
-
--ASTGUI.paths['scripts'] = '/var/lib/asterisk/scripts/';/* Directory for gui scripts (listfiles, for example) */
-+ASTGUI.paths['scripts'] = ASTGUI.paths['astDataDir'] + '/scripts/';/* Directory for gui scripts (listfiles, for example) */
- ASTGUI.paths['output_SysInfo'] = './sysinfo_output.html' ;
- ASTGUI.paths['voicemails_dir'] = '/var/spool/asterisk/voicemail/default/' ;
-
--- a/scripts/listfiles
+++ b/scripts/listfiles
@@ -1,5 +1,7 @@
@@ -38,14 +12,34 @@
#/bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
/bin/mkdir -p $1
---- a/scripts/gui_sysinfo
-+++ b/scripts/gui_sysinfo
-@@ -1,5 +1,7 @@
- #!/bin/sh
--SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"
-+
-+# (a symlink to the actual temporary file)
-+SYSINFO_OUTPUT="/usr/share/asterisk/static-http/config/sysinfo_output.html"
+--- a/config/js/index.js
++++ b/config/js/index.js
+@@ -249,22 +249,24 @@ var onLogInFunctions = {
+ if( ASTERISK_CONF === null ){ ASTERISK_CONF = new ASTGUI.customObject ; } // if context 'directories' not found in asterisk.conf
+ sessionData.directories.asteriskConfig = ASTERISK_CONF.getProperty('astetcdir') || '/etc/asterisk/' ;
+ sessionData.directories.astvarlibdir = ASTERISK_CONF.getProperty('astvarlibdir') || '/var/lib/asterisk/' ;
++ sessionData.directories.astdatadir = ASTERISK_CONF.getProperty('astdatadir') || '/usr/share/asterisk/' ;
+ sessionData.directories.AGIBIN = ASTERISK_CONF.getProperty('astagidir') || '/var/lib/asterisk/agi-bin/' ;
+ sessionData.directories.astspooldir = ASTERISK_CONF.getProperty('astspooldir') || '/var/spool/asterisk/' ;
- UNAME="`uname -a`"
- /bin/echo "<div id=si_uname>$UNAME</div>" > $SYSINFO_OUTPUT
+ if( !sessionData.directories.asteriskConfig.endsWith('/') ){ sessionData.directories.asteriskConfig = sessionData.directories.asteriskConfig + '/' ; }
+ if( !sessionData.directories.astvarlibdir.endsWith('/') ){ sessionData.directories.astvarlibdir = sessionData.directories.astvarlibdir + '/' ; }
++ if( !sessionData.directories.astdatadir.endsWith('/') ){ sessionData.directories.astdatadir = sessionData.directories.astdatadir + '/' ; }
+ if( !sessionData.directories.AGIBIN.endsWith('/') ){ sessionData.directories.AGIBIN = sessionData.directories.AGIBIN + '/' ; }
+ if( !sessionData.directories.astspooldir.endsWith('/') ){ sessionData.directories.astspooldir = sessionData.directories.astspooldir + '/' ; }
+
+- sessionData.directories.guiInstall = sessionData.directories.astvarlibdir + 'static-http/config/' ;
++ sessionData.directories.guiInstall = sessionData.directories.astdatadir + 'static-http/config/' ;
+ sessionData.directories.ConfigBkp = sessionData.directories.astvarlibdir + 'gui_backups/';
+ sessionData.directories.ConfigBkp_dldPath = sessionData.directories.guiInstall + 'private/bkps/'; // path for keeping the bkp files for download
+- sessionData.directories.Sounds = sessionData.directories.astvarlibdir + 'sounds/' ;
+- sessionData.directories.MOH = sessionData.directories.astvarlibdir + 'moh/' ; // path for music on hold files
++ sessionData.directories.Sounds = sessionData.directories.astdatadir + 'sounds/' ;
++ sessionData.directories.MOH = sessionData.directories.astdatadir + 'moh/' ; // path for music on hold files
+ sessionData.directories.menusRecord = sessionData.directories.Sounds + 'record/' ;
+
+- sessionData.directories.scripts = sessionData.directories.astvarlibdir + 'scripts/';/* Directory for gui scripts (listfiles, for example) */
++ sessionData.directories.scripts = sessionData.directories.astdatadir + 'scripts/';/* Directory for gui scripts (listfiles, for example) */
+ sessionData.directories.output_SysInfo = './sysinfo_output.html' ;
+ sessionData.directories.voicemails_dir = sessionData.directories.astspooldir + 'voicemail/default/' ;
+ sessionData.directories.script_takeBackup = 'sh ' + sessionData.directories.scripts + 'takebackup';
Modified: asterisk-gui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/series?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/series (original)
+++ asterisk-gui/trunk/debian/patches/series Thu May 14 20:44:24 2009
@@ -4,3 +4,4 @@
#sysinfo_path
#log_path
trademark
+tmpdir
Added: asterisk-gui/trunk/debian/patches/tmpdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/tmpdir?rev=7212&op=file
==============================================================================
--- asterisk-gui/trunk/debian/patches/tmpdir (added)
+++ asterisk-gui/trunk/debian/patches/tmpdir Thu May 14 20:44:24 2009
@@ -1,0 +1,85 @@
+--- a/config/js/astman.js
++++ b/config/js/astman.js
+@@ -331,7 +331,7 @@ var ASTGUI = {
+ configfile : 'guipreferences.conf', // will be created if the file does not exist , ASTGUI.globals.configfile
+ g729RegInfo: 'g729reginfo.conf', // ASTGUI.globals.g729RegInfo, the sessionData.directories.script_Registerg729 script will read this file to generate tab delimited file
+ hwcfgFile: 'gui_confighw.conf', // file to store configured hardware information, to detect hardware changes
+- dahdiIncludeFile: 'dahdi_guiread.conf', // file that will be used to read zaptel.conf or dahdi/system.conf , ASTGUI.globals.dahdiIncludeFile
++ dahdiIncludeFile: '/var/spool/asterisk/tmp/dahdi_guiread.conf', // file that will be used to read zaptel.conf or dahdi/system.conf , ASTGUI.globals.dahdiIncludeFile
+ dahdiScanOutput: 'dahdi_scan.conf', // file that will be used to read output from ztscan or dahdi_scan, ASTGUI.globals.dahdiScanOutput
+ pingInterval : 5000,
+ app_factoryReset : '/bin/reset_config', // ASTGUI.globals.app_factoryReset
+@@ -2366,12 +2366,12 @@ var ASTGUI = {
+ // output will be sent as a argument to the callback function
+ //var fcmd = cmd + ' > ' + top.sessionData.directories.guiInstall + ;
+ var tmp_opf = ( top.sessionData.directories.output_SysInfo.afterChar('/') || top.sessionData.directories.output_SysInfo ).rChop('.html') + Math.round( 10000 * Math.random() ) + '.html' ;
+- var fcmd = cmd + ' > ' + top.sessionData.directories.guiInstall + tmp_opf ;
++ var fcmd = cmd + ' > ' + top.sessionData.directories.tmpdir + tmp_opf ;
+
+ var after = function(){
+ parent.document.getElementById('ajaxstatus').style.display = 'none';
+- ASTGUI.loadHTML( tmp_opf , function(cmd_output){
+- ASTGUI.systemCmd( 'rm ' + top.sessionData.directories.guiInstall + tmp_opf, function(){cb(cmd_output);} );
++ ASTGUI.loadHTML( 'tmp/' + tmp_opf , function(cmd_output){
++ ASTGUI.systemCmd( 'rm ' + top.sessionData.directories.tmpdir + tmp_opf, function(){cb(cmd_output);} );
+ });
+ };
+
+--- a/scripts/detectdahdi.sh
++++ b/scripts/detectdahdi.sh
+@@ -2,7 +2,7 @@
+
+ # script to detect whether zaptel/dahdi was installed & generate an include file for GUI
+
+-OUTPUTFILE="/etc/asterisk/dahdi_guiread.conf"
++OUTPUTFILE="/var/spool/asterisk/tmp/dahdi_guiread.conf"
+
+ echo "" > ${OUTPUTFILE}
+ echo "[general]" >> ${OUTPUTFILE}
+@@ -10,14 +10,14 @@ echo "" >> ${OUTPUTFILE}
+
+ if [ -e /dev/zap ]; then
+ echo "zaptel"
+- echo "#include \"../zaptel.conf\"" >> ${OUTPUTFILE}
++ echo "#include \"/etc/zaptel.conf\"" >> ${OUTPUTFILE}
+ echo "" >> ${OUTPUTFILE}
+ exit 0
+ fi
+
+ if [ -e /dev/dahdi ]; then
+ echo "dahdi"
+- echo "#include \"../dahdi/system.conf\"" >> ${OUTPUTFILE}
++ echo "#include \"/etc/dahdi/system.conf\"" >> ${OUTPUTFILE}
+ echo "" >> ${OUTPUTFILE}
+ exit 0
+ fi
+--- a/config/js/index.js
++++ b/config/js/index.js
+@@ -262,6 +262,7 @@ var onLogInFunctions = {
+ if( !sessionData.directories.astdatadir.endsWith('/') ){ sessionData.directories.astdatadir = sessionData.directories.astdatadir + '/' ; }
+ if( !sessionData.directories.AGIBIN.endsWith('/') ){ sessionData.directories.AGIBIN = sessionData.directories.AGIBIN + '/' ; }
+ if( !sessionData.directories.astspooldir.endsWith('/') ){ sessionData.directories.astspooldir = sessionData.directories.astspooldir + '/' ; }
++ sessionData.directories.tmpdir = sessionData.directories.astspooldir + 'tmp/';
+
+ sessionData.directories.guiInstall = sessionData.directories.astdatadir + 'static-http/config/' ;
+ sessionData.directories.ConfigBkp = sessionData.directories.astvarlibdir + 'gui_backups/';
+@@ -271,7 +272,7 @@ var onLogInFunctions = {
+ sessionData.directories.menusRecord = sessionData.directories.Sounds + 'record/' ;
+
+ sessionData.directories.scripts = sessionData.directories.astdatadir + 'scripts/';/* Directory for gui scripts (listfiles, for example) */
+- sessionData.directories.output_SysInfo = './sysinfo_output.html' ;
++ sessionData.directories.output_SysInfo = 'tmp/sysinfo_output.html' ;
+ sessionData.directories.voicemails_dir = sessionData.directories.astspooldir + 'voicemail/default/' ;
+ sessionData.directories.script_takeBackup = 'sh ' + sessionData.directories.scripts + 'takebackup';
+ sessionData.directories.script_restoreBackup = 'sh ' + sessionData.directories.scripts + 'restorebackup';
+--- a/scripts/listfiles
++++ b/scripts/listfiles
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+
+ # (a symlink to the actual temporary file)
+-SYSINFO_OUTPUT="/usr/share/asterisk/static-http/config/sysinfo_output.html"
++SYSINFO_OUTPUT="/usr/share/asterisk/static-http/config/tmp/sysinfo_output.html"
+
+ #/bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT
+ /bin/mkdir -p $1
Modified: asterisk-gui/trunk/debian/patches/trademark
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/trademark?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/trademark (original)
+++ asterisk-gui/trunk/debian/patches/trademark Thu May 14 20:44:24 2009
@@ -18,16 +18,16 @@
<tr> <td colspan="2"><BR></td>
--- a/config/index.html
+++ b/config/index.html
-@@ -85,7 +85,7 @@ var sessionData = {
-
- </script>
+@@ -95,7 +95,7 @@ var sessionData = {
+ <script src="js/pbx2.js"></script>
+ <script src="js/index.js"></script>
<head>
- <title>Asterisk Configuration GUI</title>
+ <title>GUI for Asterisk</title>
<link rel="shortcut icon" href="images/favicon.ico" />
</head>
<body topmargin=1 leftmargin=2>
-@@ -106,7 +106,7 @@ var sessionData = {
+@@ -116,7 +116,7 @@ var sessionData = {
<div id="accordion_div" style='display:none; width: 170px;'>
<div page='home.html?status=1'>
<div class="ui-accordion-link">Home</div>
Modified: asterisk-gui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/rules?rev=7212&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/rules (original)
+++ asterisk-gui/trunk/debian/rules Thu May 14 20:44:24 2009
@@ -41,8 +41,7 @@
install/asterisk-gui::
chmod +x $(CURDIR)/debian/asterisk-gui/usr/share/asterisk/scripts/*
- # Seems to be unused:
- $(RM) -f $(CURDIR)/debian/asterisk-gui/usr/share/asterisk/scripts/graphs.sh
+ #rm -f $(CURDIR)/debian/asterisk-gui/usr/share/asterisk/static-http/config/js/jquery.js
print-version:
@echo "Debian version: $(DEBVERSION)"
More information about the Pkg-voip-commits
mailing list