[Pkg-voip-commits] r4821 - in /freepbx/trunk/debian: changelog patches/clean-install-amp.dpatch patches/fix-ari-link.dpatch

Tue Nov 13 17:51:05 UTC 2007

Author: tzafrir-guest
Date: Tue Nov 13 17:51:05 2007
New Revision: 4821

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4821
Log:
* New upstream release: 2.3.1 .
* fix-ari-link.dpatch: update for 2.3.1 .
* clean-install-amp.dpatch: update to 2.3.1 and remove some messages.

Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/patches/clean-install-amp.dpatch
    freepbx/trunk/debian/patches/fix-ari-link.dpatch

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=4821&op=diff
==============================================================================

--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Tue Nov 13 17:51:05 2007
@@ -1,3 +1,11 @@
+freepbx (2.3.1~dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * fix-ari-link.dpatch: update for 2.3.1 .
+  * clean-install-amp.dpatch: update to 2.3.1 and remove some messages.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 11 Nov 2007 06:34:36 +0200
+
 freepbx (2.3.0~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release

Modified: freepbx/trunk/debian/patches/clean-install-amp.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/clean-install-amp.dpatch?rev=4821&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/clean-install-amp.dpatch (original)
+++ freepbx/trunk/debian/patches/clean-install-amp.dpatch Tue Nov 13 17:51:05 2007
@@ -14,7 +14,7 @@
 diff -urNad freepbx-2.3.0~dfsg~/install_amp freepbx-2.3.0~dfsg/install_amp
 --- freepbx-2.3.0~dfsg~/install_amp	2007-07-28 21:09:05.000000000 +0300
 +++ freepbx-2.3.0~dfsg/install_amp	2007-09-20 12:25:08.000000000 +0200
-@@ -7,13 +7,13 @@
+@@ -7,12 +7,12 @@
  define("AMP_CONF", "/etc/amportal.conf");
  define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
  define("UPGRADE_DIR", dirname(__FILE__)."/upgrades");
@@ -25,14 +25,12 @@
 -$webroot	= "/var/www/html";
 -$fopwebroot	= "";				// if blank, will use $webroot/panel
 -$ampsbin_dir = "/usr/local/sbin";	// default if not set
--$bin_dir	= "/var/lib/asterisk/bin";
 +$webroot	= "/var/www";
 +$fopwebroot	= "/usr/share/op-panel/flash";				// if blank, will use $webroot/panel
 +$ampsbin_dir = "/usr/share/asterisk/bin";	// default if not set
-+$bin_dir	= "/usr/share/asterisk/bin";
- $ampbin_dir = $bin_dir;
- $sin_dir	= "/usr/sbin";
+ $ampbin_dir = "/var/lib/asterisk/bin";
  $asterisk_user	= "asteriskuser";
+ $asterisk_pass	= "amp109";
 @@ -115,7 +115,7 @@
  	out("  --force-version <ver>    Force upgrade from version <ver>");
  	out("  --skip-module-install    Don't run install scripts for packaged modules, the files are still loaded.");
@@ -51,33 +49,6 @@
  			out("Created ".$amp_conf["AMPSBIN"]);
  			break;
  		} else {
-@@ -538,7 +538,7 @@
- outn("Checking for PEAR DB..");
- if (! @ include('DB.php')) {
- 	out("FAILED");
--	fatal("PEAR must be installed (requires DB.php). Include path: ".ini_get("include_path"));
-+	fatal("PEAR must be installed (requires DB.php). Include path: ".ini_get("include_path") . "\nPlease install the package php-pear or similar." );
- }
- out("OK");
- 
-@@ -547,7 +547,7 @@
- outn("Checking for PEAR Console::Getopt..");
- if (! @ include("Console/Getopt.php")) {
- 	out("FAILED");
--	fatal("PEAR must be installed (requires Console/Getopt.php). Include path: ".ini_get("include_path"));
-+	fatal("PEAR must be installed (requires Console/Getopt.php). Include path: ".ini_get("include_path") . "\nPlese install the package php-pear or similar." );
- }
- out("OK");
- 
-@@ -564,7 +564,7 @@
- 
- $debug = false;
- $dryrun = false;
--$install_files = true;
-+$install_files = false;
- $override_astvers = false;
- 
- $install_moh = false;
 @@ -615,6 +615,10 @@
  			$install_files = false;
  			out("Running upgrade only, without installing files.");
@@ -175,15 +146,6 @@
  
  
  // normally this would be the contents of ASTETCDIR/version, but this is for simplicity, as we just read it above
-@@ -896,7 +905,7 @@
- 		// datasource in in this style: dbengine://username:password@host/database 
- 		if (!function_exists($db_engine.'_connect')) {
- 			out("FAILED");
--			fatal($db_engine." PHP libraries not installed");
-+			fatal($db_engine." PHP libraries not installed. \n Please install php5-mysql or similar.");
- 		}
- 	
- 		$datasource = $db_engine.'://'.$db_user.':'.$db_pass.'@'.$db_host.'/'.$db_name;
 @@ -904,25 +913,7 @@
  		break;
  	

Modified: freepbx/trunk/debian/patches/fix-ari-link.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-ari-link.dpatch?rev=4821&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-ari-link.dpatch (original)
+++ freepbx/trunk/debian/patches/fix-ari-link.dpatch Tue Nov 13 17:51:05 2007
@@ -23,6 +23,6 @@
  	print_sub_tool( _("Panel")     , "panel.php"  , $currentFile=='panel.php' );
 -	print_sub_tool( _("Recordings"), "../recordings/index.php"  ,0, NULL, "ari" );
 +	print_sub_tool( _("Recordings"), "../ari/index.php"  ,0, NULL, "ari" );
- 	print_sub_tool( _("Help"), "http://freepbx.org/freepbx-help-system$help_args"  ,0, NULL, "help" );
+ 	print_sub_tool( _("Help"), "http://www.freepbx.org/freepbx-help-system$help_args"  ,0, NULL, "help" );
  	echo "<li class=\"last\"><a >&nbsp</a></li>";
  	echo "\t\t</ul>\n";


