[Pkg-voip-commits] r6530 - in /freepbx-core/trunk: ./ debian/control debian/links debian/patches/ debian/patches/fix-phpsysinfo-imports debian/patches/series debian/rules

Wed Dec 3 11:22:18 UTC 2008

Author: odd_bloke-guest
Date: Wed Dec  3 11:22:18 2008
New Revision: 6530

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6530
Log:
Added patch system and fixed includes of phpsysinfo.

Added:
    freepbx-core/trunk/debian/patches/
    freepbx-core/trunk/debian/patches/fix-phpsysinfo-imports
    freepbx-core/trunk/debian/patches/series
Modified:
    freepbx-core/trunk/   (props changed)
    freepbx-core/trunk/debian/control
    freepbx-core/trunk/debian/links
    freepbx-core/trunk/debian/rules

Propchange: freepbx-core/trunk/
------------------------------------------------------------------------------

--- bzr:file-ids (original)
+++ bzr:file-ids Wed Dec  3 11:22:18 2008
@@ -1,1 +1,6 @@
+debian/control	control-20081112151350-1t84hh985odirwzy-1
 debian/links	links-20081112162025-71ij5edla3x6dfy3-1
+debian/patches	patches-20081113163104-1twmcez2l8pjl8gi-1
+debian/patches/fix-phpsysinfo-imports	fixphpsysinfoimports-20081113163104-1twmcez2l8pjl8gi-2
+debian/patches/series	series-20081113163104-1twmcez2l8pjl8gi-3
+debian/rules	rules-20081112122444-139r8yb4axmbuquu-1

Propchange: freepbx-core/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk1 (original)
+++ bzr:revision-id:v3-trunk1 Wed Dec  3 11:22:18 2008
@@ -12,3 +12,4 @@
 13 daniel at daniel-watkins.co.uk-20081113153406-j0ycfywrhanbncns
 14 daniel at daniel-watkins.co.uk-20081113153506-teza8hm45acqax3j
 15 daniel at daniel-watkins.co.uk-20081113162559-rf89kdwzpyormrx8
+16 daniel at daniel-watkins.co.uk-20081113171517-1h3b2eo0btw1muc9

Propchange: freepbx-core/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Dec  3 11:22:18 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-11-13 16:25:59.338000059 +0000
+timestamp: 2008-11-13 17:15:17.609999895 +0000
 committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
 properties: 
 	branch-nick: freepbx-core

Modified: freepbx-core/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-core/trunk/debian/control?rev=6530&op=diff
==============================================================================
--- freepbx-core/trunk/debian/control (original)
+++ freepbx-core/trunk/debian/control Wed Dec  3 11:22:18 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Diego Iastrubni <diego.iastrubni at xorcom.com>, Chris Halls <halls at debian.org>, Daniel Watkins <daniel at daniel-watkins.co.uk>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), quilt
 Standards-Version: 3.8.0
 Homepage: http://www.freepbx.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/freepbx-core/trunk/

Modified: freepbx-core/trunk/debian/links
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-core/trunk/debian/links?rev=6530&op=diff
==============================================================================
--- freepbx-core/trunk/debian/links (original)
+++ freepbx-core/trunk/debian/links Wed Dec  3 11:22:18 2008
@@ -1,1 +1,1 @@
-/usr/share/phpsysinfo/includes  /usr/share/freepbx/modules/dashboard/phpsysinfo
+/usr/share/phpsysinfo  /usr/share/freepbx/modules/dashboard/phpsysinfo

Added: freepbx-core/trunk/debian/patches/fix-phpsysinfo-imports
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-core/trunk/debian/patches/fix-phpsysinfo-imports?rev=6530&op=file
==============================================================================
--- freepbx-core/trunk/debian/patches/fix-phpsysinfo-imports (added)
+++ freepbx-core/trunk/debian/patches/fix-phpsysinfo-imports Wed Dec  3 11:22:18 2008
@@ -1,0 +1,24 @@
+Index: freepbx-core-2.5.1+20081112/dashboard/page.index.php
+===================================================================
+--- freepbx-core-2.5.1+20081112.orig/dashboard/page.index.php	2008-10-18 20:20:47.000000000 +0100
++++ freepbx-core-2.5.1+20081112/dashboard/page.index.php	2008-11-13 17:11:15.000000000 +0000
+@@ -479,15 +479,15 @@
+ 
+ define("IN_PHPSYSINFO", "1");
+ define("APP_ROOT", dirname(__FILE__).'/phpsysinfo');
+-include APP_ROOT."/common_functions.php";
+-include APP_ROOT."/class.".PHP_OS.".inc.php";
++include APP_ROOT."/includes/common_functions.php";
++include APP_ROOT."/includes/os/class.".PHP_OS.".inc.php";
++include APP_ROOT."/includes/class.Error.inc.php";
+ include_once "common/json.inc.php";
+ include dirname(__FILE__)."/class.astinfo.php";
+ include dirname(__FILE__)."/class.average_rate_calculator.php";
+ include dirname(__FILE__)."/class.procinfo.php";
+-include dirname(__FILE__)."/class.error.inc.php";
+ 
+-$error = new Error;
++$error = Error::singleton();
+ 
+ 
+ $sysinfo = new sysinfo;

Added: freepbx-core/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-core/trunk/debian/patches/series?rev=6530&op=file
==============================================================================
--- freepbx-core/trunk/debian/patches/series (added)
+++ freepbx-core/trunk/debian/patches/series Wed Dec  3 11:22:18 2008
@@ -1,0 +1,1 @@
+fix-phpsysinfo-imports

Modified: freepbx-core/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-core/trunk/debian/rules?rev=6530&op=diff
==============================================================================
--- freepbx-core/trunk/debian/rules (original)
+++ freepbx-core/trunk/debian/rules Wed Dec  3 11:22:18 2008
@@ -12,10 +12,12 @@
 UPSTREAM_DIR=freepbx-core-$(UPSTREAM_VERSION)
 ORIG_TARBALL=freepbx-core_$(UPSTREAM_VERSION)+$(shell date +%Y%m%d).orig.tar.gz
 
-clean:
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
 	dh $@
 
-build:
+build: patch
 	dh $@
 
 install: build


