[pkg-kolab] r376 - in trunk/kolabd/debian: . patches
Peter Eisentraut
petere at costa.debian.org
Fri Apr 7 12:18:23 UTC 2006
Author: petere
Date: 2006-04-07 12:18:22 +0000 (Fri, 07 Apr 2006)
New Revision: 376
Added:
trunk/kolabd/debian/postrm
Modified:
trunk/kolabd/debian/changelog
trunk/kolabd/debian/control
trunk/kolabd/debian/dirs
trunk/kolabd/debian/kolabd.init
trunk/kolabd/debian/patches/10-perl-path-fixes.dpatch
trunk/kolabd/debian/patches/20-kolabquotawarn-issue851.dpatch
trunk/kolabd/debian/patches/30-bootstrap.dpatch
trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch
trunk/kolabd/debian/patches/50-kolabpasswd-slappasswd-path
trunk/kolabd/debian/patches/60-kolabdcachetool-cachefiles.dpatch
trunk/kolabd/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch
trunk/kolabd/debian/postinst
trunk/kolabd/debian/rules
Log:
* Fixed init script messages (closes: #360936)
* Clean everything on purge (closes: #360932)
* Use /usr/share/dpatch/dpatch-run in dpatches
* Do not create /var/log in this package (closes: #360934)
Modified: trunk/kolabd/debian/changelog
===================================================================
--- trunk/kolabd/debian/changelog 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/changelog 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,3 +1,12 @@
+kolabd (1.9.4dfsg-3) unstable; urgency=low
+
+ * Fixed init script messages (closes: #360936)
+ * Clean everything on purge (closes: #360932)
+ * Use /usr/share/dpatch/dpatch-run in dpatches
+ * Do not create /var/log in this package (closes: #360934)
+
+ -- Peter Eisentraut <petere at debian.org> Fri, 7 Apr 2006 12:49:23 +0200
+
kolabd (1.9.4dfsg-2) unstable; urgency=low
* fix problem with removed rfc2739
Modified: trunk/kolabd/debian/control
===================================================================
--- trunk/kolabd/debian/control 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/control 2006-04-07 12:18:22 UTC (rev 376)
@@ -2,7 +2,7 @@
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>
+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
Modified: trunk/kolabd/debian/dirs
===================================================================
--- trunk/kolabd/debian/dirs 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/dirs 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,2 +1 @@
var/lib/kolab
-var/log/kolab
Modified: trunk/kolabd/debian/kolabd.init
===================================================================
--- trunk/kolabd/debian/kolabd.init 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/kolabd.init 2006-04-07 12:18:22 UTC (rev 376)
@@ -12,7 +12,7 @@
case "$1" in
start)
- echo "Starting Kolab daemons" "kolabd"
+ log_daemon_msg "Starting Kolab daemons" "kolabd"
if ! start-stop-daemon --start --quiet --oknodo --background --exec /usr/sbin/kolabd; then
log_end_msg 1
@@ -22,14 +22,14 @@
log_end_msg 0
;;
stop)
- echo "Stopping Kolab daemons" "kolabd"
+ log_daemon_msg "Stopping Kolab daemons" "kolabd"
start-stop-daemon --stop --quiet --pidfile $KOLABPID
log_end_msg 0
;;
reload)
- echo "Reloading /etc/kolab/kolab.conf" "kolabd"
+ log_daemon_msg "Reloading Kolab daemons" "kolabd"
start-stop-daemon --stop --signal HUP --pidfile $KOLABPID
@@ -48,4 +48,3 @@
esac
exit 0
-
Modified: trunk/kolabd/debian/patches/10-perl-path-fixes.dpatch
===================================================================
--- trunk/kolabd/debian/patches/10-perl-path-fixes.dpatch 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/patches/10-perl-path-fixes.dpatch 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 10-perl-path-fixes.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 kolab.
+## DP: Here we correct the paths of kolab.
-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@
--- kolabd-1.9.4/dirservnotify.orig 2005-12-16 15:12:14.000000000 +0100
+++ kolabd-1.9.4/dirservnotify 2005-12-16 15:12:26.000000000 +0100
Modified: trunk/kolabd/debian/patches/20-kolabquotawarn-issue851.dpatch
===================================================================
--- trunk/kolabd/debian/patches/20-kolabquotawarn-issue851.dpatch 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/patches/20-kolabquotawarn-issue851.dpatch 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 20-kolabquotawarn-issue851.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: This is the patch from the rpm
-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@
--- kolabd-1.9.4/kolabquotawarn.orig 2005-07-23 00:50:20 +0200
+++ kolabd-1.9.4/kolabquotawarn 2005-09-14 14:31:18 +0200
Modified: trunk/kolabd/debian/patches/30-bootstrap.dpatch
===================================================================
--- trunk/kolabd/debian/patches/30-bootstrap.dpatch 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/patches/30-bootstrap.dpatch 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 30-bootstrap.dpatch by Noèl Köthe <noel at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: This is the patch from the rpm
-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@
--- kolabd-1.9.4/kolab_bootstrap.orig 2006-01-04 16:46:52.000000000 +0100
+++ kolabd-1.9.4/kolab_bootstrap 2006-01-09 20:35:27.000000000 +0100
Modified: trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch
===================================================================
--- trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/patches/40-kolabd-pid-file.dpatch 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 40-kolabd-pid-file.dpatch by Noèl Köthe <noel at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: This is the patch to correct the pid file 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@
--- kolabd-1.9.4/kolabd.orig 2006-01-25 16:32:11.000000000 +0100
+++ kolabd-1.9.4/kolabd 2006-01-25 16:32:46.000000000 +0100
Modified: trunk/kolabd/debian/patches/50-kolabpasswd-slappasswd-path
===================================================================
--- trunk/kolabd/debian/patches/50-kolabpasswd-slappasswd-path 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/patches/50-kolabpasswd-slappasswd-path 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 50-kolabpasswd-slappasswd-path by Noèl Köthe <noel at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: This is the patch to correct the slappasswd 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@
--- kolabd-1.9.4/kolabpasswd.orig 2006-01-26 13:18:12.000000000 +0100
+++ kolabd-1.9.4/kolabpasswd 2006-01-26 13:18:29.000000000 +0100
Modified: trunk/kolabd/debian/patches/60-kolabdcachetool-cachefiles.dpatch
===================================================================
--- trunk/kolabd/debian/patches/60-kolabdcachetool-cachefiles.dpatch 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/patches/60-kolabdcachetool-cachefiles.dpatch 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 60-kolabdcachetool-cachefiles.dpatch by Noèl Köthe <noel at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: This is the patch to correct the path of the cachefiles
-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@
--- kolabd-1.9.4/kolabdcachetool.orig 2006-01-26 13:06:41.000000000 +0100
+++ kolabd-1.9.4/kolabdcachetool 2006-01-26 13:07:22.000000000 +0100
Modified: trunk/kolabd/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch
===================================================================
--- trunk/kolabd/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch 2006-04-07 12:18:22 UTC (rev 376)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 70-kolab2.schema-removal.of.rfc2739.dpatch by Noèl Köthe <noel at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: remove calFBURL from the schema because rfc2739 has to be removed
-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@
--- kolabd-1.9.4/kolab2.schema.orig 2006-03-21 22:37:22.000000000 +0100
+++ kolabd-1.9.4/kolab2.schema 2006-03-21 22:34:55.000000000 +0100
Modified: trunk/kolabd/debian/postinst
===================================================================
--- trunk/kolabd/debian/postinst 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/postinst 2006-04-07 12:18:22 UTC (rev 376)
@@ -4,23 +4,16 @@
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;
+ adduser --group --system --no-create-home --gecos "Kolab user" \
+ --home /var/lib/kolab kolab
fi
}
fixperms() {
- dpkg-statoverride --list /var/lib/kolab >/dev/null || \
- dpkg-statoverride --update --add kolab kolab 0775 /var/lib/kolab
+ chown kolab:kolab /var/lib/kolab
+ chmod 2775 /var/lib/kolab
}
-create_log() {
- if ! [ -d /var/log/kolab ] ; then
- echo "Creating log directory for Kolab"
- mkdir -p /var/log/kolab
- fi
-}
-
create_cachefiles() {
if ! [ -f /var/lib/kolab/mailbox-uidcache.db ] ; then
echo "Creating Mailbox UID cache file"
@@ -32,21 +25,10 @@
fi
}
-case "$1" in
- configure)
- add_kolab_system_users
- fixperms
- create_log
- create_cachefiles
- ;;
- abort-upgrade|abort-deconfigure|abort-remove)
- :
- ;;
- *)
- echo "Called with unknown argument $1, bailing out."
- exit 1
- ;;
-esac
+if [ "$1" = configure ]; then
+ add_kolab_system_users
+ fixperms
+ create_cachefiles
+fi
#DEBHELPER#
-
Added: trunk/kolabd/debian/postrm
===================================================================
--- trunk/kolabd/debian/postrm 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/postrm 2006-04-07 12:18:22 UTC (rev 376)
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = purge ]; then
+ rm -f /var/lib/kolab/mailbox-uidcache.db
+ rm -f /var/lib/kolab/graveyard-tscache.db
+fi
+
+#DEBHELPER#
Modified: trunk/kolabd/debian/rules
===================================================================
--- trunk/kolabd/debian/rules 2006-04-07 07:36:16 UTC (rev 375)
+++ trunk/kolabd/debian/rules 2006-04-07 12:18:22 UTC (rev 376)
@@ -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
@@ -73,9 +51,6 @@
# Uncommented because of copyright issues, needs further investigation
# install -D -m 644 rfc2739.schema debian/kolabd/usr/share/kolabd/schema/rfc2739.schema
-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