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

odd_bloke-guest at alioth.debian.org odd_bloke-guest at alioth.debian.org
Wed Oct 29 13:41:56 UTC 2008 

Author: odd_bloke-guest
Date: Wed Oct 29 13:41:56 2008
New Revision: 6347

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6347
Log:
Refreshed patches for new version.

Removed:
    freepbx/trunk/debian/patches/resolve_conf-report_errors-db
Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/patches/clean-install-amp
    freepbx/trunk/debian/patches/disable-online-updates
    freepbx/trunk/debian/patches/fix-ari-link
    freepbx/trunk/debian/patches/fix-fop-config
    freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg
    freepbx/trunk/debian/patches/no_cp_symlink_subdirs
    freepbx/trunk/debian/patches/noisy_fail_mod_msg
    freepbx/trunk/debian/patches/path-to-fop
    freepbx/trunk/debian/patches/series

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Wed Oct 29 13:41:56 2008
@@ -1,5 +1,6 @@
 freepbx (2.5.1~dfsg-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * debian/freepbx-sounds-extra.dirs: Corrected typo of 'asterisk'.
   * debian/control:
     + Removed php4 packages from Depends, as php4 is no longer distributed as
@@ -11,7 +12,10 @@
     + Removed php4-specific code, as php4 is no longer distributed as part of
       unstable.
     + Fixed inconsistent whitespace.
-  * debian/patches: Refreshed patches.
+  * debian/patches:
+    + Refreshed patches for new version.
+    + Removed debian/patches/resolve_conf-report-errors-db as it has been
+      merged upstream.
   * debian/patches/clean-install-amp: Changed $webroot to be /usr/share/freepbx
     rather than /var/www.
   * debian/rules: Don't link /usr/share/freepbx into /var/www, as per lintian
@@ -20,7 +24,7 @@
     question are Asterisk sound files rather than Windows development files.
   * Added manpage for update-freepbx.
 
- -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Tue, 28 Oct 2008 12:09:46 +0000
+ -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Tue, 28 Oct 2008 12:11:09 +0000
 
 freepbx (2.4.0~dfsg-1) UNRELEASED; urgency=low
 

Modified: freepbx/trunk/debian/patches/clean-install-amp
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/clean-install-amp?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/clean-install-amp (original)
+++ freepbx/trunk/debian/patches/clean-install-amp Wed Oct 29 13:41:56 2008
@@ -10,10 +10,10 @@
 ## 
 ## TODO: split this patch to separate fixes.
 
-Index: freepbx-2.4.0~dfsg/install_amp
+Index: freepbx-2.5.1~dfsg/install_amp
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/install_amp	2008-10-24 14:44:38.000000000 +0100
-+++ freepbx-2.4.0~dfsg/install_amp	2008-10-24 14:45:12.000000000 +0100
+--- freepbx-2.5.1~dfsg.orig/install_amp	2008-10-22 06:13:01.000000000 +0100
++++ freepbx-2.5.1~dfsg/install_amp	2008-10-28 11:53:11.000000000 +0000
 @@ -7,12 +7,12 @@
  define("AMP_CONF", "/etc/amportal.conf");
  define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
@@ -39,8 +39,8 @@
 +	out("  --no-files               Just run updates without installing files (default)");
  	out("  --install-moh            Install default music-on-hold files (normally doesn't, unless ");
  	out("                           it's a new installation)");
- 	//out("  --make-links-devel       Make links to files in the source directory instead of copying");
-@@ -395,7 +395,7 @@
+ 	out("  --install-fop=false      Don't install FOP and don't display it anywhere on the interface");
+@@ -396,7 +396,7 @@
  
  		if (is_dir($amp_conf["AMPSBIN"])) {
  			break;
@@ -49,7 +49,7 @@
  			out("Created ".$amp_conf["AMPSBIN"]);
  			break;
  		} else {
-@@ -630,6 +630,10 @@
+@@ -632,6 +632,10 @@
  			$install_files = false;
  			out("Running upgrade only, without installing files.");
  		break;
@@ -60,7 +60,7 @@
  		case "--my-svn-is-correct":
  			$override_astvers = true;
  		break;
-@@ -701,14 +705,6 @@
+@@ -714,14 +718,6 @@
  out("OK");
  
  
@@ -75,7 +75,7 @@
  // **** Check for amportal.conf, create if necessary
  
  outn("Checking for ".AMP_CONF."..");
-@@ -720,7 +716,7 @@
+@@ -733,7 +729,7 @@
  	// this addresses http://freepbx.org/trac/ticket/1878
  	chown(AMP_CONF, "asterisk"); 
  	chgrp(AMP_CONF, "asterisk"); 
@@ -84,7 +84,7 @@
  
  	collect_settings(AMP_CONF, $dbhost, $new_username, $new_password, 'asterisk');
  
-@@ -742,7 +738,7 @@
+@@ -755,7 +751,7 @@
  
  if (!array_key_exists("AMPWEBROOT",$amp_conf)) {
  	out("Adding AMPWEBROOT option to amportal.conf - using AMP default");
@@ -93,7 +93,7 @@
  }
  
  if (!array_key_exists("FOPWEBROOT",$amp_conf)) {
-@@ -752,7 +748,7 @@
+@@ -765,7 +761,7 @@
  
  if (!array_key_exists("AMPBIN",$amp_conf)) {
  	out("Adding AMPBIN option to amportal.conf - using AMP default");
@@ -102,7 +102,7 @@
  }
  
  if (!array_key_exists("AMPSBIN",$amp_conf)) {
-@@ -788,7 +784,7 @@
+@@ -809,7 +805,7 @@
  // write amportal.conf
  write_amportal_conf(AMP_CONF, $amp_conf);
  
@@ -111,7 +111,7 @@
  
  outn("Checking for ".ASTERISK_CONF."..");
  if (!file_exists(ASTERISK_CONF)) {
-@@ -811,7 +807,8 @@
+@@ -832,7 +828,8 @@
     
     this code will stay in 2.2, but in 2.3 it will be gone. developers - please
     update your code
@@ -121,7 +121,7 @@
  if (isset($asterisk_conf['astetcdir'])) { $amp_conf['ASTETCDIR'] = $asterisk_conf['astetcdir']; }
  if (isset($asterisk_conf['astmoddir'])) { $amp_conf['ASTMODDIR'] = $asterisk_conf['astmoddir']; }
  if (isset($asterisk_conf['astvarlibdir'])) { $amp_conf['ASTVARLIBDIR'] = $asterisk_conf['astvarlibdir']; }
-@@ -819,6 +816,7 @@
+@@ -840,6 +837,7 @@
  if (isset($asterisk_conf['astspooldir'])) { $amp_conf['ASTSPOOLDIR'] = $asterisk_conf['astspooldir']; }
  if (isset($asterisk_conf['astrundir'])) { $amp_conf['ASTRUNDIR'] = $asterisk_conf['astrundir']; }
  if (isset($asterisk_conf['astlogdir'])) { $amp_conf['ASTLOGDIR'] = $asterisk_conf['astlogdir']; }
@@ -129,7 +129,7 @@
  
  if (!isset($pbx_engine)) { $pbx_engine='asterisk'; }
  out("Using $pbx_engine as PBX Engine");
-@@ -830,17 +828,20 @@
+@@ -851,17 +849,20 @@
  // **** Write asterisk version to ASTETCDIR/version
  
  $tmpoutput = '';
@@ -152,7 +152,7 @@
  
  
  // normally this would be the contents of ASTETCDIR/version, but this is for simplicity, as we just read it above
-@@ -986,15 +987,15 @@
+@@ -1021,15 +1022,15 @@
  }
  
  // **** Apply amportal.conf configuration to files
@@ -171,7 +171,7 @@
  	if (file_exists($amp_conf["AMPBIN"]."/freepbx_engine")) {
  		exec("chmod u+x ".$amp_conf["AMPBIN"]."/freepbx_engine");
  		outn("freepbx_engine..");
-@@ -1006,7 +1007,7 @@
+@@ -1041,7 +1042,7 @@
  	// reload manager in asterisk if it is running:
  	//
  	outn("apply username/password changes to conf files..");
@@ -179,8 +179,8 @@
 +	exec( "/usr/sbin/update-freepbx");
  	out("done");
  
- 	// reload manager in asterisk if it was running:
-@@ -1023,7 +1024,7 @@
+ 	/* As of Asterisk 1.4.16 or there abouts, a missing #include file will make the reload fail. So
+@@ -1100,7 +1101,7 @@
  
  
  // **** Set permissions all files
@@ -189,7 +189,7 @@
  if ($install_files)
  {
  	outn("Setting permissions on files..");
-@@ -1031,7 +1032,7 @@
+@@ -1108,7 +1109,7 @@
  		exec($amp_conf["AMPSBIN"]."/amportal chown");
  	}
  	out("OK");
@@ -198,25 +198,24 @@
  
  // Run through all the upgrade scripts starting at the specified version
  //
-@@ -1041,7 +1042,7 @@
+@@ -1118,7 +1119,7 @@
  out("Generating AMP configs..");
  generate_configs();
  out("Generating AMP configs..OK");
 -
 +/*
  $version = install_getversion();
- $filename = $amp_conf["AMPWEBROOT"]."/admin/version.txt";
- if (!$fd = fopen($filename, "w")) {
-@@ -1054,7 +1055,7 @@
- outn("Restarting Flash Operator Panel..");
- exec('su - asterisk -c "'.$amp_conf["AMPBIN"].'/bounce_op.sh"');
- out("OK");
--
+ 
+ if($install_fop && $amp_conf["FOPRUN"])  {
+@@ -1127,6 +1128,7 @@
+ 	exec('su - asterisk -c "'.$amp_conf["AMPBIN"].'/bounce_op.sh"');
+ 	out("OK");
+ }
 +*/
  
  // Now force an install for all modules that are packaged with the tarball
  // directory.
-@@ -1071,7 +1072,7 @@
+@@ -1143,7 +1145,7 @@
  
  if ($amp_conf["AMPWEBADDRESS"])
  {

Modified: freepbx/trunk/debian/patches/disable-online-updates
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/disable-online-updates?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/disable-online-updates (original)
+++ freepbx/trunk/debian/patches/disable-online-updates Wed Oct 29 13:41:56 2008
@@ -2,10 +2,10 @@
 ##
 ## configuration in amportal.conf
 
-Index: freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/page.modules.php
+Index: freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/page.modules.php
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs/admin/page.modules.php	2008-10-24 14:40:59.000000000 +0100
-+++ freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/page.modules.php	2008-10-24 14:42:10.000000000 +0100
+--- freepbx-2.5.1~dfsg.orig/amp_conf/htdocs/admin/page.modules.php	2008-10-12 21:13:40.000000000 +0100
++++ freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/page.modules.php	2008-10-28 11:47:33.000000000 +0000
 @@ -6,11 +6,16 @@
   * Optionally, the other way is to remove the below lines, and instead just define 
   * EXTERNAL_PACKAGE_MANAGEMENT as 1. This prevents changing the setting from amportal.conf.
@@ -21,11 +21,11 @@
 +*/
 +define('EXTERNAL_PACKAGE_MANAGEMENT', 1);
  
+ $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
  
- $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
-@@ -35,6 +40,15 @@
- $freepbx_version = $freepbx_version ? $freepbx_version : getversion();
- $freepbx_help_url = "http://www.freepbx.org/freepbx-help-system?freepbx_version=".urlencode($freepbx_version);
+@@ -875,6 +880,15 @@
+   return '<a target="tractickets" href="'.$baseurl.$match[1].'" title="changeset '.$match[1].'">'.$match[0].'</a>';
+ }                                                                                                                                              
  
 +if (isset($amp_conf["AMP_ONLINE_UPDATE"])) {
 +	$packager_mode = (strtolower($amp_conf["AMP_ONLINE_UPDATE"]) == "true" );
@@ -37,5 +37,5 @@
 +
 +
  function pageReload(){
- return "";
+ 	return "";
  	//return "<script language=\"Javascript\">document.location='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."&foo=".rand()."'</script>";

Modified: freepbx/trunk/debian/patches/fix-ari-link
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-ari-link?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-ari-link (original)
+++ freepbx/trunk/debian/patches/fix-ari-link Wed Oct 29 13:41:56 2008
@@ -2,10 +2,10 @@
 ##
 ## Fix a link to ARI (the recordings) in the top bar.
 
-Index: freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/views/freepbx.php
+Index: freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/views/freepbx.php
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs/admin/views/freepbx.php	2008-10-24 14:39:26.000000000 +0100
-+++ freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/views/freepbx.php	2008-10-24 14:42:20.000000000 +0100
+--- freepbx-2.5.1~dfsg.orig/amp_conf/htdocs/admin/views/freepbx.php	2008-09-26 21:15:51.000000000 +0100
++++ freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/views/freepbx.php	2008-10-28 11:56:55.000000000 +0000
 @@ -29,7 +29,7 @@
  		if ($new_window === true) {
  			$html .= "target=\"_blank\" ";
@@ -15,10 +15,10 @@
  			//$html .= "onClick=\"return menu_popup(this, '$new_window')\" ";
  		}
  	}
-@@ -165,7 +165,7 @@
- 	print_sub_tool( _("Admin")   , "config.php", $currentFile=='config.php' );
- 	print_sub_tool( _("Reports")   , "reports.php", $currentFile=='reports.php' );
- 	print_sub_tool( _("Panel")     , "panel.php"  , $currentFile=='panel.php' );
+@@ -167,7 +167,7 @@
+ 	if(!$amp_conf["FOPDISABLE"]) {
+ 		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://www.freepbx.org/freepbx-help-system$help_args"  ,0, NULL, "help" );

Modified: freepbx/trunk/debian/patches/fix-fop-config
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-fop-config?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-fop-config (original)
+++ freepbx/trunk/debian/patches/fix-fop-config Wed Oct 29 13:41:56 2008
@@ -9,11 +9,11 @@
 ##   - use a sane default password for the UI
 ##   - use a default passwords for the manager
 
-Index: freepbx-2.4.0~dfsg/amp_conf/htdocs_panel/op_server.cfg
+Index: freepbx-2.5.1~dfsg/amp_conf/htdocs_panel/op_server.cfg
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs_panel/op_server.cfg	2008-10-24 14:39:26.000000000 +0100
-+++ freepbx-2.4.0~dfsg/amp_conf/htdocs_panel/op_server.cfg	2008-10-24 14:42:26.000000000 +0100
-@@ -11,8 +11,8 @@
+--- freepbx-2.5.1~dfsg.orig/amp_conf/htdocs_panel/op_server.cfg	2008-07-23 20:38:15.000000000 +0100
++++ freepbx-2.5.1~dfsg/amp_conf/htdocs_panel/op_server.cfg	2008-10-28 11:58:10.000000000 +0000
+@@ -12,8 +12,8 @@
  manager_host=127.0.0.1      
  
  ; user and secret for connecting to * manager
@@ -24,7 +24,7 @@
  
  ; The optional event_mask for filtering manager events.
  ; Asterisk will send only the events you request
-@@ -39,14 +39,14 @@
+@@ -40,14 +40,14 @@
  ; the flash movie resides (just the hostname, without directories)
  ; This value might be omited. In that case the flash movie will
  ; try to connect to the same host as the web page.

Modified: freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg (original)
+++ freepbx/trunk/debian/patches/fix-retrieve-op-panel-cfg Wed Oct 29 13:41:56 2008
@@ -3,11 +3,11 @@
 ## By default freePBX's script saves into the webroot. it should save 
 ## the config into /etc/op-panel/freepbx
 
-Index: freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl
+Index: freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/amp_conf/bin/retrieve_op_conf_from_mysql.pl	2008-10-24 14:39:26.000000000 +0100
-+++ freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl	2008-10-24 14:42:47.000000000 +0100
-@@ -156,7 +156,7 @@
+--- freepbx-2.5.1~dfsg.orig/amp_conf/bin/retrieve_op_conf_from_mysql.pl	2008-10-28 12:03:00.000000000 +0000
++++ freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_op_conf_from_mysql.pl	2008-10-28 12:03:42.000000000 +0000
+@@ -183,7 +183,7 @@
  $ampconf = parse_amportal_conf( $amportalconf );
  
  # WARNING: this file will be substituted by the output of this program
@@ -16,10 +16,10 @@
  # username to connect to the database
  $username = $ampconf->{"AMPDBUSER"};
  # password to connect to the database
-Index: freepbx-2.4.0~dfsg/amp_conf/htdocs_panel/op_buttons.cfg
+Index: freepbx-2.5.1~dfsg/amp_conf/htdocs_panel/op_buttons.cfg
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs_panel/op_buttons.cfg	2008-10-24 14:39:26.000000000 +0100
-+++ freepbx-2.4.0~dfsg/amp_conf/htdocs_panel/op_buttons.cfg	2008-10-24 14:42:47.000000000 +0100
+--- freepbx-2.5.1~dfsg.orig/amp_conf/htdocs_panel/op_buttons.cfg	2008-10-28 12:03:00.000000000 +0000
++++ freepbx-2.5.1~dfsg/amp_conf/htdocs_panel/op_buttons.cfg	2008-10-28 12:03:42.000000000 +0000
 @@ -1,7 +1,7 @@
 -include => op_buttons_additional.cfg
 +include => freepbx/op_buttons_additional.cfg
@@ -28,5 +28,5 @@
 -include => op_buttons_custom.cfg
 +include => freepbx/op_buttons_custom.cfg
  
- ; Queues
- [rectangle]
+ ; Old values now auto-generated:
+ 

Modified: freepbx/trunk/debian/patches/no_cp_symlink_subdirs
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/no_cp_symlink_subdirs?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/no_cp_symlink_subdirs (original)
+++ freepbx/trunk/debian/patches/no_cp_symlink_subdirs Wed Oct 29 13:41:56 2008
@@ -1,17 +1,23 @@
 Don't start copying / symlinking files in retrieve_conf . Those should
 be done explicitly at module isntall time.
 
-Index: freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_conf
+Index: freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_conf
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/amp_conf/bin/retrieve_conf	2008-10-24 14:41:42.000000000 +0100
-+++ freepbx-2.4.0~dfsg/amp_conf/bin/retrieve_conf	2008-10-24 14:41:50.000000000 +0100
-@@ -318,9 +318,6 @@
+--- freepbx-2.5.1~dfsg.orig/amp_conf/bin/retrieve_conf	2008-09-28 05:47:03.000000000 +0100
++++ freepbx-2.5.1~dfsg/amp_conf/bin/retrieve_conf	2008-10-28 11:42:45.000000000 +0000
+@@ -332,15 +332,6 @@
+ 				include_once($amp_conf['AMPWEBROOT']."/admin/modules/{$key}/functions.inc.php");
  				freepbx_log('retrieve_conf', 'devel-debug', $amp_conf['AMPWEBROOT']."/admin/modules/{$key}/functions.inc.php processed OK");
  			}
- 
+-
 -			// create symlinks for files in appropriate sub directories
--			symlink_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
--			cp_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
+-			// don't symlink framework files, it is a special case module that happens to have
+-			// some conflicting names
+-			//
+-			if ($key != 'framework') {
+-				symlink_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
+-				cp_subdirs( $amp_conf['AMPWEBROOT'].'/admin/modules/'.$key );
+-			}
  		}
  	}
  }

Modified: freepbx/trunk/debian/patches/noisy_fail_mod_msg
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/noisy_fail_mod_msg?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/noisy_fail_mod_msg (original)
+++ freepbx/trunk/debian/patches/noisy_fail_mod_msg Wed Oct 29 13:41:56 2008
@@ -2,9 +2,11 @@
 but include the name of the module in it. This gives nicer error
 messages.
 
---- freepbx-2.3.1~dfsg.orig/amp_conf/bin/module_admin
-+++ freepbx-2.3.1~dfsg/amp_conf/bin/module_admin
-@@ -278,51 +278,51 @@ function doReload() {
+Index: freepbx-2.5.1~dfsg/amp_conf/bin/module_admin
+===================================================================
+--- freepbx-2.5.1~dfsg.orig/amp_conf/bin/module_admin	2008-09-01 01:16:27.000000000 +0100
++++ freepbx-2.5.1~dfsg/amp_conf/bin/module_admin	2008-10-28 12:05:25.000000000 +0000
+@@ -278,51 +278,51 @@
  
  function doDisable($modulename, $force) {
  	if (is_array($errors = module_disable($modulename, $force))) {
@@ -66,7 +68,7 @@
  	}
  }
  
-@@ -332,11 +332,11 @@ function doDownload($modulename, $force)
+@@ -332,11 +332,11 @@
  	global $modulerepository_path;
  
  	if (is_array($errors = module_download($modulename, $force, 'download_progress', $modulerepository_path, $modulexml_path))) {

Modified: freepbx/trunk/debian/patches/path-to-fop
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/path-to-fop?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/path-to-fop (original)
+++ freepbx/trunk/debian/patches/path-to-fop Wed Oct 29 13:41:56 2008
@@ -2,11 +2,11 @@
 ##
 ## Use Debian's packaged FOP (op-panel).
 
-Index: freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/views/panel.php
+Index: freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/views/panel.php
 ===================================================================
---- freepbx-2.4.0~dfsg.orig/amp_conf/htdocs/admin/views/panel.php	2008-10-24 14:39:26.000000000 +0100
-+++ freepbx-2.4.0~dfsg/amp_conf/htdocs/admin/views/panel.php	2008-10-24 14:43:01.000000000 +0100
-@@ -3,7 +3,7 @@
+--- freepbx-2.5.1~dfsg.orig/amp_conf/htdocs/admin/views/panel.php	2008-09-26 21:15:51.000000000 +0100
++++ freepbx-2.5.1~dfsg/amp_conf/htdocs/admin/views/panel.php	2008-10-28 12:04:20.000000000 +0000
+@@ -4,7 +4,7 @@
  $template['title'] = $title;
  $template['content'] = 
  	'<div id="panelframe">'.

Modified: freepbx/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/series?rev=6347&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/series (original)
+++ freepbx/trunk/debian/patches/series Wed Oct 29 13:41:56 2008
@@ -1,7 +1,6 @@
 # debian/xorcom enhancements
 #ast-config-dirs		<- moved to freepbx-module-core
 no_cp_symlink_subdirs
-resolve_conf-report_errors-db
 disable-online-updates
 clean-install-amp
 fix-ari-link

More information about the Pkg-voip-commits mailing list