[pkg-kolab] r186 - in trunk/kolabd/debian: . patches

[Steffen Joeris]

Author: white-guest
Date: 2006-01-23 14:30:41 +0000 (Mon, 23 Jan 2006)
New Revision: 186

Modified:
   trunk/kolabd/debian/control
   trunk/kolabd/debian/patches/40-slapd.conf.template.dpatch
   trunk/kolabd/debian/postinst
Log:
* add depends against adduser for postinst
* remove possible bashism
* correct path for dpatch


Modified: trunk/kolabd/debian/control
===================================================================
--- trunk/kolabd/debian/control	2006-01-23 13:55:23 UTC (rev 185)
+++ trunk/kolabd/debian/control	2006-01-23 14:30:41 UTC (rev 186)
@@ -3,12 +3,12 @@
 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
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch
 Standards-Version: 3.6.2
 
 Package: kolabd
 Architecture: all
-Depends: ${perl:Depends}, libkolab-perl, libnet-netmask-perl, libmail-box-perl, libterm-readkey-perl, libterm-readline-gnu-perl, openssl, slapd, ldap-utils, db4.2-util, postfix, postfix-ldap, apache2-mpm-prefork, apache2-utils, sasl2-bin, libsasl2-modules, kolab-cyrus-admin, kolab-cyrus-clients, kolab-cyrus-imapd, kolab-cyrus-pop3d, kolab-resource-handlers
+Depends: ${perl:Depends}, libkolab-perl, libnet-netmask-perl, libmail-box-perl, libterm-readkey-perl, libterm-readline-gnu-perl, openssl, slapd, ldap-utils, db4.2-util, postfix, postfix-ldap, apache2-mpm-prefork, apache2-utils, sasl2-bin, libsasl2-modules, kolab-cyrus-admin, kolab-cyrus-clients, kolab-cyrus-imapd, kolab-cyrus-pop3d, kolab-resource-handlers, adduser
 Description: Kolab groupware server
  Kolab is a secure, scalable and reliable groupware server. It is 
  formed by a number of well-known and proven components or the 

Modified: trunk/kolabd/debian/patches/40-slapd.conf.template.dpatch
===================================================================
--- trunk/kolabd/debian/patches/40-slapd.conf.template.dpatch	2006-01-23 13:55:23 UTC (rev 185)
+++ trunk/kolabd/debian/patches/40-slapd.conf.template.dpatch	2006-01-23 14:30:41 UTC (rev 186)
@@ -23,8 +23,8 @@
 exit 0
 
 @DPATCH@
---- slapd.conf.template.orig	2006-01-06 14:04:34.000000000 +0100
-+++ slapd.conf.template	2006-01-06 14:20:08.000000000 +0100
+--- kolabd-1.9.4/templates/slapd.conf.template.orig	2006-01-06 14:04:34.000000000 +0100
++++ kolabd-1.9.4/templates/slapd.conf.template	2006-01-06 14:20:08.000000000 +0100
 @@ -9,31 +9,31 @@
  # file mode 0640
  

Modified: trunk/kolabd/debian/postinst
===================================================================
--- trunk/kolabd/debian/postinst	2006-01-23 13:55:23 UTC (rev 185)
+++ trunk/kolabd/debian/postinst	2006-01-23 14:30:41 UTC (rev 186)
@@ -2,7 +2,7 @@
 
 set -e
 
-function add_kolab_system_users() {
+add_kolab_system_users() {
 	if ! getent passwd kolab >/dev/null; then
 		adduser --group --system --no-create-home --gecos "kolab user" \
 			--home /var/lib/kolab kolab;
@@ -17,7 +17,7 @@
 	fi
 }
 
-function fixperms() {
+fixperms() {
 	dpkg-statoverride --list /var/lib/kolab >/dev/null || \
 		dpkg-statoverride --update --add kolab kolab 0775 /var/lib/kolab
 }