[Pkg-voip-commits] r6041 - in /asterisk-gui/trunk/debian: changelog patches/datadir_path patches/series rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Aug 16 17:44:39 2008
New Revision: 6041

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6041
Log:
Initial checkin of asterisk-gui from branches/2.0 .

Dropped most patches for now. They'll probably have to be rewritten.

Modified:
    asterisk-gui/trunk/debian/changelog
    asterisk-gui/trunk/debian/patches/datadir_path
    asterisk-gui/trunk/debian/patches/series
    asterisk-gui/trunk/debian/rules

Modified: asterisk-gui/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/changelog?rev=6041&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/changelog (original)
+++ asterisk-gui/trunk/debian/changelog Sat Aug 16 17:44:39 2008
@@ -1,4 +1,4 @@
-asterisk-gui (0.0.svn3329-1) UNRELEASED; urgency=low
+asterisk-gui (0.0.svn3671-1) UNRELEASED; urgency=low
 
   [ Kilian Krause ]
   * Fix build-deps (include dpatch).

Modified: asterisk-gui/trunk/debian/patches/datadir_path
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/datadir_path?rev=6041&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/datadir_path (original)
+++ asterisk-gui/trunk/debian/patches/datadir_path Sat Aug 16 17:44:39 2008
@@ -1,19 +1,28 @@
 # Fix datadir to be /usr/share/asterisk rather than /var/lib/asterisk
 # Upstream issue: http://bugs.digium.com/11629
 
---- asterisk-gui-0.0.svn2268.orig/config/scripts/astman.js
-+++ asterisk-gui-0.0.svn2268/config/scripts/astman.js
-@@ -26,10 +26,11 @@ var asterisk_guitools = "asterisk_guitoo
- var asterisk_guitoolsversion = "0.7";
- var asterisk_guiversion = "$Revision: 2124 $";
- var asterisk_guifbt = 3000; // Feedback msg time
--var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (listfiles, for example) */
-+var asterisk_DataDir = "/usr/share/asterisk";
-+var asterisk_scriptsFolder = asterisk_DataDir + "/scripts/" ; /* Directory for gui scripts (listfiles, for example) */
- var asterisk_guiNetworkSettings = "sh " + asterisk_scriptsFolder + "networking.sh";
- var asterisk_ConfigBkpPath = "/var/lib/asterisk/gui_configbackups/" ;
--var asterisk_Sounds_path = "/var/lib/asterisk/sounds/";
-+var asterisk_Sounds_path = asterisk_DataDir + "/sounds/";
- var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";
- var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ;
- var asterisk_guiSysInfo_output = "./sysinfo_output.html";
+--- asterisk-gui-0.0.svn2268.orig/config/js/astman.js
++++ asterisk-gui-0.0.svn2268/config/js/astman.js
+@@ -2422,17 +2422,18 @@ var asterisk_guitools = "asterisk_guitoo
+ 
+ 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['Sounds'] = '/var/lib/asterisk/sounds/';
+-ASTGUI.paths['MOH'] = '/var/lib/asterisk/moh/' ; // path for music on hold files
++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/' ;
+ 

Modified: asterisk-gui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/series?rev=6041&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/series (original)
+++ asterisk-gui/trunk/debian/patches/series Sat Aug 16 17:44:39 2008
@@ -1,5 +1,5 @@
 datadir_path
-trademark_text
-change_colors
-sysinfo_path
-log_path
+#trademark_text
+#change_colors
+#sysinfo_path
+#log_path

Modified: asterisk-gui/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/rules?rev=6041&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/rules (original)
+++ asterisk-gui/trunk/debian/rules Sat Aug 16 17:44:39 2008
@@ -5,7 +5,7 @@
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 SVN_REV:=$(shell echo $(UPVERSION) | sed -e 's/^.*svn//')
-SVN_BRANCH:=trunk
+SVN_BRANCH:=branches/2.0
 SVN_URL:=http://svn.digium.com/svn/asterisk-gui/$(SVN_BRANCH)
 DIR_NAME:=$(PACKAGE)-$(UPVERSION)
 TARBALL:=$(PACKAGE)_$(UPVERSION).orig.tar.gz