- keep path changes in one patch: eventum-paths.patch

Changed files:
    eventum-paths.patch -> 1.1
    eventum-rpm.patch -> 1.3
    eventum-system-pkg.patch -> 1.2

diff --git a/eventum-rpm.patch b/eventum-paths.patch
similarity index 56%
rename from eventum-rpm.patch
rename to eventum-paths.patch
index e03b4681225cb20228c615f68febb5fb98e6860f..288fde9569c31e9740c3544b60e1b1f669613575 100644 (file)
--- a/eventum-rpm.patch
+++ b/eventum-paths.patch
@@ -26,3 +26,17 @@
  \r
  $tpl->assign("phpversion", phpversion());\r
  $tpl->assign("rel_url", $relative_url);\r
+--- eventum-1.4.orig/setup/config.inc.php      2005-01-05 01:05:58.000000000 +0200
++++ eventum-1.4/setup/config.inc.php   2005-01-19 02:28:23.000000000 +0200
+@@ -56,9 +56,9 @@
+ @define("APP_INC_PATH", APP_PATH . "include/");\r
+ @define("APP_PEAR_PATH", APP_INC_PATH . "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
+ @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");\r
+-@define("APP_LOG_PATH", APP_PATH . "logs/");\r
++@define("APP_LOG_PATH", "/var/log/eventum/");\r
+ @define("APP_LOCKS_PATH", APP_PATH . "locks/");\r
+ if (stristr(PHP_OS, 'darwin')) {\r
+     ini_set("include_path", ".:" . APP_PEAR_PATH);\r

diff --git a/eventum-system-pkg.patch b/eventum-system-pkg.patch
deleted file mode 100644 (file)
index 3cd4a87..0000000
--- a/eventum-system-pkg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eventum-1.4/setup/config.inc.php~  2005-01-05 01:05:58.000000000 +0200
-+++ eventum-1.4/setup/config.inc.php   2005-01-19 01:43:21.000000000 +0200
-@@ -56,7 +56,7 @@
- @define("APP_INC_PATH", APP_PATH . "include/");\r
- @define("APP_PEAR_PATH", APP_INC_PATH . "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
- @define("APP_JPGRAPH_PATH", APP_INC_PATH . "jpgraph/");\r
- @define("APP_LOG_PATH", APP_PATH . "logs/");\r
- @define("APP_LOCKS_PATH", APP_PATH . "locks/");\r