head 1.7; access; symbols; locks; strict; comment @# @; 1.7 date 2009.12.25.09.29.16; author rse; state Exp; branches; next 1.6; commitid jFnXrTfuyA1YKJgu; 1.6 date 2009.10.28.09.27.50; author rse; state Exp; branches; next 1.5; commitid TdPGwcWSnPI4Ch9u; 1.5 date 2009.10.22.20.43.57; author rse; state Exp; branches; next 1.4; commitid V54wSGcaY1FYxz8u; 1.4 date 2009.10.08.20.34.41; author rse; state Exp; branches; next 1.3; commitid vtOm1gRJzREHWL6u; 1.3 date 2009.09.15.17.29.10; author rse; state Exp; branches; next 1.2; commitid 2MO1lj3Pr5JTEN3u; 1.2 date 2009.07.11.21.12.19; author rse; state Exp; branches; next 1.1; commitid s9WtFAGVGqMY0lVt; 1.1 date 2009.07.11.18.28.41; author rse; state Exp; branches; next ; commitid viltRJmgcPjQ6kVt; desc @@ 1.7 log @upgrading package: davical 0.9.7.6 -> 0.9.8 @ text @Index: davical-0.9.8/dba/appuser_permissions.txt --- davical-0.9.8/dba/appuser_permissions.txt.orig 2009-12-24 09:50:16 +0100 +++ davical-0.9.8/dba/appuser_permissions.txt 2009-12-25 10:24:46 +0100 @@@@ -1,57 +1,44 @@@@ -# -# This file is used by update-rscds-database to set the correct -# permissions for the application user. In newer installations -# the application user will probably be called app_davical (and -# the administrative user will be called dba_davical) but in -# older installations the application user was called 'general' -# and the administrative user was probably 'postgres'. -# -# See the wiki topic 'Database/Users' for more discussion. -# -# This file includes lines like: -# GRANT SELECT,... -# which define what gets granted to the following lines like: -# ON table1, table2, sequence1, function 3, view4, ... -# no user-serviceable parts inside, all whitespace is ignored, -# your mileage should not vary :-) -# GRANT SELECT,INSERT,UPDATE,DELETE - ON collection - ON caldav_data - ON calendar_item - ON relationship - ON locks - ON property - ON freebusy_ticket - ON usr - ON usr_setting - ON roles - ON role_member - ON session - ON tmp_password - ON group_member - ON principal - ON relationship_type - ON sync_tokens - ON sync_changes - ON grants - ON dav_principal + ON collection, + caldav_data, + calendar_item, + relationship, + locks, + property, + freebusy_ticket, + usr, + usr_setting, + roles, + role_member, + session, + tmp_password, + group_member, + principal, + relationship_type, + sync_tokens, + sync_changes, + grants, + dav_principal + TO davical; GRANT SELECT,UPDATE - ON relationship_type_rt_id_seq - ON dav_id_seq - ON usr_user_no_seq - ON roles_role_no_seq - ON session_session_id_seq - ON principal_type_principal_type_id_seq - ON sync_tokens_sync_token_seq + ON relationship_type_rt_id_seq, + dav_id_seq, + usr_user_no_seq, + roles_role_no_seq, + session_session_id_seq, + principal_type_principal_type_id_seq, + sync_tokens_sync_token_seq + TO davical; GRANT SELECT,INSERT ON time_zone + TO davical; GRANT SELECT - ON supported_locales - ON awl_db_revision - ON principal_type + ON supported_locales, + awl_db_revision, + principal_type + TO davical; Index: davical-0.9.8/inc/always.php --- davical-0.9.8/inc/always.php.orig 2009-12-24 10:16:11 +0100 +++ davical-0.9.8/inc/always.php 2009-12-25 10:24:38 +0100 @@@@ -88,14 +88,8 @@@@ * access which could break DAViCal completely by causing output to start * too early. */ -if ( @@file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) { - include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'); -} -else if ( @@file_exists('/etc/davical/config.php') ) { - include('/etc/davical/config.php'); -} -else if ( @@file_exists('../config/config.php') ) { - include('../config/config.php'); +if ( @@file_exists("@@l_prefix@@/etc/davical/davical-config.php") ) { + include_once("@@l_prefix@@/etc/davical/davical-config.php"); } else { include('davical_configuration_missing.php'); @ 1.6 log @upgrading package: davical 0.9.7.5 -> 0.9.7.6 @ text @d1 3 a3 3 Index: davical-0.9.7.6/dba/appuser_permissions.txt --- davical-0.9.7.6/dba/appuser_permissions.txt.orig 2009-09-13 05:16:08 +0200 +++ davical-0.9.7.6/dba/appuser_permissions.txt 2009-10-08 22:27:36 +0200 a36 1 - ON dav_resource a38 1 - ON privilege d40 4 a56 1 + dav_resource, d59 5 a63 2 + privilege, + relationship_type a71 2 - ON dav_resource_type_resource_type_id_seq - ON principal_principal_id_seq d73 1 d79 2 a80 3 + dav_resource_type_resource_type_id_seq, + principal_principal_id_seq, + principal_type_principal_type_id_seq a89 1 - ON dav_resource_type a92 1 + dav_resource_type, d96 4 a99 4 Index: davical-0.9.7.6/inc/always.php --- davical-0.9.7.6/inc/always.php.orig 2009-10-08 02:10:04 +0200 +++ davical-0.9.7.6/inc/always.php 2009-10-08 22:31:37 +0200 @@@@ -79,15 +79,8 @@@@ d103 2 a104 2 -if ( @@file_exists("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php") ) { - include_once("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php"); d106 2 a107 5 -else if ( @@file_exists("/etc/davical/config.php") ) { - include_once("/etc/davical/config.php"); -} -else if ( @@file_exists("../config/config.php") ) { - include_once("../config/config.php"); d109 2 d113 1 d115 1 a115 2 include_once("davical_configuration_missing.php"); exit; @ 1.5 log @upgrading package: davical 0.9.7.4 -> 0.9.7.5 @ text @d1 3 a3 3 Index: davical-0.9.7.5/dba/appuser_permissions.txt --- davical-0.9.7.5/dba/appuser_permissions.txt.orig 2009-09-13 05:16:08 +0200 +++ davical-0.9.7.5/dba/appuser_permissions.txt 2009-10-08 22:27:36 +0200 d96 3 a98 3 Index: davical-0.9.7.5/inc/always.php --- davical-0.9.7.5/inc/always.php.orig 2009-10-08 02:10:04 +0200 +++ davical-0.9.7.5/inc/always.php 2009-10-08 22:31:37 +0200 @ 1.4 log @upgrading package: davical 0.9.7.2 -> 0.9.7.4 @ text @d1 3 a3 3 Index: davical-0.9.7.4/dba/appuser_permissions.txt --- davical-0.9.7.4/dba/appuser_permissions.txt.orig 2009-09-13 05:16:08 +0200 +++ davical-0.9.7.4/dba/appuser_permissions.txt 2009-10-08 22:27:36 +0200 d96 3 a98 3 Index: davical-0.9.7.4/inc/always.php --- davical-0.9.7.4/inc/always.php.orig 2009-10-08 02:10:04 +0200 +++ davical-0.9.7.4/inc/always.php 2009-10-08 22:31:37 +0200 @ 1.3 log @upgrading package: davical 0.9.7 -> 0.9.7.2 @ text @d1 3 a3 3 Index: davical-0.9.7.2/dba/appuser_permissions.txt --- davical-0.9.7.2/dba/appuser_permissions.txt.orig 2009-06-22 11:09:57 +0200 +++ davical-0.9.7.2/dba/appuser_permissions.txt 2009-07-11 23:09:37 +0200 d96 4 a99 4 Index: davical-0.9.7.2/inc/always.php --- davical-0.9.7.2/inc/always.php.orig 2009-06-22 11:09:57 +0200 +++ davical-0.9.7.2/inc/always.php 2009-07-11 23:08:50 +0200 @@@@ -67,17 +67,8 @@@@ a105 3 -else if ( @@file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) { - include_once("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php"); -} d111 1 a113 1 } d116 1 @ 1.2 log @fix database schema creation @ text @d1 3 a3 3 Index: davical-0.9.7-0/dba/appuser_permissions.txt --- davical-0.9.7-0/dba/appuser_permissions.txt.orig 2009-06-22 11:09:57 +0200 +++ davical-0.9.7-0/dba/appuser_permissions.txt 2009-07-11 23:09:37 +0200 d96 3 a98 3 Index: davical-0.9.7-0/inc/always.php --- davical-0.9.7-0/inc/always.php.orig 2009-06-22 11:09:57 +0200 +++ davical-0.9.7-0/inc/always.php 2009-07-11 23:08:50 +0200 @ 1.1 log @initial packaging of DAViCal @ text @d1 95 d98 1 a98 1 +++ davical-0.9.7-0/inc/always.php 2009-07-11 17:46:28 +0200 @