[Pkg-voip-commits] r4771 - in /freepbx/trunk/debian: ./ apache/ contrib/ contrib/template/debian/ patches/

elcuco-guest at alioth.debian.org elcuco-guest at alioth.debian.org
Sun Oct 21 14:57:07 UTC 2007 

Author: elcuco-guest
Date: Sun Oct 21 14:57:06 2007
New Revision: 4771

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4771
Log:
Fist commit for the 2.3 branch. 
 
 * This new version is built without any modules - all modules are external. 
 * apache1 is deprecated (sorry, move on). 
 * freepbx-agi is deprecated, and is built into freepbx-common
 * asterisk-config-freepbx is brokwn until you install freepbx-common (used to depend on freepbx-agi, but freepbx-agi depended on asterisk which 
 * removed obsolete patches, and fixed the others
 * updated the support script for generating the freepbx modules (to be obsoleted soon anyway)
 
created a circular dependency, the situation now is broken but acceptable)
 

Added:
    freepbx/trunk/debian/freepbx-common.lintian
Removed:
    freepbx/trunk/debian/apache/
    freepbx/trunk/debian/freepbx-agi.dirs
    freepbx/trunk/debian/freepbx-agi.install
    freepbx/trunk/debian/lintian
    freepbx/trunk/debian/patches/_add-sqlite3-support.dpatch
    freepbx/trunk/debian/patches/_fix-module_admin.dpatch
    freepbx/trunk/debian/patches/_fix-open-or-die.dpatch
    freepbx/trunk/debian/patches/_quiet-retrieve.dpatch
Modified:
    freepbx/trunk/debian/changelog
    freepbx/trunk/debian/contrib/fpx-modules
    freepbx/trunk/debian/contrib/template/debian/changelog
    freepbx/trunk/debian/contrib/template/debian/control
    freepbx/trunk/debian/contrib/template/debian/install
    freepbx/trunk/debian/control
    freepbx/trunk/debian/freepbx-common.dirs
    freepbx/trunk/debian/freepbx-common.install
    freepbx/trunk/debian/freepbx-common.postinst
    freepbx/trunk/debian/freepbx-panel.dirs
    freepbx/trunk/debian/freepbx-panel.install
    freepbx/trunk/debian/freepbx-sounds-extra.dirs
    freepbx/trunk/debian/patches/00list
    freepbx/trunk/debian/patches/clean-install-amp.dpatch
    freepbx/trunk/debian/patches/fix-ari-link.dpatch
    freepbx/trunk/debian/patches/fix-fop-config.dpatch
    freepbx/trunk/debian/patches/path-to-fop.dpatch
    freepbx/trunk/debian/rules

Modified: freepbx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/changelog?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/changelog (original)
+++ freepbx/trunk/debian/changelog Sun Oct 21 14:57:06 2007
@@ -1,9 +1,13 @@
-freepbx (2.2.3~dfsg-1) UNRELEASED; urgency=low
+freepbx (2.3.0~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release
   * freepbx-panel: fix configuration patch
-
- -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Sun,  9 Sep 2007 15:15:38 +0300
+  * The core module is packaged separately
+  * Most of AMP's packages are obsolted (no replace, no conflicts)
+  * Package freepbx-agi is deprecated, and integrated into freepbx-common (to 
+    get ARI integration just install ARI)
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Wed, 8 Aug 2007 14:25:11 +0300
 
 freepbx (2.2.2~dfsg-1) UNRELEASED; urgency=low
   

Modified: freepbx/trunk/debian/contrib/fpx-modules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/contrib/fpx-modules?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/contrib/fpx-modules (original)
+++ freepbx/trunk/debian/contrib/fpx-modules Sun Oct 21 14:57:06 2007
@@ -48,7 +48,7 @@
 
 # if this script it working inside an svn repository, set it to "true"
 # if not, set it to "false"
-$working_in_svn = 1;
+$working_in_svn = 0;
 
 
 #######################################################################################
@@ -60,8 +60,16 @@
 define("MONITOR_DIR", "/var/spool/asterisk/monitor");
 define("MYDIR", dirname(__FILE__));
 
+$freepbx_version_target = "2.3";
+$module_name_template = "freepbx-module-$freepbx_version_target-";
+$module_name_template = "freepbx-module-";
+
 $xml_server	= "http://mirror.freepbx.org/";
 $modules_server	= "http://mirror.freepbx.org/modules/";
+
+$xml_server    = "http://turing/~diegolocal/freepbx-updates/";
+$modules_server        = "http://turing/~diegolocal/freepbx-updates/";
+
 
 $dryrun  = false;
 $debug   = false;
@@ -118,7 +126,8 @@
 
 function getversion()
 {
-	return "2.2";
+	global $freepbx_version_target;
+	return $freepbx_version_target;
 }
 
 // borrowed from freepbx
@@ -290,6 +299,7 @@
 {
 	global $xml_server;
 	global $modules_server;
+	global $module_name_template;
 
 	foreach( $online_modules as $on_module )
 	{
@@ -331,46 +341,41 @@
 		$filedata = file_get_contents($url);
 		fwrite($fp,$filedata);
 		fclose($fp);
-
-		
-		if (!is_dir("modules"))	{
-			mkdir("modules");
-		}
 		
 		// unpack it, and generate the template for the debian package
 		// in rare cases, you should also modify the initial debian layout a little bit
 		// in about 95% it works out of the box
-		exec_cmd("tar zxf {$filename} --directory=modules");
-
-		// module directories MUST be freepbx-module-$rawname
+		exec_cmd("tar zxf {$filename}");
+
+		// module directories MUST be $module_name_template$rawname
 		// otherwise lintian shouts
-		exec_cmd( "mkdir -p modules/freepbx-module-$rawname/" );
-		exec_cmd( "cp -a modules/$rawname/* modules/freepbx-module-$rawname/" );
-		exec_cmd( "rm -fr modules/$rawname/" );
+		exec_cmd( "mkdir -p $module_name_template$rawname/" );
+		exec_cmd( "cp -a $rawname/* $module_name_template$rawname/" );
+		exec_cmd( "rm -fr $rawname/" );
 
 		if (!$l_module)	{
 			outn("Installing new module, and using sane defaults");
 			
 			if ($working_in_svn)
-				exec_cmd("svn export template/ modules/freepbx-module-$rawname/ --force --quiet");
+				exec_cmd("svn export template/ $module_name_template$rawname/ --force --quiet");
 			else {
-	 			exec_cmd("cp -a "  . MYDIR . "/template/ modules/freepbx-module-$rawname");
- 				exec_cmd("mv modules/freepbx-module-$rawname/template/* modules/freepbx-module-$rawname");
- 				exec_cmd("rm -fr modules/freepbx-module-$rawname/template/");
+	 			exec_cmd("cp -a "  . MYDIR . "/template/ $module_name_template$rawname");
+ 				exec_cmd("mv $module_name_template$rawname/template/* $module_name_template$rawname");
+ 				exec_cmd("rm -fr $module_name_template$rawname/template/");
 			}
 		}
 		else {
 // 			putenv("DEBEMAIL=$debian_maintainer");
 // 			putenv("DEBFULLNAME=$debian_maintainer");
-			outn( "cd modules/freepbx-module-$rawname/; dch -v \"2.2-$version-1\" \"New upstream release\"" );
-			exec_cmd( "cd modules/freepbx-module-$rawname/; dch -v \"2.2-$version-1\" \"New upstream release\"" );
+			exec_cmd( "cd $module_name_template$rawname/; dch -v \"-$version-1\" \"New upstream release\"" );
 			outn("Please update the changelog as needed, new entry created.");
 		}
-		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's/@@RAWNAME@@/$rawname/g' " );
-		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's/@@VERSION@@/$version/g' " );
-		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's/@@NAME@@/$name/g' " );
-		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's|@@DATE@@|$date|g' " );
-		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's|@@INFO@@|$date|g' " );
+		exec_cmd( "find $module_name_template$rawname/debian/* -type f | xargs sed -r -i 's/@@RAWNAME@@/$rawname/g' " );
+		exec_cmd( "find $module_name_template$rawname/debian/* -type f | xargs sed -r -i 's/@@MODULENAME@@/$module_name_template/g' " );
+		exec_cmd( "find $module_name_template$rawname/debian/* -type f | xargs sed -r -i 's/@@VERSION@@/$version/g' " );
+		exec_cmd( "find $module_name_template$rawname/debian/* -type f | xargs sed -r -i 's/@@NAME@@/$name/g' " );
+		exec_cmd( "find $module_name_template$rawname/debian/* -type f | xargs sed -r -i 's|@@DATE@@|$date|g' " );
+		exec_cmd( "find $module_name_template$rawname/debian/* -type f | xargs sed -r -i 's|@@INFO@@|$date|g' " );
 	}
 	
 	// now we have the most updated modules, download the module list as well
@@ -388,11 +393,12 @@
 function build_modules( $local_modules )
 {
 	global $verbose, $debug;
+	global $module_name_template;
 	
 	foreach( $local_modules as $module )
 	{	
 		
-		$new_dir = "modules/freepbx-module-" . $module["rawname"];
+		$new_dir = "$module_name_template" . $module["rawname"];
 		debug( "cd $new_dir" );
 		if ( file_exists($new_dir) && chdir($new_dir) )
 		{		
@@ -401,7 +407,7 @@
 				print("\n");
 			}
 
-			if ($working_in_svn)
+			if (!$working_in_svn)
 				$build_command = "debuild -uc -us -rfakeroot";
 			else
 				$build_command = "svn-buildpackage -rfakeroot -us -uc --svn-ignore-new";
@@ -413,8 +419,8 @@
 				print( "., ERROR, see the build log at the module directory.\n" );
 			}
 		
-			debug( "cd ../../" );
-			chdir( "../../" );
+			debug( "cd ../" );
+			chdir( "../" );
 		}
 		else {
 			print( "Ignoring non existing module - " . $module["displayName"] . "\n" );
@@ -422,7 +428,7 @@
 	}
 	
 	if ($verbose)
-		system( "ls modules/*.deb");
+		system( "ls *.deb");
 }
 
 #######################################################################################

Modified: freepbx/trunk/debian/contrib/template/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/contrib/template/debian/changelog?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/contrib/template/debian/changelog (original)
+++ freepbx/trunk/debian/contrib/template/debian/changelog Sun Oct 21 14:57:06 2007
@@ -1,5 +1,5 @@
-freepbx-module-@@RAWNAME@@ (2.2-@@VERSION@@-1) unstable; urgency=low
+@@MODULENAME@@@@RAWNAME@@ (1:@@VERSION@@-1) unstable; urgency=low
 
-  * First release.
+  * First release for the 2.3 branch.
   
  -- Diego Iastrubni <diego.iastrubni at xorcom.com>  @@DATE@@

Modified: freepbx/trunk/debian/contrib/template/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/contrib/template/debian/control?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/contrib/template/debian/control (original)
+++ freepbx/trunk/debian/contrib/template/debian/control Sun Oct 21 14:57:06 2007
@@ -1,4 +1,4 @@
-Source: freepbx-module-@@RAWNAME@@
+Source: @@MODULENAME@@@@RAWNAME@@
 Section: comm
 Priority: optional
 Maintainer: Diego Iastrubni <diego.iastrubni at xorcom.com>
@@ -6,9 +6,9 @@
 Build-Depends: debhelper (>= 4.0.0), dpatch
 Standards-Version: 3.7.2
 
-Package: freepbx-module-@@RAWNAME@@
+Package: @@MODULENAME@@@@RAWNAME@@
 Architecture: all
-Depends:  freepbx-common
+Depends:  freepbx-common (>= 2.3), freepbx-module-core
 Description: FreePBX module: @@NAME@@
- This is a freepbx-module, see information on 
- @@INFO@@
+ This is a freepbx-module (for version 2.3 and above), for more information 
+ about this module see @@INFO@@

Modified: freepbx/trunk/debian/contrib/template/debian/install
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/contrib/template/debian/install?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/contrib/template/debian/install (original)
+++ freepbx/trunk/debian/contrib/template/debian/install Sun Oct 21 14:57:06 2007
@@ -1,5 +1,14 @@
+etc/*		etc/asterisk/
+bin/*		usr/share/asterisk/bin/
+agi-bin/*	usr/share/asterisk/agi-bin/
+sounds/*	usr/share/asterisk/sounds/
+htdocs/*	usr/share/freepbx/
+images/*        usr/share/freepbx/images/
+
 *.php           usr/share/freepbx/modules/@@RAWNAME@@/
 *.sql           usr/share/freepbx/modules/@@RAWNAME@@/
 *.sqlite        usr/share/freepbx/modules/@@RAWNAME@@/
 *.html          usr/share/freepbx/modules/@@RAWNAME@@/
 *.xml           usr/share/freepbx/modules/@@RAWNAME@@/
+*.css           usr/share/freepbx/modules/@@RAWNAME@@/
+*.jar           usr/share/freepbx/modules/@@RAWNAME@@/

Modified: freepbx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/control?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/control (original)
+++ freepbx/trunk/debian/control Sun Oct 21 14:57:06 2007
@@ -12,8 +12,8 @@
 
 Package: freepbx
 Architecture: all
-Depends: freepbx-common, freepbx-agi, freepbx-panel, asterisk-sounds-moh-freepbx
-Suggests: ari
+Depends: freepbx-common, asterisk-sounds-moh-freepbx, freepbx-module-core, freepbx-module-dashboard, freepbx-module-featurecodeadmin, freepbx-module-infoservices, freepbx-module-recordings, freepbx-module-voicemail
+Recommends: ari, freepbx-panel
 Description: web-based management interface for the Asterisk PBX
  FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX. 
  It provides the ability to:
@@ -24,14 +24,13 @@
   * upload custom MOH
   * change company directory behavior
   * set directions for detected incoming faxes
-  * view call detail reporting with asterisk-stat (www.areski.net)
   * view extension and trunk status with Flash Operator Panel (www.asternic.org)
   * read voicemail via the browser with ARI
- This is a virtual package which will install all the freepbx parts
+ This is a virtual package which will install all the FreePBX parts
 
 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
+Depends: asterisk-sounds-main, asterisk-sounds-extra, freepbx-sounds-extra
 Recommends: sox
 Provides: asterisk-config-custom
 Replaces: asterisk-config, asterisk-config-amportal
@@ -62,18 +61,9 @@
 Description: extra sounds for FreePBX
  These are some sound files needed for the directory and application AGIs.
 
-Package: freepbx-agi
-Architecture: all
-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.
-
 Package: freepbx-modules
 Architecture: all
-Depends: freepbx-common, freepbx-module-announcement, freepbx-module-asterisk-cli, freepbx-module-blacklist, freepbx-module-callback, freepbx-module-callforward, freepbx-module-callwaiting, freepbx-module-cidlookup, freepbx-module-conferences, freepbx-module-customerdb, freepbx-module-dictate, freepbx-module-disa, freepbx-module-donotdisturb, freepbx-module-featurecodeadmin, freepbx-module-findmefollow, freepbx-module-gabcast, freepbx-module-infoservices, freepbx-module-inventorydb, freepbx-module-ivr, freepbx-module-logfiles, freepbx-module-manager, freepbx-module-miscapps, freepbx-module-miscdests, freepbx-module-paging, freepbx-module-parking, freepbx-module-pbdirectory, freepbx-module-phonebook, freepbx-module-phpagiconf, freepbx-module-phpinfo, freepbx-module-pinsets, freepbx-module-printextensions, freepbx-module-queues, freepbx-module-recordings, freepbx-module-ringgroups, freepbx-module-speeddial, freepbx-module-timeconditions, freepbx-module-voicemail
+Depends: freepbx-common, freepbx-module-announcement, freepbx-module-asterisk-cli, freepbx-module-blacklist, freepbx-module-callback, freepbx-module-callforward, freepbx-module-callwaiting, freepbx-module-cidlookup, freepbx-module-conferences, freepbx-module-customerdb, freepbx-module-dictate, freepbx-module-disa, freepbx-module-donotdisturb, freepbx-module-findmefollow, freepbx-module-inventorydb, freepbx-module-ivr, freepbx-module-logfiles, freepbx-module-manager, freepbx-module-miscapps, freepbx-module-miscdests, freepbx-module-paging, freepbx-module-parking, freepbx-module-pbdirectory, freepbx-module-phonebook, freepbx-module-phpagiconf, freepbx-module-phpinfo, freepbx-module-pinsets, freepbx-module-printextensions, freepbx-module-queues, freepbx-module-ringgroups, freepbx-module-speeddial, freepbx-module-timeconditions, freepbx-module-asteriskinfo, freepbx-module-daynight
 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
@@ -82,25 +72,26 @@
  Note that freepbx-module-backup is not part of this package, as it's currently 
  broken. If you want, you can still install it manually. Same goes for 
  freepbx-module-music which needs RW permissions to some directories it 
- currently has not.
- .
- 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.
-
+ currently has not. freepbx-module-framework is not tested at all. 
+ 
 Package: freepbx-modules-nonfree
 Architecture: all
-Depends: freepbx-module-irc, freepbx-module-javassh, freepbx-module-zoip
+Depends: freepbx-module-irc, freepbx-module-gabcast, freepbx-module-javassh, freepbx-module-zoip
 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.
+ a bunch of modules which cannot be re-built.
+ .
+ The packages javassh, gabcast and irc contain flash (or java) images
+ which cannot re-built. They are all safe for re-distribution (hopefully...)
+ .
+ The package freepbx-module-zoip is not tested yet.
 
 Package: freepbx-common
 Architecture: all
 Replaces: amportal-common, freepbx-module-core
-Conflicts: amportal-common
-Depends: adduser, asterisk-config-freepbx, freepbx-database|freepbx-mysql, asterisk(>= 1.2), apache2|apache|httpd-cgi, libapache2-mod-php5|libapache2-mod-php4|libapache-mod-php4|php5-cgi|php4-cgi, php-db|php4-pear(<< 4:4.4.0-0), php5-cli|php4-cli, php5-pear|php-pear|php4-pear, php-curl|php5-curl|php4-curl, libdbi-perl
+Conflicts: amportal-common, freepbx-agi
+Depends: adduser, asterisk-config-freepbx, freepbx-database|freepbx-mysql, asterisk(>= 1.2) | asterisk1.2, httpd-cgi, libapache2-mod-php5|php5-cgi|php4-cgi, php-db|php4-pear(<< 4:4.4.0-0), php5-cli|php4-cli, php5-pear|php-pear|php4-pear, php-curl|php5-curl|php4-curl, 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 the
@@ -120,7 +111,7 @@
 
 Package: freepbx-sqlite3
 Architecture: all
-Depends: sqlite3, libapache2-mod-php5|php5-cgi | libapache2-mod-php4|php4-cgi | php-cgi, php5-sqlite3|php4-sqlite3|php-sqlite3, libdbd-sqlite3-perl
+Depends: sqlite3, libapache2-mod-php5|php5-cgi | php4-cgi | php-cgi, php5-sqlite3|php4-sqlite3|php-sqlite3, libdbd-sqlite3-perl
 Conflicts: freepbx-mysql
 Replaces: freepbx-mysql
 Provides: freepbx-database

Modified: freepbx/trunk/debian/freepbx-common.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-common.dirs?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/freepbx-common.dirs (original)
+++ freepbx/trunk/debian/freepbx-common.dirs Sun Oct 21 14:57:06 2007
@@ -1,20 +1,22 @@
 etc/asterisk/manager.d/
-etc/apache/conf.d/
 etc/apache2/conf.d/
 usr/sbin/
 usr/share/asterisk/bin/
 usr/share/freepbx/
+usr/share/freepbx/views/
+usr/share/freepbx/common/
+usr/share/freepbx/modules/
+usr/share/freepbx/modules/_cache/
 usr/share/freepbx-common/
 usr/share/freepbx-common/sql/
 usr/share/freepbx-common/upgrades/
 usr/share/freepbx-common/upgrades/1.10.010/
-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/
+usr/share/asterisk/agi-bin/
 var/spool/asterisk/
 var/spool/asterisk/fax/
 var/spool/asterisk/monitor/
+usr/share/lintian/overrides/

Modified: freepbx/trunk/debian/freepbx-common.install
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-common.install?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/freepbx-common.install (original)
+++ freepbx/trunk/debian/freepbx-common.install Sun Oct 21 14:57:06 2007
@@ -1,25 +1,29 @@
 debian/astetc/manager.d/freepbx.conf			etc/asterisk/manager.d/
 amp_conf/bin/*						usr/share/asterisk/bin/
+debian/share/freepbx-enable-all-modules			usr/share/asterisk/bin/
+amp_conf/agi-bin/*					usr/share/asterisk/agi-bin/
+
 
 amp_conf/htdocs/admin/*.php				usr/share/freepbx/
+amp_conf/htdocs/admin/*.ico				usr/share/freepbx/
 amp_conf/htdocs/admin/i18n/*				usr/share/freepbx/i18n/
+amp_conf/htdocs/admin/views/*				usr/share/freepbx/views/
 amp_conf/htdocs/admin/common/*.css			usr/share/freepbx/common/
+amp_conf/htdocs/admin/common/*.js			usr/share/freepbx/common/
 debian/share/mainstyle-alternative.css			usr/share/freepbx/common/
 amp_conf/htdocs/admin/common/*.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/share/xorcom-rapid.png				usr/share/freepbx/images/
 debian/share/xorcom.png					usr/share/freepbx/images/
 
 install_amp						usr/share/freepbx-common/
+libfreepbx.install.php					usr/share/freepbx-common/
 debian/share/freepbx-post-reload			usr/share/freepbx-common/
 debian/share/update-freepbx				usr/sbin/
-debian/share/freepbx-enable-all-modules			usr/share/freepbx-common/
 debian/share/post-reload/*				usr/share/freepbx-common/post-reload/
 
 SQL/*.sql						usr/share/freepbx-common/sql/
 upgrades/*						usr/share/freepbx-common/upgrades/
 
 debian/apache2						etc/
-debian/apache						etc/

Added: freepbx/trunk/debian/freepbx-common.lintian
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-common.lintian?rev=4771&op=file
==============================================================================
--- freepbx/trunk/debian/freepbx-common.lintian (added)
+++ freepbx/trunk/debian/freepbx-common.lintian Sun Oct 21 14:57:06 2007
@@ -1,0 +1,1 @@
+freepbx-common: symlink-is-self-recursive

Modified: freepbx/trunk/debian/freepbx-common.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-common.postinst?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/freepbx-common.postinst (original)
+++ freepbx/trunk/debian/freepbx-common.postinst Sun Oct 21 14:57:06 2007
@@ -46,7 +46,7 @@
 	sed -r -i "s|AMPWEBROOT=[a-zA-Z0-9/]*|AMPWEBROOT=/usr/share/freepbx|" /etc/amportal.conf
 	sed -r -i "s|AMPBIN=[a-zA-Z0-9/]*|AMPBIN=/usr/share/asterisk/bin|" /etc/amportal.conf
 	/usr/share/freepbx-common/install-sql
-	/usr/share/freepbx-common/install_amp
+	/usr/share/freepbx-common/install_amp --no-files
 
 	# apply new configuration
 	update-freepbx

Modified: freepbx/trunk/debian/freepbx-panel.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-panel.dirs?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/freepbx-panel.dirs (original)
+++ freepbx/trunk/debian/freepbx-panel.dirs Sun Oct 21 14:57:06 2007
@@ -1,3 +1,4 @@
 etc/op-panel/freepbx/
 usr/share/freepbx/
+usr/share/freepbx/views/
 usr/share/op-panel/flash/

Modified: freepbx/trunk/debian/freepbx-panel.install
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-panel.install?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/freepbx-panel.install (original)
+++ freepbx/trunk/debian/freepbx-panel.install Sun Oct 21 14:57:06 2007
@@ -6,3 +6,4 @@
 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/
+amp_conf/htdocs/admin/views/panel.php		usr/share/freepbx/views/

Modified: freepbx/trunk/debian/freepbx-sounds-extra.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/freepbx-sounds-extra.dirs?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/freepbx-sounds-extra.dirs (original)
+++ freepbx/trunk/debian/freepbx-sounds-extra.dirs Sun Oct 21 14:57:06 2007
@@ -1,1 +1,1 @@
-/usr/share/asterisk/sounds/
+/usr/share/aterisk/sounds/

Modified: freepbx/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/00list?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/00list (original)
+++ freepbx/trunk/debian/patches/00list Sun Oct 21 14:57:06 2007
@@ -1,18 +1,18 @@
 # fix bugs
-use-conf-defaults
-fix-mysql-real-escape-string
-fix-trunks-sqlite3
-fix-catch-all
+#use-conf-defaults		<- upstream
+#fix-mysql-real-escape-string	<- upstream
+#fix-trunks-sqlite3		<- upstream
+#fix-catch-all
 
 # debian/xorcom enhancements
-ast-config-dirs
+#ast-config-dirs		<- moved to freepbx-module-core
 disable-online-updates
 clean-install-amp
-fix-agibin-dir
+#fix-agibin-dir			<- not needed any more
 fix-ari-link
-fix-permissions
-fix-process-fax-path
-fix-recording-save
+#fix-permissions
+#fix-process-fax-path
+#fix-recording-save
 
 # integration with debian's op-panel
 fix-fop-config.dpatch

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=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/clean-install-amp.dpatch (original)
+++ freepbx/trunk/debian/patches/clean-install-amp.dpatch Sun Oct 21 14:57:06 2007
@@ -11,80 +11,39 @@
 ## DP: dpkg.
 
 @DPATCH@
-diff -urNad freepbx-2.2.1~dfsg~/install_amp freepbx-2.2.1~dfsg/install_amp
---- freepbx-2.2.1~dfsg~/install_amp	2007-02-07 02:40:46.000000000 +0200
-+++ freepbx-2.2.1~dfsg/install_amp	2007-03-08 17:05:20.000000000 +0200
-@@ -94,7 +94,7 @@
- 	out("  --debug                  Enable debug output");
- 	out("  --dry-run                Don't actually do anything");
+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 @@
+ define("AMP_CONF", "/etc/amportal.conf");
+ define("ASTERISK_CONF", "/etc/asterisk/asterisk.conf");
+ define("UPGRADE_DIR", dirname(__FILE__)."/upgrades");
+-define("MODULE_DIR", dirname(__FILE__)."/amp_conf/htdocs/admin/modules/");
++define("MODULE_DIR", "/usr/share/freepbx/modules");
+ 
+ # semi constants
+-$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";
+ $asterisk_user	= "asteriskuser";
+@@ -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.");
+ 	out("                           In a development environment you may not want the install scripts run.");
 -	out("  --no-files               Just run updates without installing files");
 +	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("  --my-svn-is-correct      Ignore Asterisk version, assume it is correct");
-@@ -242,7 +242,7 @@
- 	return ($retVal != 0);
- }
- 
--function amp_mkdir($directory, $mode = "0755", $recursive = false) {
-+function amp_mkdir($directory, $mode = "0775", $recursive = false) {
- 	debug("mkdir ".$directory.", ".$mode);
- 	$ntmp = sscanf($mode,"%o",$modenum); //assumes all inputs are octal
- 	if (version_compare(phpversion(), 5.0) < 0) {
-@@ -251,6 +251,7 @@
- 			$output = false;
- 			$return_value = false;
- 			exec("mkdir -m ".$mode." -p ".$directory,  $output, $return_value);
-+			exec("chown asterisk.asterisk ".$directory,  $output, $return_value);
- 			return ($return_value == 0);
- 		} else {
- 			return mkdir($directory, $modenum);
-@@ -312,7 +313,7 @@
- 			if (is_dir($source)) {
- 				if (!file_exists($destination)) {
- 					if ((!$dryrun) && ($destination != "")) {
--						amp_mkdir($destination, "0750", true);
-+						amp_mkdir($destination, "0775", true);
- 					}
- 				}
- 			}
-@@ -529,13 +530,13 @@
- 	else $amp_conf["AMPMGRPASS"] = $key;
- 	
- 	do {
--		out("Enter the path to use for your AMP web root:\n [/var/www/html] ");
-+		out("Enter the path to use for your AMP web root:\n [/var/www/] ");
- 		$key = trim(fgets(STDIN,1024));
--		if (preg_match('/^$/',$key)) $amp_conf["AMPWEBROOT"] = "/var/www/html";
-+		if (preg_match('/^$/',$key)) $amp_conf["AMPWEBROOT"] = "/var/www/";
- 		else $amp_conf["AMPWEBROOT"] = rtrim($key,'/');
- 		if (is_dir($amp_conf["AMPWEBROOT"])) {
- 			break;
--		} else if (amp_mkdir($amp_conf["AMPWEBROOT"],"0755",true)){
-+		} else if (amp_mkdir($amp_conf["AMPWEBROOT"],"0775",true)){
- 			out("Created ".$amp_conf["AMPWEBROOT"]);
- 			break;
- 		} else {
-@@ -562,13 +563,13 @@
- 	else $amp_conf["AMPEXTENSIONS"] = $key;
- 	
- 	do {
--		out("Enter directory in which to store AMP executable scripts:\n [/var/lib/asterisk/bin] ");
-+		out("Enter directory in which to store AMP executable scripts:\n [/usr/share/asterisk/bin] ");
- 		$key = trim(fgets(STDIN,1024));
--		if (preg_match('/^$/',$key)) $amp_conf["AMPBIN"] = "/var/lib/asterisk/bin";
-+		if (preg_match('/^$/',$key)) $amp_conf["AMPBIN"] = "/usr/share/asterisk/bin";
- 		else $amp_conf["AMPBIN"] = rtrim($key,'/');
- 		if (is_dir($amp_conf["AMPBIN"])) {
- 			break;
--		} else if (amp_mkdir($amp_conf["AMPBIN"],"0755",true)){
-+		} else if (amp_mkdir($amp_conf["AMPBIN"],"0775",true)){
- 			out("Created ".$amp_conf["AMPBIN"]);
- 			break;
- 		} else {
-@@ -583,7 +584,7 @@
- 		else $amp_conf["AMPSBIN"] = rtrim($key,'/');
+ 	//out("  --make-links-devel       Make links to files in the source directory instead of copying");
+@@ -391,7 +391,7 @@
+ 
  		if (is_dir($amp_conf["AMPSBIN"])) {
  			break;
 -		} else if (amp_mkdir($amp_conf["AMPSBIN"],"0755",true)){
@@ -92,25 +51,25 @@
  			out("Created ".$amp_conf["AMPSBIN"]);
  			break;
  		} else {
-@@ -613,7 +614,7 @@
+@@ -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 php4-pear or similar." );
++	fatal("PEAR must be installed (requires DB.php). Include path: ".ini_get("include_path") . "\nPlease install the package php-pear or similar." );
  }
  out("OK");
  
-@@ -622,7 +623,7 @@
+@@ -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 php4-pear or similar." );
++	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");
  
-@@ -639,7 +640,7 @@
+@@ -564,7 +564,7 @@
  
  $debug = false;
  $dryrun = false;
@@ -119,7 +78,7 @@
  $override_astvers = false;
  
  $install_moh = false;
-@@ -688,6 +689,10 @@
+@@ -615,6 +615,10 @@
  			$install_files = false;
  			out("Running upgrade only, without installing files.");
  		break;
@@ -130,16 +89,25 @@
  		case "--my-svn-is-correct":
  			$override_astvers = true;
  		break;
-@@ -756,7 +761,7 @@
- if (!file_exists(AMP_CONF)) {
- 	out(AMP_CONF." does not exist, copying default");
- 	copy("amportal.conf", AMP_CONF);
+@@ -690,7 +694,7 @@
+ exec("pidof asterisk", $pid_val, $ret);
+ if ($ret) {
+ 	out("FAILED");
+-	fatal($argv[0]."\n\tAsterisk must be running. If this is a first time install, you should start\n\tAsterisk by typing './start_asterisk start'\n\tFor upgrading, you should run 'amportal start'");
++	fatal($argv[0]."\n\tAsterisk must be running. If this is a first time install, you should start\n\tAsterisk by typing './start_asterisk start'\n\tFor upgrading, you should run 'invoke-rc.d asterisk start', and don't forget to enable it in /etc/default/asterisk");
+ }
+ out("running with PID: ".$pid_val[0]."..OK");
+ 
+@@ -705,7 +709,7 @@
+ 	// this addresses http://freepbx.org/trac/ticket/1878
+ 	chown(AMP_CONF, "asterisk"); 
+ 	chgrp(AMP_CONF, "asterisk"); 
 -	chmod(AMP_CONF, 0640); 
-+	chmod(AMP_CONF, 0660);
++	chmod(AMP_CONF, 0660); 
+ 
  	collect_settings(AMP_CONF, $dbhost, $new_username, $new_password, 'asterisk');
  
- 	out("Assuming new install, --install-moh added to command line");
-@@ -777,7 +782,7 @@
+@@ -727,7 +731,7 @@
  
  if (!array_key_exists("AMPWEBROOT",$amp_conf)) {
  	out("Adding AMPWEBROOT option to amportal.conf - using AMP default");
@@ -148,7 +116,7 @@
  }
  
  if (!array_key_exists("FOPWEBROOT",$amp_conf)) {
-@@ -787,7 +792,7 @@
+@@ -737,7 +741,7 @@
  
  if (!array_key_exists("AMPBIN",$amp_conf)) {
  	out("Adding AMPBIN option to amportal.conf - using AMP default");
@@ -157,7 +125,7 @@
  }
  
  if (!array_key_exists("AMPSBIN",$amp_conf)) {
-@@ -823,7 +828,7 @@
+@@ -773,7 +777,7 @@
  // write amportal.conf
  write_amportal_conf(AMP_CONF, $amp_conf);
  
@@ -166,7 +134,7 @@
  
  outn("Checking for ".ASTERISK_CONF."..");
  if (!file_exists(ASTERISK_CONF)) {
-@@ -846,7 +851,8 @@
+@@ -796,7 +800,8 @@
     
     this code will stay in 2.2, but in 2.3 it will be gone. developers - please
     update your code
@@ -176,7 +144,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']; }
-@@ -854,6 +860,7 @@
+@@ -804,6 +809,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']; }
@@ -184,7 +152,12 @@
  
  if (!isset($pbx_engine)) { $pbx_engine='asterisk'; }
  out("Using $pbx_engine as PBX Engine");
-@@ -869,13 +876,16 @@
+@@ -815,17 +821,20 @@
+ // **** Write asterisk version to ASTETCDIR/version
+ 
+ $tmpoutput = '';
+-$tmpout = exec("asterisk -V", $tmpoutput, $exitcode);
++$tmpout = exec("/usr/sbin/asterisk -V", $tmpoutput, $exitcode);
  if ($exitcode != 0) {
  	fatal("Error executing asterisk: be sure Asterisk is installed and in the path");
  }
@@ -202,22 +175,57 @@
  
  
  // normally this would be the contents of ASTETCDIR/version, but this is for simplicity, as we just read it above
-@@ -944,7 +954,7 @@
+@@ -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 php4-mysql or similar.");
++			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;
-@@ -1010,37 +1020,23 @@
- 	$md5sums = read_md5_file(UPGRADE_DIR."/".$version.".md5");
- 	recursive_copy("amp_conf", "", $md5sums);
- 	if (!is_file("/etc/asterisk/voicemail.conf")) copy("/etc/asterisk/voicemail.conf.template","/etc/asterisk/voicemail.conf");
--	if (!is_dir("/var/spool/asterisk/voicemail/device")) amp_mkdir("/var/spool/asterisk/voicemail/device", "0755", true);
-+	if (!is_dir("/var/spool/asterisk/voicemail/device")) amp_mkdir("/var/spool/asterisk/voicemail/device", "0775", true);
- 	out("OK");
+@@ -904,25 +913,7 @@
+ 		break;
+ 	
+ 	case "sqlite":
+-		if (! @ include('DB/sqlite.php'))
+-		{
+-			out("FAILED");
+-			fatal( "Your PHP installation lacks SQLite support" );
+-		}
+-	
+-		if (!isset($amp_conf["AMPDBFILE"]))
+-			die("You must setup properly AMPDBFILE in ".AMP_CONF);
+-	
+-		if (isset($amp_conf["AMPDBFILE"]) == "")
+-			die("AMPDBFILE in ".AMP_CONF." cannot be blank");
+-	
+-		$DSN = array (
+-			"database" => $amp_conf["AMPDBFILE"],
+-			"mode" => 0666
+-		);
+-	
+-		$db = new DB_sqlite();
+-		$db->connect( $DSN );
++		die_freepbx("SQLite2 support is deprecated. Please use sqlite3 only.");
+ 		break;
+ 	
+ 	case "sqlite3":
+@@ -932,6 +923,13 @@
+ 		if (isset($amp_conf["AMPDBFILE"]) == "")
+ 			die("AMPDBFILE in /etc/amportal.conf cannot be blank");
+ 
++		/* on centos this extension is not loaded by default */
++		if (! extension_loaded('sqlite3') )
++			dl('sqlite3.so');
++		
++		if (! @require_once('DB/sqlite3.php') )
++			die_freepbx("Your PHP installation has no PEAR/SQLite3 support. Please install php-sqlite3 and php-pear.");
++
+ 		require_once('DB/sqlite3.php');
+ 		$datasource = "sqlite3:///" . $amp_conf["AMPDBFILE"] . "?mode=0666";
+ 		$db = DB::connect($datasource);
+@@ -979,15 +977,15 @@
  }
  
  // **** Apply amportal.conf configuration to files
@@ -225,60 +233,68 @@
 +debug("Running /usr/sbin/update-freepbx");
  outn("Configuring install for your environment..");
  if (!$dryrun) {
--	if (file_exists($amp_conf["AMPSBIN"]."/amportal"))
--		exec("chmod u+x ".$amp_conf["AMPSBIN"]."/amportal");
+-	if (file_exists($amp_conf["AMPSBIN"]."/amportal")) {
++/*	if (file_exists($amp_conf["AMPSBIN"]."/amportal")) {
+ 		exec("chmod u+x ".$amp_conf["AMPSBIN"]."/amportal");
+ 		outn("amportal..");
+ 	} else {
+ 		outn("no amportal..");
+-	}
++	}*/
+ 	if (file_exists($amp_conf["AMPBIN"]."/freepbx_engine")) {
+ 		exec("chmod u+x ".$amp_conf["AMPBIN"]."/freepbx_engine");
+ 		outn("freepbx_engine..");
+@@ -999,7 +997,7 @@
+ 	// reload manager in asterisk if it is running:
+ 	//
+ 	outn("apply username/password changes to conf files..");
 -	exec(dirname(__FILE__)."/apply_conf.sh");
-+	exec("/usr/sbin/update-freepbx");
- }
- out("OK");
- 
- // **** Create spool directories for monitor and fax
- if (!is_dir($asterisk_conf["astspooldir"]."/monitor"))
--	amp_mkdir($asterisk_conf["astspooldir"]."/monitor","0766",true);
-+	amp_mkdir($asterisk_conf["astspooldir"]."/monitor","0775",true);
- if (!is_dir($asterisk_conf["astspooldir"]."/fax"))
--	amp_mkdir($asterisk_conf["astspooldir"]."/fax","0766",true);
++	exec( "/usr/sbin/update-freepbx");
+ 	out("done");
+ 
+ 	// reload manager in asterisk if it was running:
+@@ -1016,7 +1014,7 @@
+ 
+ 
+ // **** Set permissions all files
 -
++/*
+ if ($install_files)
+ {
+ 	outn("Setting permissions on files..");
+@@ -1024,7 +1022,7 @@
+ 		exec($amp_conf["AMPSBIN"]."/amportal chown");
+ 	}
+ 	out("OK");
+-}
++}*/
+ 
+ // Run through all the upgrade scripts starting at the specified version
+ //
+@@ -1034,7 +1032,7 @@
+ out("Generating AMP configs..");
+ generate_configs();
+ out("Generating AMP configs..OK");
 -
--// **** Set permissions all files
--
--if ($install_files)
--{
--	outn("Setting permissions on files..");
--	if (!$dryrun) {
--		exec($amp_conf["AMPSBIN"]."/amportal chown");
--	}
--	out("OK");
--}
-+	amp_mkdir($asterisk_conf["astspooldir"]."/fax","0775",true);
- 
- 
- // **** Read upgrades/ directory
-@@ -1078,19 +1074,24 @@
- out("Generating AMP configs..OK");
- 
- // **** Bounce FOP
 +/*
-+TODO still unavailable in debian
- outn("Restarting Flash Operator Panel..");
- exec('su - asterisk -c "'.$amp_conf["AMPWEBROOT"].'/admin/bounce_op.sh"');
- out("OK");
-+*/
- 
  $version = install_getversion();
-+/*
-+-- on debian we do not do this thing --
-+  see http://www.freepbx.org/trac/ticket/1679
  $filename = $amp_conf["AMPWEBROOT"]."/admin/version.txt";
  if (!$fd = fopen($filename, "w")) {
--	fatal("Could not open ".$filename." for writing");
-+       fatal("Could not open ".$filename." for writing");
- }
- fwrite($fd, $version);
- fclose($fd);
--
+@@ -1047,7 +1045,7 @@
+ outn("Restarting Flash Operator Panel..");
+ exec('su - asterisk -c "'.$amp_conf["AMPBIN"].'/bounce_op.sh"');
+ out("OK");
 -
 +*/
  
- // **** Set reload flag for AMP admin
- install_needreload();
+ // Now force an install for all modules that are packaged with the tarball
+ // directory.
+@@ -1064,7 +1062,7 @@
+ 
+ if ($amp_conf["AMPWEBADDRESS"])
+ {
+-	out("Please update your modules and reload Asterisk by visiting http://".$amp_conf["AMPWEBADDRESS"]."/admin");
++	out("Please update your modules and reload Asterisk by visiting http://".$amp_conf["AMPWEBADDRESS"]."/freepbx");
+ }
+ else
+ {

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=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-ari-link.dpatch (original)
+++ freepbx/trunk/debian/patches/fix-ari-link.dpatch Sun Oct 21 14:57:06 2007
@@ -5,15 +5,24 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad upstream~/amp_conf/htdocs/admin/header.php upstream/amp_conf/htdocs/admin/header.php
---- upstream~/amp_conf/htdocs/admin/header.php	2006-12-09 01:48:17.000000000 +0200
-+++ upstream/amp_conf/htdocs/admin/header.php	2007-03-13 15:14:36.000000000 +0200
-@@ -136,7 +136,7 @@
- 	print_sub_tool( _("Tools")     , "config.php" , $currentFile=='config.php' && isset($_REQUEST['type']) && $_REQUEST['type']=='tool' , "config.php?type=tool", false );
+diff -urNad freepbx-2.3.0~dfsg~/amp_conf/htdocs/admin/views/freepbx.php freepbx-2.3.0~dfsg/amp_conf/htdocs/admin/views/freepbx.php
+--- freepbx-2.3.0~dfsg~/amp_conf/htdocs/admin/views/freepbx.php	2007-08-24 22:34:49.000000000 +0300
++++ freepbx-2.3.0~dfsg/amp_conf/htdocs/admin/views/freepbx.php	2007-09-20 11:19:20.000000000 +0200
+@@ -29,7 +29,7 @@
+ 		if ($new_window === true) {
+ 			$html .= "target=\"_blank\" ";
+ 		} else {
+-			$html .= "target=\"$new_window\" ";
++			$html .= "target=\"$new_window\" title='Opens in new window' ";
+ 			//$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' );
--	print_sub_tool( _("Recordings"), "../recordings/index.php"  ,0, NULL, true );
-+	print_sub_tool( _("Recordings"), "../ari/index.php"  ,0, NULL, true );
+-	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" );
+ 	echo "<li class=\"last\"><a >&nbsp</a></li>";
  	echo "\t\t</ul>\n";
- 
- 	$freepbx_alt = _("freePBX");

Modified: freepbx/trunk/debian/patches/fix-fop-config.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/fix-fop-config.dpatch?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/fix-fop-config.dpatch (original)
+++ freepbx/trunk/debian/patches/fix-fop-config.dpatch Sun Oct 21 14:57:06 2007
@@ -12,9 +12,9 @@
 
 
 @DPATCH@
-diff -urNad upstream~/amp_conf/htdocs_panel/op_server.cfg upstream/amp_conf/htdocs_panel/op_server.cfg
---- upstream~/amp_conf/htdocs_panel/op_server.cfg	2006-09-16 11:19:23.000000000 +0300
-+++ upstream/amp_conf/htdocs_panel/op_server.cfg	2007-09-11 12:00:55.000000000 +0300
+diff -urNad freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_server.cfg freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_server.cfg
+--- freepbx-2.2.0~dfsg~/amp_conf/htdocs_panel/op_server.cfg	2007-02-26 10:29:49.000000000 +0000
++++ freepbx-2.2.0~dfsg/amp_conf/htdocs_panel/op_server.cfg	2007-02-26 10:31:41.000000000 +0000
 @@ -11,8 +11,8 @@
  manager_host=127.0.0.1      
  

Modified: freepbx/trunk/debian/patches/path-to-fop.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/patches/path-to-fop.dpatch?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/patches/path-to-fop.dpatch (original)
+++ freepbx/trunk/debian/patches/path-to-fop.dpatch Sun Oct 21 14:57:06 2007
@@ -5,15 +5,15 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad freepbx-2.2.0~dfsg~/amp_conf/htdocs/admin/panel.php freepbx-2.2.0~dfsg/amp_conf/htdocs/admin/panel.php
---- freepbx-2.2.0~dfsg~/amp_conf/htdocs/admin/panel.php	2006-10-29 17:50:45.000000000 +0000
-+++ freepbx-2.2.0~dfsg/amp_conf/htdocs/admin/panel.php	2007-02-23 22:57:17.000000000 +0000
-@@ -24,7 +24,7 @@
- include 'header_auth.php';
- ?>
- </div>
--<iframe width="97%" height="600" frameborder="0" align="top" src="../panel/index_amp.php?context=<?php echo $_SESSION["AMP_user"]->_deptname?>"></iframe>
-+<iframe width="97%" height="600" frameborder="0" align="top" src="../op-panel-flash/index_amp.php?context=<?php echo $_SESSION["AMP_user"]->_deptname?>"></iframe>
+diff -urNad freepbx-2.3.0~dfsg~/amp_conf/htdocs/admin/views/panel.php freepbx-2.3.0~dfsg/amp_conf/htdocs/admin/views/panel.php
+--- freepbx-2.3.0~dfsg~/amp_conf/htdocs/admin/views/panel.php	2007-07-26 08:55:59.000000000 +0300
++++ freepbx-2.3.0~dfsg/amp_conf/htdocs/admin/views/panel.php	2007-09-19 16:47:35.000000000 +0200
+@@ -3,7 +3,7 @@
+ $template['title'] = $title;
+ $template['content'] = 
+ 	'<div id="panelframe">'.
+-	'<iframe width="97%" height="600" frameborder="0" align="top" src="../../panel/index_amp.php?context='.$deptname.'"></iframe>'.
++	'<iframe width="97%" height="600" frameborder="0" align="top" src="/op-panel-flash/index_amp.php?context='.$deptname.'"></iframe>'.
+ 	'</div>';
+ showview('freepbx', $template);
  
- </body>
- </html>

Modified: freepbx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/trunk/debian/rules?rev=4771&op=diff
==============================================================================
--- freepbx/trunk/debian/rules (original)
+++ freepbx/trunk/debian/rules Sun Oct 21 14:57:06 2007
@@ -78,32 +78,35 @@
 	
 	dh_link -p freepbx-common 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-common usr/share/freepbx/		var/www/amportal
 	dh_link -p freepbx-common usr/share/freepbx/		var/www/freepbx
 
-#	may be removed in the future
-	dh_link -p freepbx-common usr/share/freepbx/		var/www/amportal
-
-	
-#	this file is only part of freepbx-admin, no need to install it on the default package
+#	this file is only part of freepbx-admin, no need to install it on the configuration package
 	rm -f debian/asterisk-config-freepbx/etc/asterisk/manager.d/freepbx.conf
 
-#	these 2 are in separate packages
+#	these 3 are in separate packages
 	rm -f debian/freepbx-common/usr/share/freepbx/reports.php
 	rm -f debian/freepbx-common/usr/share/freepbx/panel.php
+	rm -f debian/freepbx-common/usr/share/freepbx/views/panel.php
 
 #	lets clean up the updates dir... deb keeps track of those things
 	rm -f debian/freepbx-common/usr/share/freepbx/admin/i18n/*.txt
 	rm -f debian/freepbx-common/usr/share/freepbx-common/upgrades/*.md5
 	rm -f debian/freepbx-common/usr/share/freepbx-common/upgrades/md5-amp_conf.sh
-	
 
+# 	lame...
+	rm -f debian/freepbx-common/usr/share/freepbx-common/upgrades/2.3.0beta1/core_migrate.php
+	rm -f debian/freepbx-common/usr/share/freepbx-common/upgrades/2.3.0rc1/removefiles.php
+	rm -f debian/freepbx-common/usr/share/freepbx-common/upgrades/2.3.0/removefiles.php
+
+#	lintian fixes
+	chmod +x debian/freepbx-common/usr/share/asterisk/bin/freepbx-enable-all-modules
 	chmod +x debian/freepbx-common/usr/share/freepbx-common/freepbx-post-reload
-	chmod +x debian/freepbx-common/usr/share/freepbx-common/freepbx-enable-all-modules
-#	chmod +x debian/freepbx-common/usr/sbin/update-freepbx
-
+	chmod -x debian/freepbx-common/usr/share/freepbx-common/libfreepbx.install.php
+	chmod -x debian/freepbx-common/usr/share/asterisk/bin/libfreepbx.confgen.php
 	chmod +x debian/freepbx-{sqlite3,mysql}/usr/share/freepbx-common/remove-sql
 	chmod +x debian/freepbx-{sqlite3,mysql}/usr/share/freepbx-common/install-sql
+	cp debian/freepbx-common.lintian  $(CURDIR)/debian/freepbx-common/usr/share/lintian/overrides/freepbx-common
+#	chmod +x debian/freepbx-common/usr/sbin/update-freepbx
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
@@ -155,6 +158,16 @@
 # ari has it's own package
 	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/recordings
 
+# modules have their own pachage
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/modules/core/
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/modules/dashboard/
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/modules/featurecodeadmin/
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/modules/framework/
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/modules/infoservices/
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/modules/music/
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/modules/recordings/
+	rm -fr $(PACKAGE)-$(UPVERSION).tmp/amp_conf/htdocs/admin/modules/voicemail/
+
 # repackage the new source
 	cd $(PACKAGE)-$(UPVERSION).tmp ; \
 	mkdir $(PACKAGE)_$(UPVERSION).dfsg;\

More information about the Pkg-voip-commits mailing list