- use system PEAR for rest of the eventum

Changed files:
    eventum-paths.patch -> 1.8

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 00d82f4f1807910c60d48cc65495f7b50eda7422..fd212e0c50f485dc1f9a16d0b4c94dbf6944c14a 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,8 +1,11 @@
---- eventum-1.4.c/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200
-+++ eventum-1.4/setup/config.inc.php   2005-01-24 17:21:52.000000000 +0200
-@@ -56,10 +56,10 @@
+--- eventum-1.4.d/setup/config.inc.php 2005-01-05 01:05:58.000000000 +0200
++++ eventum-1.4/setup/config.inc.php   2005-01-25 17:09:33.000000000 +0200
+@@ -54,12 +54,12 @@
+ }\r
+ @define("APP_PATH", $app_path);\r
  @define("APP_INC_PATH", APP_PATH . "include/");\r
- @define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
+-@define("APP_PEAR_PATH", APP_INC_PATH . "pear/");\r
++@define("APP_PEAR_PATH", "/usr/share/pear/");\r
  @define("APP_TPL_PATH", APP_PATH . "templates/");\r
 -@define("APP_SMARTY_PATH", APP_INC_PATH . "Smarty/");\r
 +@define("APP_SMARTY_PATH", "/usr/share/pear/Smarty/");\r
@@ -14,13 +17,6 @@
  if (stristr(PHP_OS, 'darwin')) {\r
      ini_set("include_path", ".:" . APP_PEAR_PATH);\r
  } elseif (stristr(PHP_OS, 'win')) {\r
-@@ -153,4 +153,4 @@
- \r
- // set charset\r
- header("content-type: text/html;charset=" . APP_CHARSET);\r
--?>
-\ No newline at end of file
-+?>\r
 --- ./misc/cli/eventum~        2005-01-19 02:47:20.000000000 +0200
 +++ ./misc/cli/eventum 2005-01-19 03:02:40.119100405 +0200
 @@ -11,7 +11,7 @@
@@ -131,18 +127,7 @@
  \r
  $tpl->assign("phpversion", phpversion());\r
  $tpl->assign("rel_url", $relative_url);\r
---- misc/cli/eventum~  2005-01-24 17:49:25.000000000 +0200
-+++ ./misc/cli/eventum 2005-01-25 15:48:56.000000000 +0200
-@@ -13,7 +13,7 @@
- //\r
- include_once("/etc/eventum/cli.php");\r
- include_once(APP_INC_PATH . "class.command_line.php");\r
--include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
-+include_once('XML/RPC.php');
- \r
- list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();\r
- if (empty($port)) {\r
---- misc/cli/config.inc.php~   2005-01-24 17:49:25.000000000 +0200
+--- ./misc/cli/config.inc.php~ 2005-01-24 17:49:25.000000000 +0200
 +++ ./misc/cli/config.inc.php  2005-01-25 15:52:07.000000000 +0200
 @@ -47,7 +47,7 @@
  // definitions of path related variables\r
@@ -153,14 +138,51 @@
  if (stristr(PHP_OS, 'darwin')) {\r
      ini_set("include_path", ".:" . APP_PEAR_PATH);\r
  } elseif (stristr(PHP_OS, 'win')) {\r
---- misc/cli/include/class.command_line.php    2005-01-05 01:06:03.000000000 +0200
+--- ./misc/cli/eventum~        2005-01-24 17:49:25.000000000 +0200
++++ ./misc/cli/eventum 2005-01-25 15:48:56.000000000 +0200
+@@ -13,7 +13,7 @@
+ //\r
+ include_once("/etc/eventum/cli.php");\r
+ include_once(APP_INC_PATH . "class.command_line.php");\r
+-include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
++include_once(APP_PEAR_PATH . "XML/RPC.php");\r
+ \r
+ list($user_email, $user_password, $url, $port, $relative_url) = Command_Line::getEnvironmentSettings();\r
+ if (empty($port)) {\r
+--- ./misc/cli/include/class.command_line.php  2005-01-05 01:06:03.000000000 +0200
 +++ ./misc/cli/include/class.command_line.php  2005-01-25 15:48:56.000000000 +0200
 @@ -29,7 +29,7 @@
  //\r
  \r
  include_once(APP_INC_PATH . "class.misc.php");\r
 -include_once(APP_PEAR_PATH . "XML_RPC/RPC.php");\r
-+include_once('XML/RPC.php');
++include_once(APP_PEAR_PATH . "XML/RPC.php");\r
  \r
  $_displayed_confirmation = false;\r
  \r
+--- ./rpc/xmlrpc.php~  2005-01-05 01:06:19.000000000 +0200
++++ ./rpc/xmlrpc.php   2005-01-25 16:35:14.000000000 +0200
+@@ -41,7 +41,7 @@
+ include_once(APP_INC_PATH . "class.template.php");\r
+ include_once(APP_INC_PATH . "class.customer.php");\r
+ error_reporting(0);\r
+-include_once(APP_PEAR_PATH . "XML_RPC/Server.php");\r
++include_once(APP_PEAR_PATH . "XML/RPC/Server.php");
+ \r
+ function authenticate($email, $password)\r
+ {\r
+--- ./include/class.notification.php~  2005-01-05 01:06:19.000000000 +0200
++++ ./include/class.notification.php   2005-01-25 16:41:23.000000000 +0200
+@@ -613,9 +613,9 @@
+         }\r
+         if ($old["iss_description"] != $new["description"]) {\r
+             // need real diff engine here\r
+-            include_once 'Text_Diff/Diff.php';\r
+-            include_once 'Text_Diff/Diff/Renderer.php';\r
+-            include_once 'Text_Diff/Diff/Renderer/unified.php';\r
++            include_once 'Text/Diff.php';
++            include_once 'Text/Diff/Renderer.php';
++            include_once 'Text/Diff/Renderer/unified.php';
+             $old['iss_description'] = explode("\n", $old['iss_description']);\r
+             $new['description'] = explode("\n", $new['description']);\r
+             $diff = &new Text_Diff($old["iss_description"], $new["description"]);\r