Author: glen Date: Sat Jun 27 18:07:00 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to r3880
---- Files affected:
packages/eventum:
eventum-gettext.patch (1.3 -> 1.4) , eventum-order.patch (1.18 -> 1.19) ,
eventum-paths.patch (1.43 -> 1.44) , eventum.spec (1.301 -> 1.302) ,
eventum-mem-limits.patch (1.13 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/eventum/eventum-gettext.patch
diff -u packages/eventum/eventum-gettext.patch:1.3
packages/eventum/eventum-gettext.patch:1.4
--- packages/eventum/eventum-gettext.patch:1.3 Sat Jun 27 17:22:36 2009
+++ packages/eventum/eventum-gettext.patch Sat Jun 27 20:06:54 2009
@@ -1,10 +1,9 @@
---- eventum-r3475/lib/eventum/class.language.php~ 2007-11-20
19:11:35.000000000 +0200
-+++ eventum-r3475/lib/eventum/class.language.php 2007-11-20
19:12:05.696195147 +0200
-@@ -237,7 +237,6 @@
+--- eventum-2.2/lib/eventum/class.language.php~ 2009-06-27
20:21:10.000000000 +0300
++++ eventum-2.2/lib/eventum/class.language.php 2009-06-27 20:25:56.411199906
+0300
+@@ -227,6 +227,5 @@
}
// this won't change over the request. so set it once and permanently
--_bindtextdomain('eventum', APP_PATH . 'misc/localization/');
+-_bindtextdomain('eventum', APP_PATH . '/localization/');
_bind_textdomain_codeset('eventum', APP_CHARSET);
_textdomain('eventum');
-
================================================================
Index: packages/eventum/eventum-order.patch
diff -u packages/eventum/eventum-order.patch:1.18
packages/eventum/eventum-order.patch:1.19
--- packages/eventum/eventum-order.patch:1.18 Sat Jun 27 17:22:36 2009
+++ packages/eventum/eventum-order.patch Sat Jun 27 20:06:55 2009
@@ -126,8 +126,8 @@
Error_Handler::logError(array($res->getMessage(),
$res->getDebugInfo()), __FILE__, __LINE__);
return -1;
} else {
-+ Issue::moveOrderForAllUsers($issue_id, 1000);
- $prj_id = Issue::getProjectID($issue_id);
++ self::moveOrderForAllUsers($issue_id, 1000);
+ $prj_id = self::getProjectID($issue_id);
// record the change
@@ -1659,6 +1660,176 @@
@@ -148,10 +148,10 @@
+ $issue_id = Misc::escapeInteger($issue_id);
+
+ $usr_id = Auth::getUserID();
-+ $prj_id = Issue::getProjectID($issue_id);
++ $prj_id = self::getProjectID($issue_id);
+
+ // get all of the 'current' information of this issue
-+ $current = Issue::getDetails($issue_id);
++ $current = self::getDetails($issue_id);
+
+ $stmt = "UPDATE
+ " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue
@@ -260,7 +260,7 @@
+ if ($old_status_details['sta_is_closed'] == 1) {
+ $new_status_details = Status::getDetails($filed_value);
+ if ($new_status_details['sta_is_closed'] != 1) {
-+ Issue::clearClosed($issue_id);
++ self::clearClosed($issue_id);
+ }
+ }
+ $updated_fields["Status"] =
History::formatChanges(Status::getStatusTitle($current["iss_sta_id"]),
Status::getStatusTitle($filed_value));
@@ -426,7 +426,7 @@
if (is_array($issue_id)) {
$issue_id = implode(", ", $issue_id);
}
-+ $deleted_order_list =
Issue::getDeleteUserAssociationOrderList($issue_id);
++ $deleted_order_list =
self::getDeleteUserAssociationOrderList($issue_id);
$stmt = "DELETE FROM
" . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
WHERE
@@ -434,7 +434,7 @@
if ($usr_id) {
History::add($issue_id, $usr_id,
History::getTypeID('user_all_unassociated'), 'Issue assignments removed by ' .
User::getFullName($usr_id));
}
-+
Issue::rearrangeDeleteUserAsssociationOrderList($deleted_order_list);
++
self::rearrangeDeleteUserAsssociationOrderList($deleted_order_list);
return 1;
}
}
@@ -442,7 +442,7 @@
{
$issue_id = Misc::escapeInteger($issue_id);
$usr_id = Misc::escapeInteger($usr_id);
-+ $delete_order_list =
Issue::getDeleteUserAssociationOrderList($issue_id, $usr_id);
++ $delete_order_list =
self::getDeleteUserAssociationOrderList($issue_id, $usr_id);
$stmt = "DELETE FROM
" . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
WHERE
@@ -450,21 +450,21 @@
History::add($issue_id, Auth::getUserID(),
History::getTypeID('user_unassociated'),
User::getFullName($usr_id) . ' removed from issue by ' .
User::getFullName(Auth::getUserID()));
}
-+
Issue::rearrangeDeleteUserAssociationOrderList($delete_order_list);
++ self::rearrangeDeleteUserAssociationOrderList($delete_order_list);
return 1;
}
}
@@ -2379,6 +2643,11 @@
{
- $sort_by = Issue::getParam('sort_by');
- $sort_order = Issue::getParam('sort_order');
-+ $users = Issue::getParam('users');
+ $sort_by = self::getParam('sort_by');
+ $sort_order = self::getParam('sort_order');
++ $users = self::getParam('users');
+ if (empty($users) && ($sort_by == 'isu_order')) { // Sorting by
isu_order is impossible when no user specified
+ unset($sort_by);
+ unset($sort_order);
+ }
- $rows = Issue::getParam('rows');
- $hide_closed = Issue::getParam('hide_closed');
+ $rows = self::getParam('rows');
+ $hide_closed = self::getParam('hide_closed');
if ($hide_closed === '') {
@@ -2483,6 +2752,7 @@
"last_action_date" => "desc",
@@ -514,7 +514,7 @@
Error_Handler::logError(array($res->getMessage(),
$res->getDebugInfo()), __FILE__, __LINE__);
return -1;
}
-+ Issue::moveOrderForAllUsers($issue_id, 1);
++ self::moveOrderForAllUsers($issue_id, 1);
}
@@ -551,8 +551,8 @@
+ $issue_id = array($issue_id);
+ }
+ // do a nasty pretending to be deleting stuff so that reordering
happens as if these elements were deleted
-+ $orderlist = Issue::getDeleteUserAssociationOrderList($issue_id_str,
$usr_id);
-+ Issue::rearrangeDeleteUserAssociationOrderList($orderlist);
++ $orderlist = self::getDeleteUserAssociationOrderList($issue_id_str,
$usr_id);
++ self::rearrangeDeleteUserAssociationOrderList($orderlist);
+ // move down the orders to free the "order space" needed
+ $stmt = "UPDATE
+ " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
@@ -634,7 +634,7 @@
+ return -1;
+ }
+ foreach ($res as $row) {
-+ Issue::reorderUserIssues($row["isu_usr_id"], $issue_id,
$neworder);
++ self::reorderUserIssues($row["isu_usr_id"], $issue_id, $neworder);
+ }
+ }
+
@@ -1284,12 +1284,12 @@
+ }
+);
\ No newline at end of file
---- trunk/templates/header.tpl.html~ 2009-06-27 16:15:57.000000000 +0300
-+++ trunk/templates/header.tpl.html 2009-06-27 16:16:44.992783169 +0300
+--- eventum-2.2/templates/header.tpl.html~ 2009-06-27 18:48:02.000000000
+0300
++++ eventum-2.2/templates/header.tpl.html 2009-06-27 18:48:50.905140848
+0300
@@ -8,6 +8,7 @@
- <script type="text/javascript" src="{$rel_url}js/jquery/form.js"></script>
- <script type="text/javascript" src="{$rel_url}js/jquery/blockui.js"></script>
- <script type="text/javascript"
src="{$rel_url}js/jquery/ui.datepicker.js"></script>
+ <script type="text/javascript"
src="{$rel_url}js/jquery/form.js?c=9984"></script>
+ <script type="text/javascript"
src="{$rel_url}js/jquery/blockui.js?c=eb13"></script>
+ <script type="text/javascript"
src="{$rel_url}js/jquery/ui.datepicker.js?c=a911"></script>
+<script type="text/javascript"
src="{$rel_url}js/jquery/jquery.tablednd.js"></script>
<link rel="stylesheet" href="{$rel_url}js/jquery/ui.datepicker.css">
<script type="text/javascript">
@@ -1498,7 +1498,7 @@
if ($usr_id) {
History::add($issue_id, $usr_id,
History::getTypeID('user_all_unassociated'), 'Issue assignments removed by ' .
User::getFullName($usr_id));
}
--
Issue::rearrangeDeleteUserAsssociationOrderList($deleted_order_list);
+-
self::rearrangeDeleteUserAsssociationOrderList($deleted_order_list);
return 1;
}
}
================================================================
Index: packages/eventum/eventum-paths.patch
diff -u packages/eventum/eventum-paths.patch:1.43
packages/eventum/eventum-paths.patch:1.44
--- packages/eventum/eventum-paths.patch:1.43 Sat Jun 27 17:22:36 2009
+++ packages/eventum/eventum-paths.patch Sat Jun 27 20:06:55 2009
@@ -8,6 +8,20 @@
foreach ($required_directories as $dir_path => $options) {
// check if directory exists
if (!file_exists($dir_path)) {
+--- ./cli/eventum 2009-06-27 19:46:44.401524716 +0300
++++ ./cli/eventum 2009-06-27 19:45:22.781438493 +0300
+@@ -12,9 +12,8 @@
+ // @(#) $Id$
+
+ // definitions of path related variables
+-define('APP_PATH', dirname(__FILE__) . '/');
+-define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+-define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
++define('APP_PATH', '/usr/share/eventum');
++define('APP_INC_PATH', APP_PATH . '/cli');
+
+ if (defined('APP_PEAR_PATH')) {
+ set_include_path(APP_PEAR_PATH . PATH_SEPARATOR . get_include_path());
--- trunk/init.php~ 2009-06-27 17:31:32.000000000 +0300
+++ trunk/init.php 2009-06-27 17:33:35.745565456 +0300
@@ -26,7 +26,7 @@
================================================================
Index: packages/eventum/eventum.spec
diff -u packages/eventum/eventum.spec:1.301 packages/eventum/eventum.spec:1.302
--- packages/eventum/eventum.spec:1.301 Sat Jun 27 17:22:36 2009
+++ packages/eventum/eventum.spec Sat Jun 27 20:06:55 2009
@@ -11,8 +11,8 @@
%bcond_without order # with experimental order patch
#define snap 20060921
-%define rev r3862
-%define rel 2.23
+%define rev r3880
+%define rel 2.26
#define _rc RC3
%include /usr/lib/rpm/macros.php
@@ -28,7 +28,7 @@
#Source0:
http://mysql.easynet.be/Downloads/eventum/%{name}-%{version}.tar.gz
# bzr branch lp:eventum eventum && tar -cjf eventum.tar.bz2 --exclude=.bzr
--exclude=.bzrignore eventum
Source0: eventum-%{version}-dev-%{rev}.tar.gz
-# Source0-md5: 4d24ab27c68c632740fe90f6efc584c4
+# Source0-md5: bae6efb9785771495bb78e8262f695ae
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -49,7 +49,6 @@
Patch100: %{name}-paths.patch
Patch101: %{name}-cvs-config.patch
Patch105: %{name}-bot-reconnect.patch
-Patch106: %{name}-mem-limits.patch
Patch107: %{name}-gettext.patch
# some tests
Patch200: %{name}-fixed-nav.patch
@@ -456,7 +455,6 @@
%patch100 -p1
%patch101 -p1
%patch105 -p1
-%patch106 -p1
%patch107 -p1
cat <<'EOF'> mysql-permissions.sql
@@ -782,6 +780,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.302 2009/06/27 18:06:55 glen
+- up to r3880
+
Revision 1.301 2009/06/27 15:22:36 glen
- updated to r3862, files have been reorganized
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-gettext.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-order.patch?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-paths.patch?r1=1.43&r2=1.44&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.301&r2=1.302&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
