[pkg-kolab] r377 - in trunk/kolab-resource-handlers/debian: .
patches
Peter Eisentraut
petere at costa.debian.org
Fri Apr 7 12:32:12 UTC 2006
Author: petere
Date: 2006-04-07 12:32:09 +0000 (Fri, 07 Apr 2006)
New Revision: 377
Added:
trunk/kolab-resource-handlers/debian/dirs
trunk/kolab-resource-handlers/debian/postrm
trunk/kolab-resource-handlers/debian/resmgr.conf
Modified:
trunk/kolab-resource-handlers/debian/apache2-kolab.conf
trunk/kolab-resource-handlers/debian/changelog
trunk/kolab-resource-handlers/debian/control
trunk/kolab-resource-handlers/debian/freebusy.conf
trunk/kolab-resource-handlers/debian/patches/00list
trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch
trunk/kolab-resource-handlers/debian/patches/100-pfb.php-path.dpatch
trunk/kolab-resource-handlers/debian/patches/20-kolabmailtransport.php.dpatch
trunk/kolab-resource-handlers/debian/patches/30-kolabmailboxfilter.php.dpatch
trunk/kolab-resource-handlers/debian/patches/40-resmgr.php.dpatch
trunk/kolab-resource-handlers/debian/patches/50-kolabfilter.php.dpatch
trunk/kolab-resource-handlers/debian/patches/60-olhacks.php.dpatch
trunk/kolab-resource-handlers/debian/patches/70-IMAP.php.dpatch
trunk/kolab-resource-handlers/debian/patches/80-freebusycache.class.php-path.dpatch
trunk/kolab-resource-handlers/debian/patches/90-freebusy.php-path.dpatch
trunk/kolab-resource-handlers/debian/postinst
trunk/kolab-resource-handlers/debian/rules
Log:
* Clean everything on purge (closes: #360927)
* Use /usr/share/dpatch/dpatch-run in dpatches
* Switched everything to syslog (closes: #360928)
* Put /var/lib/kolab/freebusy-cache in the package, no need to create
it in postinst (closes: #360924)
Modified: trunk/kolab-resource-handlers/debian/apache2-kolab.conf
===================================================================
--- trunk/kolab-resource-handlers/debian/apache2-kolab.conf 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/apache2-kolab.conf 2006-04-07 12:32:09 UTC (rev 377)
@@ -59,4 +59,3 @@
downgrade-1.0 force-response-1.0
</VirtualHost>
-
Modified: trunk/kolab-resource-handlers/debian/changelog
===================================================================
--- trunk/kolab-resource-handlers/debian/changelog 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/changelog 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,9 +1,12 @@
-kolab-resource-handlers (0.3.9-6) UNRELEASED; urgency=low
+kolab-resource-handlers (0.3.9-6) unstable; urgency=low
- * fix postinst script to make sure that directory will be created
- (Closes: #360924)
+ * Clean everything on purge (closes: #360927)
+ * Use /usr/share/dpatch/dpatch-run in dpatches
+ * Switched everything to syslog (closes: #360928)
+ * Put /var/lib/kolab/freebusy-cache in the package, no need to create
+ it in postinst (closes: #360924)
- -- Steffen Joeris <steffen.joeris at skolelinux.de> Thu, 6 Apr 2006 14:40:41 +0200
+ -- Peter Eisentraut <petere at debian.org> Fri, 7 Apr 2006 13:26:45 +0200
kolab-resource-handlers (0.3.9-5) unstable; urgency=low
Modified: trunk/kolab-resource-handlers/debian/control
===================================================================
--- trunk/kolab-resource-handlers/debian/control 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/control 2006-04-07 12:32:09 UTC (rev 377)
@@ -2,8 +2,8 @@
Section: mail
Priority: optional
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
-Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>
-Build-Depends: debhelper (>= 4.0.0), dpatch
+Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>, Peter Eisentraut <petere at debian.org>
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch
Standards-Version: 3.6.2
Package: kolab-resource-handlers
Added: trunk/kolab-resource-handlers/debian/dirs
===================================================================
--- trunk/kolab-resource-handlers/debian/dirs 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/dirs 2006-04-07 12:32:09 UTC (rev 377)
@@ -0,0 +1 @@
+var/lib/kolab/freebusy-cache
Modified: trunk/kolab-resource-handlers/debian/freebusy.conf
===================================================================
--- trunk/kolab-resource-handlers/debian/freebusy.conf 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/freebusy.conf 2006-04-07 12:32:09 UTC (rev 377)
@@ -66,10 +66,9 @@
$params['send_content_disposition'] = false;
// Where are we logging to?
-$params['log'] = 'file:/var/log/kolab/freebusy.log'; // File...
-// $params['log'] = 'syslog:cons, pid'; // Or syslog...
+// $params['log'] = 'file:/var/log/kolab/freebusy.log'; // File...
+$params['log'] = 'syslog:cons, pid'; // Or syslog...
// What level of output should we log? Higher levels give more verbose output.
// One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
$params['log_level'] = RM_LOG_DEBUG;
-
Modified: trunk/kolab-resource-handlers/debian/patches/00list
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/00list 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/00list 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,4 +1,3 @@
-100-pfb.php-path.dpatch
10-resmgr.conf.dpatch
20-kolabmailtransport.php.dpatch
30-kolabmailboxfilter.php.dpatch
@@ -8,3 +7,4 @@
70-IMAP.php.dpatch
80-freebusycache.class.php-path.dpatch
90-freebusy.php-path.dpatch
+100-pfb.php-path.dpatch
Modified: trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 10-resmgr.conf.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: Here we correct the pathes of the conffile
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.conf.orig 2006-01-04 13:52:17.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.conf 2006-01-04 13:51:56.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/100-pfb.php-path.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/100-pfb.php-path.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/100-pfb.php-path.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 100-pfb.php-path.dpatch by Noèl Köthe <noel at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: path changes
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- pfb.php.orig 2006-02-09 16:38:27.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/pfb.php 2006-02-09 16:45:46.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/20-kolabmailtransport.php.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/20-kolabmailtransport.php.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/20-kolabmailtransport.php.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 20-kolabmailtransport.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct path
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabmailtransport.php.orig 2006-01-04 15:08:14.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabmailtransport.php 2006-01-04 15:09:21.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/30-kolabmailboxfilter.php.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/30-kolabmailboxfilter.php.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/30-kolabmailboxfilter.php.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 30-kolabmailboxfilter.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: correct pathes
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabmailboxfilter.php.orig 2006-01-04 16:00:39.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabmailboxfilter.php 2006-01-04 16:40:18.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/40-resmgr.php.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/40-resmgr.php.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/40-resmgr.php.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,28 +1,9 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 40-resmgr.php.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct requires and use horde files and function declaration
-## from freebusy kolab under /usr/share/kolab-resource-handlers/php/*
+## DP: from freebusy kolab under /usr/share/kolab-resource-handlers/php/*
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.php.orig 2006-01-05 10:19:13.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.php 2006-01-05 10:59:09.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/50-kolabfilter.php.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/50-kolabfilter.php.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/50-kolabfilter.php.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 50-kolabfilter.php.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct requires for kolabfilter
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabfilter.php.orig 2006-01-05 11:44:23.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/kolabfilter.php 2006-01-05 11:44:19.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/60-olhacks.php.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/60-olhacks.php.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/60-olhacks.php.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 60-olhacks.php.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct requires for debian
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/olhacks.php.orig 2006-01-05 12:02:06.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/olhacks.php 2006-01-05 12:07:19.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/70-IMAP.php.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/70-IMAP.php.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/70-IMAP.php.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## IMAP.php.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct require
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP/IMAP.php.orig 2006-01-06 13:57:51.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/fbview/fbview/framework/Net_IMAP/IMAP.php 2006-01-06 13:58:11.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/80-freebusycache.class.php-path.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/80-freebusycache.class.php-path.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/80-freebusycache.class.php-path.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 80-freebusycache.class.php-path.dpatch by Noèl Köthe <noel at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: path changes
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/freebusycache.class.php.orig 2006-02-01 15:18:38.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/freebusycache.class.php 2006-02-01 15:26:12.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/patches/90-freebusy.php-path.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/90-freebusy.php-path.dpatch 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/patches/90-freebusy.php-path.dpatch 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 90-freebusy.php-path.dpatch by Noèl Köthe <noel at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: path changes
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
--- kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/freebusy.php.orig 2006-02-01 15:28:00.000000000 +0100
+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/freebusy/freebusy.php 2006-02-01 15:45:15.000000000 +0100
Modified: trunk/kolab-resource-handlers/debian/postinst
===================================================================
--- trunk/kolab-resource-handlers/debian/postinst 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/postinst 2006-04-07 12:32:09 UTC (rev 377)
@@ -2,31 +2,8 @@
set -e
-create_log() {
- if ! [ -d /var/log/kolab ] ; then
- echo "Creating log directory for Kolab"
- mkdir -p /var/log/kolab
- fi
- if ! [ -e /var/log/kolab/resmgr.log ] ; then
- echo "Creating log file for resource manager"
- touch /var/log/kolab/resmgr.log
- chown nobody:root /var/log/kolab/resmgr.log
- chmod 640 /var/log/kolab/resmgr.log
- fi
- if ! [ -e /var/log/kolab/freebusy.log ] ; then
- echo "Creating log file for freebusy"
- touch /var/log/kolab/freebusy.log
- chown www-data:root /var/log/kolab/freebusy.log
- chmod 640 /var/log/kolab/freebusy.log
- fi
-}
-
create_cache() {
- if ! [ -d /var/lib/kolab/freebusy-cache ] ; then
- echo "Creating freebusy cache directory"
- mkdir -p /var/lib/kolab/freebusy-cache
- chown www-data:root /var/lib/kolab/freebusy-cache
- fi
+ chown www-data:root /var/lib/kolab/freebusy-cache
}
enable_apache_mods() {
@@ -48,20 +25,9 @@
fi
}
-case "$1" in
- configure)
- create_log
- create_cache
- enable_apache_mods
- ;;
- abort-upgrade|abort-deconfigure|abort-remove)
- :
- ;;
- *)
- echo "Called with unknown argument $1, bailing out."
- exit 1
- ;;
-esac
+if [ "$1" = configure ]; then
+ create_cache
+ enable_apache_mods
+fi
#DEBHELPER#
-
Added: trunk/kolab-resource-handlers/debian/postrm
===================================================================
--- trunk/kolab-resource-handlers/debian/postrm 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/postrm 2006-04-07 12:32:09 UTC (rev 377)
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = purge ]; then
+ rm -f /var/lib/kolab/freebusy-cache/*
+fi
+
+#DEBHELPER#
Added: trunk/kolab-resource-handlers/debian/resmgr.conf
===================================================================
--- trunk/kolab-resource-handlers/debian/resmgr.conf 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/resmgr.conf 2006-04-07 12:32:09 UTC (rev 377)
@@ -0,0 +1,78 @@
+<?php
+// Example conf file for resmgr!
+
+// What is the root directory of our Horde instance?
+ at define('HORDE_BASE', '/var/kolab/www/fbview');
+
+// What is the address of the Cyrus server where the calendar data is stored?
+$params['server'] = 'localhost';
+
+// What is our default mail domain? This is used if any users do not have
+// '@domain' specified after their username as part of their email address.
+$params['email_domain'] = 'example.com';
+
+// Are we using virtual domains with Cyrus?
+$params['virtual_domains'] = true;
+
+// Should we append domains to mailbox URIs? This only applies when
+// virtual_domains is true, and when using manager accounts.
+$params['append_domains'] = false;
+
+// Should we make sure that the sender and From header match for mail
+// that origins on this server?
+$params['verify_from_header'] = true;
+
+// Should we perform this check on mail from our
+// subdomains too?
+$params['verify_subdomains'] = true;
+
+// Should the Sender: header be used over From: if present?
+$params['allow_sender_header'] = true;
+
+// Should reject messages with From headers that dont match
+// the envelope? Default is to rewrite the header
+$params['reject_forged_from_header'] = false;
+
+// Should we allow forwarded ical messages from Outlook
+// by encapsulating them in a MIME multipart
+$params['allow_outlook_ical_forward'] = true;
+
+// LDAP data
+// What is the address of the LDAP server address where user objects reside
+$params['ldap_uri'] = 'ldaps://localhost';
+
+// What is the Base DN of our LDAP database?
+$params['base_dn'] = 'dc=example,dc=com';
+
+// What DN should we use to bind to the LDAP server?
+$params['bind_dn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+
+// What password should we use with the above DN when binding?
+$params['bind_pw'] = 'xyz';
+
+
+// What account should we use to read/write calendar data? This account should
+// have access to the calendar mailbox of all resource/group mailboxes.
+$params['calendar_user'] = 'calendar@'.$params['email_domain'];
+$params['calendar_pass'] = 'zyx';
+
+// Filename of private key used to decrypt password from LDAP
+$params['priv_key_file'] = '/etc/kolab/res_priv.pem';
+
+// What is the name of the users' calendar mailbox?
+$params['calendar_store'] = 'Calendar';
+
+// Where can we get free/busy information from?
+$params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.ifb';
+
+// PFB url to trigger creation of pfb
+$params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
+
+// Where are we logging to?
+// $params['log'] = 'file:/var/log/kolab/resmgr.log'; // File...
+$params['log'] = 'syslog:cons, pid'; // Or syslog...
+
+// What level of output should we log? Higher levels give more verbose output.
+// One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
+$params['log_level'] = RM_LOG_DEBUG;
+?>
Modified: trunk/kolab-resource-handlers/debian/rules
===================================================================
--- trunk/kolab-resource-handlers/debian/rules 2006-04-07 12:18:22 UTC (rev 376)
+++ trunk/kolab-resource-handlers/debian/rules 2006-04-07 12:32:09 UTC (rev 377)
@@ -1,35 +1,13 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
-CFLAGS = -Wall -g
+build: patch
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
- touch configure-stamp
- dpatch apply-all
- touch patch-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- touch build-stamp
-
-clean:
- dh_testdir
dh_testroot
- dpatch deapply-all
- rm -f build-stamp configure-stamp patch-stamp
- rm -rf debian/patched
dh_clean
install: build
@@ -64,13 +42,10 @@
install -D -m 644 kolab-resource-handlers/freebusy/pfb.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/freebusy/pfb.php
# Install conffiles
- install -D -m 644 kolab-resource-handlers/resmgr/resmgr.conf debian/kolab-resource-handlers/etc/kolab/resmgr.conf
+ install -D -m 644 debian/resmgr.conf debian/kolab-resource-handlers/etc/kolab/resmgr.conf
install -D -m 644 debian/freebusy.conf debian/kolab-resource-handlers/etc/kolab/freebusy.conf
install -D -m 644 debian/apache2-kolab.conf debian/kolab-resource-handlers/etc/kolab/apache2-kolab.conf
-binary-arch: build install
-# We are binary-indep so nothing to do here.
-
binary-indep: build install
dh_testdir
dh_testroot
More information about the pkg-kolab-devel
mailing list