[pkg-kolab] r745 - kolab-webadmin/branches/2.2/debian kolab-webadmin/branches/2.2/debian/patches kolab-webadmin/branches/2.2/debian/patches/common kolabd/branches/2.2/debian kolabd/branches/2.2/debian/patches kolabd/branches/2.2/debian/patches/common libkolab-perl/branches/2.2/debian libkolab-perl/branches/2.2/debian/patches

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Fri Feb 29 14:58:21 UTC 2008


Author: mparent-guest
Date: 2008-02-29 14:58:20 +0000 (Fri, 29 Feb 2008)
New Revision: 745

Added:
   kolabd/branches/2.2/debian/patches/40-disable-amavis.dpatch
   kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch
   kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch
   kolabd/branches/2.2/debian/patches/91-postfix-template.dpatch~
Modified:
   kolab-webadmin/branches/2.2/debian/changelog
   kolab-webadmin/branches/2.2/debian/patches/60-no_extra_doc.dpatch
   kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
   kolab-webadmin/branches/2.2/debian/rules
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/control
   kolabd/branches/2.2/debian/patches/00list
   kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
   kolabd/branches/2.2/debian/patches/91-postfix-template.dpatch
   kolabd/branches/2.2/debian/patches/92-resmgr-template.dpatch
   kolabd/branches/2.2/debian/patches/93-freebusy-template.dpatch
   kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
   kolabd/branches/2.2/debian/rules
   libkolab-perl/branches/2.2/debian/changelog
   libkolab-perl/branches/2.2/debian/control
   libkolab-perl/branches/2.2/debian/patches/00list
   libkolab-perl/branches/2.2/debian/rules
Log:
Commit changed packages


Modified: kolab-webadmin/branches/2.2/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2/debian/changelog	2008-02-29 14:51:45 UTC (rev 744)
+++ kolab-webadmin/branches/2.2/debian/changelog	2008-02-29 14:58:20 UTC (rev 745)
@@ -1,3 +1,11 @@
+kolab-webadmin (2.1.99+20080204-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * updated 50-dist_conf, smarty is no with the good path
+  * 60-no_extra_doc partially dropped
+
+ -- Mathieu Parent <math.parent at debian.org>  Tue, 12 Feb 2008 10:46:34 +0200
+
 kolab-webadmin (2.1.0-20070510-3) UNRELEASED; urgency=low
 
   * Internal Subversion repository reorganization to keep common patches in

Modified: kolab-webadmin/branches/2.2/debian/patches/60-no_extra_doc.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/60-no_extra_doc.dpatch	2008-02-29 14:51:45 UTC (rev 744)
+++ kolab-webadmin/branches/2.2/debian/patches/60-no_extra_doc.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -24,227 +24,3 @@
  
  EXTRA_DIST += dist_conf/common \
  	dist_conf/debian \
-diff -urNad kolab-webadmin-2.1.0-20070510~/Makefile.in kolab-webadmin-2.1.0-20070510/Makefile.in
---- kolab-webadmin-2.1.0-20070510~/Makefile.in	2007-05-10 12:29:03.000000000 +0200
-+++ kolab-webadmin-2.1.0-20070510/Makefile.in	2007-06-18 02:23:33.000000000 +0200
-@@ -36,11 +36,10 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- subdir = .
--DIST_COMMON = README $(am__configure_deps) $(dist_kwadoc_DATA) \
--	$(dist_phplocalede_DATA) $(dist_phplocalees_DATA) \
--	$(dist_phplocalefr_DATA) $(dist_phplocaleit_DATA) \
--	$(dist_phplocalenl_DATA) $(dist_wspics_DATA) \
--	$(dist_wstoplevel_DATA) $(noinst_HEADERS) \
-+DIST_COMMON = README $(am__configure_deps) $(dist_phplocalede_DATA) \
-+	$(dist_phplocalees_DATA) $(dist_phplocalefr_DATA) \
-+	$(dist_phplocaleit_DATA) $(dist_phplocalenl_DATA) \
-+	$(dist_wspics_DATA) $(dist_wstoplevel_DATA) $(noinst_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/kolab-webadmin.spec.in $(top_srcdir)/configure \
- 	AUTHORS COPYING ChangeLog INSTALL NEWS install-sh missing
-@@ -60,11 +59,10 @@
-     *) f=$$p;; \
-   esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kwadocdir)" \
--	"$(DESTDIR)$(phplocalededir)" "$(DESTDIR)$(phplocaleesdir)" \
--	"$(DESTDIR)$(phplocalefrdir)" "$(DESTDIR)$(phplocaleitdir)" \
--	"$(DESTDIR)$(phplocalenldir)" "$(DESTDIR)$(wspicsdir)" \
--	"$(DESTDIR)$(wstopleveldir)" \
-+am__installdirs = "$(DESTDIR)$(phplocalededir)" \
-+	"$(DESTDIR)$(phplocaleesdir)" "$(DESTDIR)$(phplocalefrdir)" \
-+	"$(DESTDIR)$(phplocaleitdir)" "$(DESTDIR)$(phplocalenldir)" \
-+	"$(DESTDIR)$(wspicsdir)" "$(DESTDIR)$(wstopleveldir)" \
- 	"$(DESTDIR)$(php_includes_configdir)" \
- 	"$(DESTDIR)$(phpincludesdir)" "$(DESTDIR)$(phptemplatesdir)" \
- 	"$(DESTDIR)$(wsaboutdir)" "$(DESTDIR)$(wsaddressbookdir)" \
-@@ -73,7 +71,6 @@
- 	"$(DESTDIR)$(wsdomainmaintainerdir)" "$(DESTDIR)$(wskolabdir)" \
- 	"$(DESTDIR)$(wsmaintainerdir)" "$(DESTDIR)$(wsservicedir)" \
- 	"$(DESTDIR)$(wssharedfolderdir)" "$(DESTDIR)$(wsuserdir)"
--dist_kwadocDATA_INSTALL = $(INSTALL_DATA)
- dist_phplocaledeDATA_INSTALL = $(INSTALL_DATA)
- dist_phplocaleesDATA_INSTALL = $(INSTALL_DATA)
- dist_phplocalefrDATA_INSTALL = $(INSTALL_DATA)
-@@ -94,16 +91,15 @@
- wsserviceDATA_INSTALL = $(INSTALL_DATA)
- wssharedfolderDATA_INSTALL = $(INSTALL_DATA)
- wsuserDATA_INSTALL = $(INSTALL_DATA)
--DATA = $(dist_kwadoc_DATA) $(dist_phplocalede_DATA) \
--	$(dist_phplocalees_DATA) $(dist_phplocalefr_DATA) \
--	$(dist_phplocaleit_DATA) $(dist_phplocalenl_DATA) \
--	$(dist_wspics_DATA) $(dist_wstoplevel_DATA) \
--	$(php_includes_config_DATA) $(phpincludes_DATA) \
--	$(phptemplates_DATA) $(wsabout_DATA) $(wsaddressbook_DATA) \
--	$(wsadminstrator_DATA) $(wsdistributionlist_DATA) \
--	$(wsdomainmaintainer_DATA) $(wskolab_DATA) \
--	$(wsmaintainer_DATA) $(wsservice_DATA) $(wssharedfolder_DATA) \
--	$(wsuser_DATA)
-+DATA = $(dist_phplocalede_DATA) $(dist_phplocalees_DATA) \
-+	$(dist_phplocalefr_DATA) $(dist_phplocaleit_DATA) \
-+	$(dist_phplocalenl_DATA) $(dist_wspics_DATA) \
-+	$(dist_wstoplevel_DATA) $(php_includes_config_DATA) \
-+	$(phpincludes_DATA) $(phptemplates_DATA) $(wsabout_DATA) \
-+	$(wsaddressbook_DATA) $(wsadminstrator_DATA) \
-+	$(wsdistributionlist_DATA) $(wsdomainmaintainer_DATA) \
-+	$(wskolab_DATA) $(wsmaintainer_DATA) $(wsservice_DATA) \
-+	$(wssharedfolder_DATA) $(wsuser_DATA)
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-@@ -151,31 +147,43 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- WITHOPENPKG = @WITHOPENPKG@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__leading_dot = @am__leading_dot@
- am__tar = @am__tar@
- am__untar = @am__untar@
- bindir = @bindir@
- build_alias = @build_alias@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host_alias = @host_alias@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = $(phpkolabdir)/locale
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- spec_build_date = @spec_build_date@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+
-+#kwadocdir = $(pkgdocdir)/@PACKAGE@
-+#dist_kwadoc_DATA = ChangeLog \
-+#        COPYING \
-+#        NEWS \
-+#        AUTHORS
- EXTRA_DIST = www/admin/style.css $(PHP_INCLUDES) $(PHP_TEMPLATES) \
- 	dist_conf/common dist_conf/debian dist_conf/gentoo \
- 	dist_conf/kolab dist_conf/mandriva dist_conf/suse \
-@@ -365,7 +373,6 @@
- PHP_LOCALE_IT_MO = php/admin/locale/it/LC_MESSAGES/messages.mo
- PHP_LOCALE_ES_PO = php/admin/locale/es/LC_MESSAGES/messages.po
- PHP_LOCALE_ES_MO = php/admin/locale/es/LC_MESSAGES/messages.mo
--localedir = $(phpkolabdir)/locale
- phplocalededir = $(localedir)/de/LC_MESSAGES
- phplocalefrdir = $(localedir)/fr/LC_MESSAGES
- phplocalenldir = $(localedir)/nl/LC_MESSAGES
-@@ -376,12 +383,6 @@
- dist_phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
- dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
- dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
--kwadocdir = $(pkgdocdir)/@PACKAGE@
--dist_kwadoc_DATA = ChangeLog \
--        COPYING \
--        NEWS \
--        AUTHORS
--
- all: all-am
- 
- .SUFFIXES:
-@@ -422,23 +423,6 @@
- kolab-webadmin.spec: $(top_builddir)/config.status $(srcdir)/kolab-webadmin.spec.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- uninstall-info-am:
--install-dist_kwadocDATA: $(dist_kwadoc_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(kwadocdir)" || $(mkdir_p) "$(DESTDIR)$(kwadocdir)"
--	@list='$(dist_kwadoc_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(dist_kwadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kwadocdir)/$$f'"; \
--	  $(dist_kwadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kwadocdir)/$$f"; \
--	done
--
--uninstall-dist_kwadocDATA:
--	@$(NORMAL_UNINSTALL)
--	@list='$(dist_kwadoc_DATA)'; for p in $$list; do \
--	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(kwadocdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(kwadocdir)/$$f"; \
--	done
- install-dist_phplocaledeDATA: $(dist_phplocalede_DATA)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(phplocalededir)" || $(mkdir_p) "$(DESTDIR)$(phplocalededir)"
-@@ -958,7 +942,7 @@
- check: check-am
- all-am: Makefile $(DATA) $(HEADERS)
- installdirs:
--	for dir in "$(DESTDIR)$(kwadocdir)" "$(DESTDIR)$(phplocalededir)" "$(DESTDIR)$(phplocaleesdir)" "$(DESTDIR)$(phplocalefrdir)" "$(DESTDIR)$(phplocaleitdir)" "$(DESTDIR)$(phplocalenldir)" "$(DESTDIR)$(wspicsdir)" "$(DESTDIR)$(wstopleveldir)" "$(DESTDIR)$(php_includes_configdir)" "$(DESTDIR)$(phpincludesdir)" "$(DESTDIR)$(phptemplatesdir)" "$(DESTDIR)$(wsaboutdir)" "$(DESTDIR)$(wsaddressbookdir)" "$(DESTDIR)$(wsadminstratordir)" "$(DESTDIR)$(wsdistributionlistdir)" "$(DESTDIR)$(wsdomainmaintainerdir)" "$(DESTDIR)$(wskolabdir)" "$(DESTDIR)$(wsmaintainerdir)" "$(DESTDIR)$(wsservicedir)" "$(DESTDIR)$(wssharedfolderdir)" "$(DESTDIR)$(wsuserdir)"; do \
-+	for dir in "$(DESTDIR)$(phplocalededir)" "$(DESTDIR)$(phplocaleesdir)" "$(DESTDIR)$(phplocalefrdir)" "$(DESTDIR)$(phplocaleitdir)" "$(DESTDIR)$(phplocalenldir)" "$(DESTDIR)$(wspicsdir)" "$(DESTDIR)$(wstopleveldir)" "$(DESTDIR)$(php_includes_configdir)" "$(DESTDIR)$(phpincludesdir)" "$(DESTDIR)$(phptemplatesdir)" "$(DESTDIR)$(wsaboutdir)" "$(DESTDIR)$(wsaddressbookdir)" "$(DESTDIR)$(wsadminstratordir)" "$(DESTDIR)$(wsdistributionlistdir)" "$(DESTDIR)$(wsdomainmaintainerdir)" "$(DESTDIR)$(wskolabdir)" "$(DESTDIR)$(wsmaintainerdir)" "$(DESTDIR)$(wsservicedir)" "$(DESTDIR)$(wssharedfolderdir)" "$(DESTDIR)$(wsuserdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
-@@ -1006,7 +990,7 @@
- 
- info-am:
- 
--install-data-am: install-dist_kwadocDATA install-dist_phplocaledeDATA \
-+install-data-am: install-dist_phplocaledeDATA \
- 	install-dist_phplocaleesDATA install-dist_phplocalefrDATA \
- 	install-dist_phplocaleitDATA install-dist_phplocalenlDATA \
- 	install-dist_wspicsDATA install-dist_wstoplevelDATA \
-@@ -1046,7 +1030,7 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-dist_kwadocDATA uninstall-dist_phplocaledeDATA \
-+uninstall-am: uninstall-dist_phplocaledeDATA \
- 	uninstall-dist_phplocaleesDATA uninstall-dist_phplocalefrDATA \
- 	uninstall-dist_phplocaleitDATA uninstall-dist_phplocalenlDATA \
- 	uninstall-dist_wspicsDATA uninstall-dist_wstoplevelDATA \
-@@ -1064,22 +1048,21 @@
- 	distclean-generic distclean-local distclean-tags \
- 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-hook install-dist_kwadocDATA \
--	install-dist_phplocaledeDATA install-dist_phplocaleesDATA \
--	install-dist_phplocalefrDATA install-dist_phplocaleitDATA \
--	install-dist_phplocalenlDATA install-dist_wspicsDATA \
--	install-dist_wstoplevelDATA install-exec install-exec-am \
--	install-info install-info-am install-man \
--	install-php_includes_configDATA install-phpincludesDATA \
--	install-phptemplatesDATA install-strip install-wsaboutDATA \
--	install-wsaddressbookDATA install-wsadminstratorDATA \
--	install-wsdistributionlistDATA install-wsdomainmaintainerDATA \
--	install-wskolabDATA install-wsmaintainerDATA \
--	install-wsserviceDATA install-wssharedfolderDATA \
--	install-wsuserDATA installcheck installcheck-am installdirs \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
--	uninstall-am uninstall-dist_kwadocDATA \
-+	install-data-am install-data-hook install-dist_phplocaledeDATA \
-+	install-dist_phplocaleesDATA install-dist_phplocalefrDATA \
-+	install-dist_phplocaleitDATA install-dist_phplocalenlDATA \
-+	install-dist_wspicsDATA install-dist_wstoplevelDATA \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-php_includes_configDATA \
-+	install-phpincludesDATA install-phptemplatesDATA install-strip \
-+	install-wsaboutDATA install-wsaddressbookDATA \
-+	install-wsadminstratorDATA install-wsdistributionlistDATA \
-+	install-wsdomainmaintainerDATA install-wskolabDATA \
-+	install-wsmaintainerDATA install-wsserviceDATA \
-+	install-wssharedfolderDATA install-wsuserDATA installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+	pdf-am ps ps-am tags uninstall uninstall-am \
- 	uninstall-dist_phplocaledeDATA uninstall-dist_phplocaleesDATA \
- 	uninstall-dist_phplocalefrDATA uninstall-dist_phplocaleitDATA \
- 	uninstall-dist_phplocalenlDATA uninstall-dist_wspicsDATA \

Modified: kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-02-29 14:51:45 UTC (rev 744)
+++ kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -4,9 +4,9 @@
 ## DP: Adjusts some paths
 
 @DPATCH@
-diff -urNad kolab-webadmin-2.1.0-20070510~/dist_conf/debian kolab-webadmin-2.1.0-20070510/dist_conf/debian
---- kolab-webadmin-2.1.0-20070510~/dist_conf/debian	2008-02-22 17:21:05.000000000 +0100
-+++ kolab-webadmin-2.1.0-20070510/dist_conf/debian	2008-02-22 17:22:20.000000000 +0100
+diff -urNad kolabd-2.1.0-20070510.dfsg~/dist_conf/debian kolabd-2.1.0-20070510.dfsg/dist_conf/debian
+--- kolabd-2.1.0-20070510.dfsg~/dist_conf/debian	2007-10-18 11:20:32.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2008-02-13 20:12:29.000000000 +0100
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -29,8 +29,8 @@
  
  BASHELL=/bin/bash
  PERL=${bindir}/perl
-@@ -19,19 +20,19 @@
- pkgdocdir=${datadir}/doc/kolab
+@@ -20,19 +21,19 @@
+ kolabconf_script=${sbindir}/kolabconf
  
  # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 -perllib=${libdir}/perl5
@@ -53,7 +53,7 @@
  
  clamav_confdir=${sysconfdir}/clamav
  clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -52,9 +53,11 @@
+@@ -53,42 +54,45 @@
  emailserver_socket=${libdir}/postfix/lmtp
  emailserver_localstatedir=${localstatedir}/spool/postfix
  emailserver_logfile=${localstatedir}/log/mail.log
@@ -65,10 +65,6 @@
 +emailserver_grp=root
 +emailserver_master_usr=kolab
  
- ftpserver_scoreboardfile=${localstatedir}/proftpd/score
- ftpserver_logfile=${localstatedir}/log/proftpd.log
-@@ -69,36 +72,39 @@
- 
  imap_confdir=${sysconfdir}
  imap_confperm=0640
 -imap_usr=cyrus
@@ -88,11 +84,8 @@
  kolab_pidfile=${sysrundir}/kolab.pid
  kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
 -kolab_scriptsdir=$(sysconfdir)/kolab
--kolab_php_smarty_prefix=Smarty
 +kolab_scriptsdir=${sbindir}
-+kolab_php_smarty_prefix=smarty/libs
-+
-+kolab_php_module_prefix=kolab/
+ kolab_php_smarty_prefix=smarty/libs
  
  ldapserver_statedir=${localstatedir}/lib/ldap
  ldapserver_dir=${localstatedir}/lib/ldap
@@ -119,7 +112,7 @@
  webserver_cgidir=${webserver_document_root}/cgi-bin
  webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
  webserver_logdir=${localstatedir}/log/apache2
-@@ -114,28 +120,39 @@
+@@ -104,29 +108,41 @@
  webserver_sslmutex=${sysrundir}/ssl_mutex
  webserver_web_prefix=/kolab
  webserver_musr=kolab
@@ -154,7 +147,9 @@
  
  fbview_logfile=${localstatedir}/resmgr/fbview.log
  freebusy_logfile=${localstatedir}/resmgr/freebusy.log
+-freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
 -freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
++freebusy_confdir=${sysconfdir}/kolab
 +freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
 +freebusy_usr=root
 +freebusy_grp=www-data
@@ -168,3 +163,4 @@
 +kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 +
 +aliases_file=${sysconfdir}/aliases
++

Modified: kolab-webadmin/branches/2.2/debian/rules
===================================================================
--- kolab-webadmin/branches/2.2/debian/rules	2008-02-29 14:51:45 UTC (rev 744)
+++ kolab-webadmin/branches/2.2/debian/rules	2008-02-29 14:58:20 UTC (rev 745)
@@ -26,7 +26,7 @@
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-webadmin
-	rmdir $(CURDIR)/debian/kolab-webadmin/usr/share/php/kolab/admin/templates_c/
+	rmdir $(CURDIR)/debian/kolab-webadmin/usr/share/php/admin/templates_c/
 	install -D -m 644 debian/apache.conf $(CURDIR)/debian/kolab-webadmin/etc/kolab/kolab-webadmin-apache.conf
 	install -D -m 644 debian/session_vars.php $(CURDIR)/debian/kolab-webadmin/etc/kolab-webadmin/session_vars.php
 

Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/changelog	2008-02-29 14:58:20 UTC (rev 745)
@@ -1,3 +1,19 @@
+kolabd (2.1.99+20080204.dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version 
+  * updated patch 80-kolab-syslog-facility, part is gone to kolabconf
+  * new patch 85-slapd-2.4-compat, to be compatible with slapd 2.4
+  * new patch 86-slapd-syncrepl-24, to enable syncrepl and disable slurpd
+    (Closes: #463791)
+  * updated patch 91-postfix-template, partially applied upstream
+  * updated patch 92-resmgr-template, path is now /etc/kolab/filter_config.php
+    and format has changed
+  * updated patch  93-freebusy-template, path is now 
+    /etc/kolab/freebusy_config.php and format has changed
+  * updated patch common/dist_conf, smarty has now the good path
+
+ -- Mathieu PARENT <math.parent at gmail.com>  Wed, 13 Feb 2008 23:25:11 +0100
+
 kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
 
   * Internal Subversion repository reorganization to keep common patches in

Modified: kolabd/branches/2.2/debian/control
===================================================================
--- kolabd/branches/2.2/debian/control	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/control	2008-02-29 14:58:20 UTC (rev 745)
@@ -14,9 +14,9 @@
 Depends: ${perl:Depends}, libnet-netmask-perl, libmail-box-perl, libterm-readkey-perl, libterm-readline-gnu-perl,
  postfix (>= 2.4), postfix-ldap (>= 2.4),
  sasl2-bin, libsasl2-modules,
- libkolab-perl (>= 5.8.7-20070420),
+ libkolab-perl (>= 5.8.7-20080204),
  kolab-cyrus-admin, kolab-cyrus-clients, kolab-cyrus-imapd, kolab-cyrus-pop3d,
- kolab-resource-handlers,
+ kolabconf, kolab-filter, kolab-freebusy,
  adduser, lsb-base (>= 3.0-3)
 Recommends: slapd, ldap-utils
 Suggests: openssl, db4.2-util, kolab-webadmin, amavisd-new

Modified: kolabd/branches/2.2/debian/patches/00list
===================================================================
--- kolabd/branches/2.2/debian/patches/00list	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/patches/00list	2008-02-29 14:58:20 UTC (rev 745)
@@ -1,8 +1,11 @@
 common/dist_conf
 30-bootstrap
+40-disable-amavis
 #60-kolabdcachetool-cachefiles
 70-kolab2.schema-removal.of.rfc2739.dpatch
 80-kolab-syslog-facility
+85-slapd-2.4-compat
+86-slapd-syncrepl-24
 90-slapd-template
 91-postfix-template
 92-resmgr-template

Added: kolabd/branches/2.2/debian/patches/40-disable-amavis.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/40-disable-amavis.dpatch	                        (rev 0)
+++ kolabd/branches/2.2/debian/patches/40-disable-amavis.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-disable-amavis.dpatch by  <math.parent at gmail.com>
+##
+## DP: amavis is only suggested, so disable by default
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in
+--- kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in	2008-02-29 14:47:55.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in	2008-02-29 14:48:30.000000000 +0100
+@@ -540,7 +540,7 @@
+         'postfix-mynetworks' => $mynetworkinterfaces,
+         #'postfix-relayhost' => "",
+         #'postfix-transport' => "",
+-        'postfix-enable-virus-scan' => "TRUE",
++        'postfix-enable-virus-scan' => "FALSE",
+         'cyrus-autocreatequota' => 100000,
+         'cyrus-quotawarn' => 80,
+         'cyrus-admins' => "manager",


Property changes on: kolabd/branches/2.2/debian/patches/40-disable-amavis.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/patches/80-kolab-syslog-facility.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -4,28 +4,16 @@
 ## DP: Make the used syslog facility configureable
 
 @DPATCH@
-diff -Nwru kolabd-1.9.4dfsg/kolabconf kolabd-1.9.4dfsg.patched/kolabconf
---- kolabd-1.9.4dfsg/kolabconf	2005-04-28 02:16:59.000000000 +0200
-+++ kolabd-1.9.4dfsg.patched/kolabconf.in	2006-05-26 15:32:13.000000000 +0200
-@@ -37,7 +37,7 @@
- use Kolab::LDAP;
- use vars qw($opt_d $opt_n $opt_h);
- 
--openlog('kolabconf', 'cons, pid', 'user');
-+openlog('kolabconf', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
- 
- getopts('dnh');
- if ($opt_h) {
 diff -Nwru kolabd-1.9.4dfsg/kolab.conf kolabd-1.9.4dfsg.patched/kolab.conf
 --- kolabd-1.9.4dfsg/kolab.conf	2004-11-23 21:26:47.000000000 +0100
 +++ kolabd-1.9.4dfsg.patched/kolab.conf	2006-05-26 15:21:52.000000000 +0200
 @@ -10,3 +10,4 @@
- ldap_master_uri : @@@ldap_master_uri@@@
- php_dn : cn=nobody,@@@kolab_basedn@@@
  php_pw : @@@nobody_pw@@@
+ slurpd_addr : 127.0.0.1
+ slurpd_port : 9999
 +syslog_facility : local5
 diff -Nwru kolabd-1.9.4dfsg/kolabd kolabd-1.9.4dfsg.patched/kolabd
---- kolabd-1.9.4dfsg/kolabd	2004-12-22 14:50:03.000000000 +0100
+--- kolabd-1.9.4dfsg/kolabd.in	2004-12-22 14:50:03.000000000 +0100
 +++ kolabd-1.9.4dfsg.patched/kolabd.in	2006-05-26 15:31:56.000000000 +0200
 @@ -49,7 +49,7 @@
  use Kolab::LDAP::Backend;

Added: kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch	                        (rev 0)
+++ kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81-slapd-2.4-compat.dpatch by  <mathieu at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in
+--- kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in	2008-02-19 19:09:49.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in	2008-02-19 19:10:11.000000000 +0100
+@@ -29,7 +29,8 @@
+ replogfile      @ldapserver_replogfile@
+ replicationinterval 5
+ 
+-schemacheck 	       on
++#desactivate schemacheck
++#schemacheck 	       on
+ 
+ TLSCertificateFile     @sysconfdir@/kolab/cert.pem
+ TLSCertificateKeyFile  @sysconfdir@/kolab/key.pem
+@@ -48,10 +49,12 @@
+ cachesize       10000
+ checkpoint 	512 5
+ idlcachesize    10000
+-idletimeout	300 # The value can be increased if some clients develop
+-		    # problems. Please report to kolab-devel at kolab.org
+-		    # if you encounter such a client.
+-dirtyread
++idletimeout	300 
++# The value can be increased if some clients develop
++# problems. Please report to kolab-devel at kolab.org
++# if you encounter such a client.
++
++#dirtyread
+ 
+ directory	@ldapserver_dir@
+ 


Property changes on: kolabd/branches/2.2/debian/patches/85-slapd-2.4-compat.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch	                        (rev 0)
+++ kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 86-slapd-syncrepl-24.dpatch by  <mathieu at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in
+--- kolabd-2.1.99+20080204.dfsg~/kolab_bootstrap.in	2008-02-17 19:22:42.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/kolab_bootstrap.in	2008-02-17 19:23:15.000000000 +0100
+@@ -835,15 +835,6 @@
+   chmod 0600, $kolab_config;
+   kolab_chown "@kolab_musr@","@kolab_mgrp@",$kolab_config;
+ 
+-  print << 'EOS';
+-Now the master server needs to be stopped briefly while the contents of the LDAP database
+-is copied over to this slave. Please make sure that this slave is entered into the list 
+-of kolabhosts on the master before proceeding.
+-EOS
+-  kolab_system("ssh -CA $master_host /etc/init.d/slapd stop");
+-  kolab_system("ssh -CA $master_host @TAR@ -C @ldapserver_statedir@ -pcf - openldap-data | @TAR@ -C @ldapserver_statedir@ -pxf -");
+-  kolab_system("ssh -CA $master_host /etc/init.d/slapd start");
+-
+   # FIXME: we should get rid of this construct because it makes the code hard to read.
+   #        A if (-e @sysconfdir@/rc.conf) statement should be enough.
+   if ("@WITHOPENPKG@" eq "yes") {
+diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in
+--- kolabd-2.1.99+20080204.dfsg~/templates/slapd.conf.template.in	2008-02-17 19:22:42.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/templates/slapd.conf.template.in	2008-02-17 19:23:49.000000000 +0100
+@@ -63,6 +63,23 @@
+         bindmethod=simple 
+ 	credentials=secret
+ 
++#### Provide the modern syncprov/syncrepl method of ldap replication
++# This database is a synchronisation provider
++# Note that a database can be both a consumer and a provider 
++moduleload      syncprov
++overlay syncprov
++# Guarantee that contextCSN gets written.
++#syncprov-checkpoint  1024 16
++# Save a log of last write operations
++syncprov-sessionlog 4096
++# Support delta-based syncrepl
++syncprov-reloadhint TRUE
++# Put an index on attributes used for synchronisation
++# Note that these indexes are used locally both for server and client 
++# during synchronisation.
++index entryCSN eq
++index entryUUID eq
++
+ #### Using overlays to improve data consistency
+ # Ensure that we never get dangling member attributes
+ # Checked on rename and delete


Property changes on: kolabd/branches/2.2/debian/patches/86-slapd-syncrepl-24.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: kolabd/branches/2.2/debian/patches/91-postfix-template.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/91-postfix-template.dpatch	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/patches/91-postfix-template.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -35,24 +35,6 @@
  OWNERSHIP=@emailserver_usr@:@emailserver_grp@
  KOLAB_META_END
  # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
-@@ -91,7 +91,7 @@
-     -o smtpd_hard_error_limit=1000
- kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@kolab_scriptsdir@/kolab_smtpdpolicy 
- 
--kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@PHP@
-+kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
-     -c @phpini_dir@/php.ini
-     -f @resmgr_scriptsdir@/kolabfilter.php 
-     --
-@@ -101,7 +101,7 @@
-     -c ${client_address}
-     -u ${sasl_username}
- 
--kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@PHP@
-+kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
-     -c @phpini_dir@/php.ini
-     -f @resmgr_scriptsdir@/kolabmailboxfilter.php 
-     --
 diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/transport.template.in kolabd-2.1.0-20070510.dfsg/templates/transport.template.in
 --- kolabd-2.1.0-20070510.dfsg~/templates/transport.template.in	2007-01-08 22:28:14.000000000 +0100
 +++ kolabd-2.1.0-20070510.dfsg/templates/transport.template.in	2007-10-19 13:37:42.000000000 +0200

Added: kolabd/branches/2.2/debian/patches/91-postfix-template.dpatch~
===================================================================
--- kolabd/branches/2.2/debian/patches/91-postfix-template.dpatch~	                        (rev 0)
+++ kolabd/branches/2.2/debian/patches/91-postfix-template.dpatch~	2008-02-29 14:58:20 UTC (rev 745)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91-postfix-template.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Adjustments in Postfix templates
+
+ at DPATCH@
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/main.cf.template.in kolabd-2.1.0-20070510.dfsg/templates/main.cf.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/main.cf.template.in	2007-05-09 12:25:06.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/templates/main.cf.template.in	2007-10-19 13:37:42.000000000 +0200
+@@ -19,16 +19,6 @@
+ # we use 20 Mebibyte = 20*2^20 Byte 
+ message_size_limit = 20971520
+ 
+-#   paths
+-command_directory = @sbindir@
+-daemon_directory = @libexecdir@/postfix
+-queue_directory = @emailserver_localstatedir@
+-
+-#   users
+-mail_owner= @emailserver_mail_owner@
+-setgid_group= @emailserver_setgid_grp@
+-default_privs= @emailserver_default_privs@
+-
+ #   local host
+ myhostname = @@@fqdnhostname@@@
+ mydomain = @@@postfix-mydomain@@@
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/master.cf.template.in kolabd-2.1.0-20070510.dfsg/templates/master.cf.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/master.cf.template.in	2006-06-26 18:39:17.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/templates/master.cf.template.in	2007-10-19 13:38:21.000000000 +0200
+@@ -1,6 +1,6 @@
+ KOLAB_META_START
+ TARGET=@emailserver_confdir@/master.cf
+-PERMISSIONS=0640
++PERMISSIONS=0644
+ OWNERSHIP=@emailserver_usr@:@emailserver_grp@
+ KOLAB_META_END
+ # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
+@@ -91,7 +91,7 @@
+     -o smtpd_hard_error_limit=1000
+ kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@kolab_scriptsdir@/kolab_smtpdpolicy 
+ 
+-kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@PHP@
++kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
+     -c @phpini_dir@/php.ini
+-    -f @resmgr_scriptsdir@/kolabfilter.php 
++    -f /usr/share/kolab/filter/kolabfilter.php 
+     --
+@@ -101,7 +101,7 @@
+     -c ${client_address}
+     -u ${sasl_username}
+ 
+-kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@PHP@
++kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
+     -c @phpini_dir@/php.ini
+     -f @resmgr_scriptsdir@/kolabmailboxfilter.php 
+     --
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/transport.template.in kolabd-2.1.0-20070510.dfsg/templates/transport.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/transport.template.in	2007-01-08 22:28:14.000000000 +0100
++++ kolabd-2.1.0-20070510.dfsg/templates/transport.template.in	2007-10-19 13:37:42.000000000 +0200
+@@ -1,6 +1,6 @@
+ KOLAB_META_START
+ TARGET=@emailserver_confdir@/transport
+-PERMISSIONS=0640
++PERMISSIONS=0644
+ OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
+ KOLAB_META_END
+ # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/virtual.template.in kolabd-2.1.0-20070510.dfsg/templates/virtual.template.in
+--- kolabd-2.1.0-20070510.dfsg~/templates/virtual.template.in	2007-01-08 22:28:14.000000000 +0100
++++ kolabd-2.1.0-20070510.dfsg/templates/virtual.template.in	2007-10-19 13:37:42.000000000 +0200
+@@ -1,6 +1,6 @@
+ KOLAB_META_START
+ TARGET=@emailserver_confdir@/virtual
+-PERMISSIONS=0640
++PERMISSIONS=0644
+ OWNERSHIP=@emailserver_tables_usr@:@emailserver_grp@
+ KOLAB_META_END
+ # (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>

Modified: kolabd/branches/2.2/debian/patches/92-resmgr-template.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/92-resmgr-template.dpatch	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/patches/92-resmgr-template.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -4,15 +4,25 @@
 ## DP: Adjustments in resmgr template
 
 @DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/resmgr.conf.template.in kolabd-2.1.0-20070510.dfsg/templates/resmgr.conf.template.in
---- kolabd-2.1.0-20070510.dfsg~/templates/resmgr.conf.template.in	2007-05-08 11:39:04.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg/templates/resmgr.conf.template.in	2007-08-08 15:21:23.000000000 +0200
-@@ -6,7 +6,7 @@
- <?php
+diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/resmgr.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/resmgr.conf.template.in
+--- kolabd-2.1.99+20080204.dfsg~/templates/resmgr.conf.template.in	2007-12-07 16:49:21.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/templates/resmgr.conf.template.in	2008-02-17 23:27:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ KOLAB_META_START
+-TARGET=@resmgr_confdir@/config.php
++TARGET=/etc/kolab/filter_config.php
+ PERMISSIONS=0640
+ OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
+ KOLAB_META_END
+@@ -163,8 +163,8 @@
+  */
+ $conf['log']['enabled']          = true;
+ $conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
+-$conf['log']['type']             = 'file';
+-$conf['log']['name']             = '@resmgr_logdir@/filter.log';
++$conf['log']['type']             = 'syslog';
++$conf['log']['name']             = 'cons, pid';
+ $conf['log']['ident']            = 'Kolab Filter';
+ $conf['log']['params']['append'] = true;
  
- // What is the root directory of our Horde instance?
-- at define('HORDE_BASE', '@webserver_document_root@@webserver_web_prefix@/fbview');
-+ at define('HORDE_BASE', '/usr/share/horde3');
- 
- // What is the address of the Cyrus server where the calendar data is stored?
- $params['server'] = 'localhost';
+

Modified: kolabd/branches/2.2/debian/patches/93-freebusy-template.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/93-freebusy-template.dpatch	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/patches/93-freebusy-template.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -4,17 +4,24 @@
 ## DP: Adjustments in freebusy template
 
 @DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg~/templates/freebusy.conf.template.in kolabd-2.1.0-20070510.dfsg/templates/freebusy.conf.template.in
---- kolabd-2.1.0-20070510.dfsg~/templates/freebusy.conf.template.in	2007-03-02 05:40:21.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/templates/freebusy.conf.template.in	2007-12-28 16:27:14.000000000 +0100
-@@ -81,8 +81,8 @@
- $params['send_content_disposition'] = false;
+diff -urNad kolabd-2.1.99+20080204.dfsg~/templates/freebusy.conf.template.in kolabd-2.1.99+20080204.dfsg/templates/freebusy.conf.template.in
+--- kolabd-2.1.99+20080204.dfsg~/templates/freebusy.conf.template.in	2007-12-07 16:49:21.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/templates/freebusy.conf.template.in	2008-02-17 23:07:26.000000000 +0100
+@@ -1,5 +1,5 @@
+ KOLAB_META_START
+-TARGET=@freebusy_confdir@/config.php
++TARGET=/etc/kolab/freebusy_config.php
+ PERMISSIONS=0640
+ OWNERSHIP=@freebusy_usr@:@freebusy_grp@
+ KOLAB_META_END
+@@ -44,8 +44,8 @@
+ /* Horde::Log configuration */
+ $conf['log']['enabled']          = true;
+ $conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
+-$conf['log']['type']             = 'file';
+-$conf['log']['name']             = '@freebusy_logdir@/freebusy.log';
++$conf['log']['type']             = 'syslog';
++$conf['log']['name']             = 'cons, pid';
+ $conf['log']['ident']            = 'Kolab Free/Busy';
+ $conf['log']['params']['append'] = true;
  
- // Where are we logging to?
--$params['log'] = 'file:@freebusy_logfile@';                // File...
--// $params['log'] = 'syslog:cons, pid';            // Or syslog...
-+// $params['log'] = 'file:@freebusy_logfile@';                // File...
-+$params['log'] = 'syslog:cons, pid';            // Or syslog...
- 
- // What level of output should we log? Higher levels give more verbose output.
- // One of: 0 (RM_LOG_SILENT); 1 (RM_LOG_ERROR); 2 (RM_LOG_WARN); 3 (RM_LOG_INFO) or 4 (RM_LOG_DEBUG).

Modified: kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-02-29 14:58:20 UTC (rev 745)
@@ -5,8 +5,8 @@
 
 @DPATCH@
 diff -urNad kolabd-2.1.0-20070510.dfsg~/dist_conf/debian kolabd-2.1.0-20070510.dfsg/dist_conf/debian
---- kolabd-2.1.0-20070510.dfsg~/dist_conf/debian	2007-12-12 23:41:50.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2007-12-12 23:45:14.000000000 +0100
+--- kolabd-2.1.0-20070510.dfsg~/dist_conf/debian	2007-10-18 11:20:32.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2008-02-13 20:12:29.000000000 +0100
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -29,8 +29,8 @@
  
  BASHELL=/bin/bash
  PERL=${bindir}/perl
-@@ -19,19 +20,19 @@
- pkgdocdir=${datadir}/doc/kolab
+@@ -20,19 +21,19 @@
+ kolabconf_script=${sbindir}/kolabconf
  
  # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 -perllib=${libdir}/perl5
@@ -53,7 +53,7 @@
  
  clamav_confdir=${sysconfdir}/clamav
  clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -52,9 +53,11 @@
+@@ -53,42 +54,45 @@
  emailserver_socket=${libdir}/postfix/lmtp
  emailserver_localstatedir=${localstatedir}/spool/postfix
  emailserver_logfile=${localstatedir}/log/mail.log
@@ -65,10 +65,6 @@
 +emailserver_grp=root
 +emailserver_master_usr=kolab
  
- ftpserver_scoreboardfile=${localstatedir}/proftpd/score
- ftpserver_logfile=${localstatedir}/log/proftpd.log
-@@ -69,36 +72,37 @@
- 
  imap_confdir=${sysconfdir}
  imap_confperm=0640
 -imap_usr=cyrus
@@ -88,9 +84,8 @@
  kolab_pidfile=${sysrundir}/kolab.pid
  kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
 -kolab_scriptsdir=$(sysconfdir)/kolab
--kolab_php_smarty_prefix=Smarty
 +kolab_scriptsdir=${sbindir}
-+kolab_php_smarty_prefix=smarty/libs
+ kolab_php_smarty_prefix=smarty/libs
  
  ldapserver_statedir=${localstatedir}/lib/ldap
  ldapserver_dir=${localstatedir}/lib/ldap
@@ -117,7 +112,7 @@
  webserver_cgidir=${webserver_document_root}/cgi-bin
  webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
  webserver_logdir=${localstatedir}/log/apache2
-@@ -114,28 +118,39 @@
+@@ -104,29 +108,41 @@
  webserver_sslmutex=${sysrundir}/ssl_mutex
  webserver_web_prefix=/kolab
  webserver_musr=kolab
@@ -140,9 +135,10 @@
  resmgr_logfile=${localstatedir}/log/resmgr.log
 -resmgr_confdir=${sysconfdir}/resmgr
 -resmgr_filterdir=${localstatedir}/resmgr/filter
+-resmgr_scriptsdir=${resmgr_confdir}
 +resmgr_confdir=${sysconfdir}/kolab
 +resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
- resmgr_scriptsdir=${resmgr_confdir}
++resmgr_scriptsdir=/usr/share/kolab/filter
 -resmgr_usr=kolab
 -resmgr_grp=kolab-n
 +resmgr_conffile_usr=kolab
@@ -152,7 +148,9 @@
  
  fbview_logfile=${localstatedir}/resmgr/fbview.log
  freebusy_logfile=${localstatedir}/resmgr/freebusy.log
+-freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
 -freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
++freebusy_confdir=${sysconfdir}/kolab
 +freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
 +freebusy_usr=root
 +freebusy_grp=www-data
@@ -166,3 +164,4 @@
 +kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 +
 +aliases_file=${sysconfdir}/aliases
++

Modified: kolabd/branches/2.2/debian/rules
===================================================================
--- kolabd/branches/2.2/debian/rules	2008-02-29 14:51:45 UTC (rev 744)
+++ kolabd/branches/2.2/debian/rules	2008-02-29 14:58:20 UTC (rev 745)
@@ -28,7 +28,6 @@
 	dh_installdirs
 
 	# scripts for /usr/bin and /usr/sbin
-	install -D -m 755 kolabconf debian/kolabd/usr/sbin/kolabconf
 	install -D -m 755 kolabd debian/kolabd/usr/sbin/kolabd
 	install -D -m 755 kolabcheckperm debian/kolabd/usr/sbin/kolabcheckperm
 	install -D -m 755 kolabpasswd debian/kolabd/usr/bin/kolabpasswd
@@ -38,6 +37,8 @@
 	install -D -m 755 kolabquotawarn debian/kolabd/usr/sbin/kolabquotawarn
 	install -D -m 755 kolab_smtpdpolicy debian/kolabd/usr/sbin/kolab_smtpdpolicy
 	install -D -m 755 kolab_bootstrap debian/kolabd/usr/sbin/kolab_bootstrap
+	install -D -m 755 kolabdcachetool debian/kolabd/usr/sbin/kolabdcachetool
+	install -D -m 755 kolabquotareport debian/kolabd/usr/sbin/kolabquotareport
 
 	# Files for /etc/kolab
 	install -D -m 640 kolab.conf debian/kolabd/etc/kolab/kolab.conf
@@ -51,7 +52,7 @@
 
 	# Kolab bootstrapping templates
 	for i in templates/*.template ; do install -D -m 644 $$i debian/kolabd/etc/kolab/$$i ; done
-	rm $(addprefix debian/kolabd/etc/kolab/templates/,amavisd.* clamd.* cyrus.* freshclam.* httpd.* proftpd.* session_vars.*)
+	rm $(addprefix debian/kolabd/etc/kolab/templates/,amavisd.* clamd.* cyrus.* freshclam.* httpd.* session_vars.*)
 
 	# LDAP files
 	install -D -m 644 horde.schema debian/kolabd/usr/share/kolabd/schema/horde.schema

Modified: libkolab-perl/branches/2.2/debian/changelog
===================================================================
--- libkolab-perl/branches/2.2/debian/changelog	2008-02-29 14:51:45 UTC (rev 744)
+++ libkolab-perl/branches/2.2/debian/changelog	2008-02-29 14:58:20 UTC (rev 745)
@@ -1,3 +1,14 @@
+libkolab-perl (5.8.7-20080204-1) unstable; urgency=low
+
+  * New upstream version 
+  * use the new Makefile.PL, and drop ./configure way
+  * Add libnet-ldap-perl in Build-Depends as kolab.pm needs it
+  * disable patch 10-Kolab.pm, gone in kolabconf (30-invoke-rc)
+  * disable patch 20-buildCyrusConfig, function is missing
+  * disable patch 40-dist_conf, dist_conf has gone
+
+ -- Mathieu PARENT <math.parent at gmail.com>  Wed, 13 Feb 2008 23:26:27 +0100
+
 libkolab-perl (5.8.7-20070420-2) unstable; urgency=low
 
   * Removed no longer necessary parts from 10-Kolab.pm.dpatch

Modified: libkolab-perl/branches/2.2/debian/control
===================================================================
--- libkolab-perl/branches/2.2/debian/control	2008-02-29 14:51:45 UTC (rev 744)
+++ libkolab-perl/branches/2.2/debian/control	2008-02-29 14:58:20 UTC (rev 745)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 4), dpatch
+Build-Depends: debhelper (>= 4), dpatch, libnet-ldap-perl
 Standards-Version: 3.7.2
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/libkolab-perl/
 XS-Vcs-Svn: svn://svn.debian.org/pkg-kolab/libkolab-perl/

Modified: libkolab-perl/branches/2.2/debian/patches/00list
===================================================================
--- libkolab-perl/branches/2.2/debian/patches/00list	2008-02-29 14:51:45 UTC (rev 744)
+++ libkolab-perl/branches/2.2/debian/patches/00list	2008-02-29 14:58:20 UTC (rev 745)
@@ -1,3 +1,3 @@
-10-Kolab.pm
-20-buildCyrusConfig
-40-dist_conf
+#10-Kolab.pm
+#20-buildCyrusConfig
+#40-dist_conf

Modified: libkolab-perl/branches/2.2/debian/rules
===================================================================
--- libkolab-perl/branches/2.2/debian/rules	2008-02-29 14:51:45 UTC (rev 744)
+++ libkolab-perl/branches/2.2/debian/rules	2008-02-29 14:58:20 UTC (rev 745)
@@ -2,10 +2,10 @@
 
 include /usr/share/dpatch/dpatch.make
 
-config.status: configure patch-stamp
+config.status: patch-stamp
 	dh_testdir
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --with-dist=debian
-
+	perl Makefile.PL
+	
 build: build-stamp
 build-stamp:  config.status
 	dh_testdir




More information about the pkg-kolab-devel mailing list