[Pkg-voip-commits] r5633 - in /freepbx-modules/trunk/debian: TODO.Debian changelog control patches/series patches/sqlite_autoincrement patches/system_phpsysinfo rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Apr 28 19:25:08 2008
New Revision: 5633

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5633
Log:
Patch system_phpsysinfo: use the system copy of phpsysinfo in the
dashboard.

Added:
    freepbx-modules/trunk/debian/patches/system_phpsysinfo
Modified:
    freepbx-modules/trunk/debian/TODO.Debian
    freepbx-modules/trunk/debian/changelog
    freepbx-modules/trunk/debian/control
    freepbx-modules/trunk/debian/patches/series
    freepbx-modules/trunk/debian/patches/sqlite_autoincrement
    freepbx-modules/trunk/debian/rules

Modified: freepbx-modules/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/TODO.Debian?rev=5633&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/TODO.Debian (original)
+++ freepbx-modules/trunk/debian/TODO.Debian Mon Apr 28 19:25:08 2008
@@ -7,7 +7,6 @@
   - The install part is partially done.
 * ARI runs in a separate window and is not functional.
 * Does FreePBX come with a newer ARI?
-* A copy of phpsysinfo under modules/dashboard/
 * Web server shows as "Timeout" in the dashboard.
 * Why doesn't debconf-updatepo like our templates file?
 * The prerm module will disable all modules, even those not installed

Modified: freepbx-modules/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/changelog?rev=5633&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/changelog (original)
+++ freepbx-modules/trunk/debian/changelog Mon Apr 28 19:25:08 2008
@@ -17,5 +17,7 @@
   * Dump config files from the core modules to /etc/asterisk/ .
   * Patch logfile_messages: show /var/log/messages .
   * Patch fix_dashboard_warning: fix an annoying typo(?) in the dashboard.
+  * Patch system_phpsysinfo: use the system copy of phpsysinfo in the
+    dashboard.
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 09 Apr 2008 12:57:32 +0300

Modified: freepbx-modules/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/control?rev=5633&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/control (original)
+++ freepbx-modules/trunk/debian/control Mon Apr 28 19:25:08 2008
@@ -12,7 +12,7 @@
 
 Package: freepbx-modules
 Architecture: all
-Depends: freepbx-common, php5-cli | php4-cli, debconf
+Depends: freepbx-common, php5-cli | php4-cli, debconf, phpsysinfo
 Description: modules for FreePBX - a web-based GUI for Asterisk
  FreePBX (formally AMP) is a web-based GUI for the Asterisk PBX. 
  It provides the ability to:

Modified: freepbx-modules/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/series?rev=5633&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/patches/series (original)
+++ freepbx-modules/trunk/debian/patches/series Mon Apr 28 19:25:08 2008
@@ -1,3 +1,4 @@
+system_phpsysinfo
 sqlite_trunk_query
 checkperms_indications
 logfile_messages

Modified: freepbx-modules/trunk/debian/patches/sqlite_autoincrement
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/sqlite_autoincrement?rev=5633&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/patches/sqlite_autoincrement (original)
+++ freepbx-modules/trunk/debian/patches/sqlite_autoincrement Mon Apr 28 19:25:08 2008
@@ -208,7 +208,7 @@
 +	`cepstral_voice` VARCHAR( 50 ),
 +	`setuid` $bool,
 +	`basedir` VARCHAR( 255 )
-+) $type_str;
++) $type_str;";
 +
 +$check = $db->query($sql);
 +if(DB::IsError($check)) {

Added: freepbx-modules/trunk/debian/patches/system_phpsysinfo
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/system_phpsysinfo?rev=5633&op=file
==============================================================================
--- freepbx-modules/trunk/debian/patches/system_phpsysinfo (added)
+++ freepbx-modules/trunk/debian/patches/system_phpsysinfo Mon Apr 28 19:25:08 2008
@@ -1,0 +1,16 @@
+Use the system copy of phpsysinfo. The file layout has changed slightly.
+
+--- trunk.orig/modules/dashboard/page.index.php
++++ trunk/modules/dashboard/page.index.php
+@@ -468,9 +468,9 @@ function do_syslog_delete() {	
+ 
+ 
+ define("IN_PHPSYSINFO", "1");
+-define("APP_ROOT", dirname(__FILE__).'/phpsysinfo');
++define("APP_ROOT", '/usr/share/phpsysinfo/includes');
+ include APP_ROOT."/common_functions.php";
+-include APP_ROOT."/class.".PHP_OS.".inc.php";
++include APP_ROOT."/os/class.".PHP_OS.".inc.php";
+ include_once "common/json.inc.php";
+ include dirname(__FILE__)."/class.astinfo.php";
+ include dirname(__FILE__)."/class.average_rate_calculator.php";

Modified: freepbx-modules/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/rules?rev=5633&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/rules (original)
+++ freepbx-modules/trunk/debian/rules Mon Apr 28 19:25:08 2008
@@ -35,6 +35,7 @@
 		| xargs chmod a-x
 	chmod a+x $(CURDIR)/debian/freepbx-modules/usr/share/freepbx/modules/backup/bin/*.php
 	chmod a+x $(CURDIR)/debian/freepbx-modules/usr/share/freepbx/modules/core/agi-bin/list-item-remove.php
+	rm -rf $(CURDIR)/debian/freepbx-modules/usr/share/freepbx/modules/dashboard/phpsysinfo
 
 binary-arch: build install