[pkg-kolab] r600 - kolab-cyrus-imapd/trunk/debian kolab-resource-handlers/trunk/debian kolab-resource-handlers/trunk/debian/patches kolabd/trunk/debian

[opensides-guest at alioth.debian.org]

Author: opensides-guest
Date: 2007-06-06 10:56:40 +0000 (Wed, 06 Jun 2007)
New Revision: 600

Modified:
   kolab-cyrus-imapd/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
   kolabd/trunk/debian/changelog
Log:
Corrected 10-resmgr.conf.dpatch
Added debian/changelog entries



Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog	2007-06-05 22:01:39 UTC (rev 599)
+++ kolab-cyrus-imapd/trunk/debian/changelog	2007-06-06 10:56:40 UTC (rev 600)
@@ -1,3 +1,9 @@
+kolab-cyrus-imapd (2.2.13-4) unstable; urgency=low
+
+  * Changed the order of the admins in cyrus.conf
+
+ -- Benoit Mortier <benoit.mortier at opensides.be>  Wed, 06 Jun 2007 12:52:00 +0100
+
 kolab-cyrus-imapd (2.2.13-3) unstable; urgency=low
 
   * Synced against cyrus-imapd package (closes: #410347, #416914)

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-06-05 22:01:39 UTC (rev 599)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-06-06 10:56:40 UTC (rev 600)
@@ -1,3 +1,13 @@
+kolab-resource-handlers (0.3.9-20060811-5) unstable; urgency=low
+
+  [ Benoit Mortier ]
+  * Corrected freebusy.conf to be the same as in README.Debian
+  * Corrected freebusy.conf home_server parameter
+  * Corrected resmgr.conf pfb url
+  * Corrected bind_pw and calendar_pass to match example in README.Debian 
+
+ -- Benoit Mortier <benoit.mortier at opensides.be>  Wed, 6 June 2007 12:21:00 +0100
+
 kolab-resource-handlers (0.3.9-20060811-4) unstable; urgency=low
 
   [ Peter Eisentraut ]

Modified: kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-06-05 22:01:39 UTC (rev 599)
+++ kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-06-06 10:56:40 UTC (rev 600)
@@ -1,13 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-resmgr.conf.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Here we correct the pathes of the conffile
-## DP: We also correct to PASSWORD entries to match documentation
-## DP: We also correct the freebusy url
-
- at DPATCH@
---- resmgr.conf.orig	2006-08-11 15:50:46.000000000 +0200
-+++ resmgr.conf	2007-06-05 23:51:37.000000000 +0200
+--- resmgr.conf.orig	2007-06-06 12:13:48.000000000 +0200
++++ resmgr.conf	2007-06-06 12:13:56.000000000 +0200
 @@ -2,7 +2,7 @@
  // Example conf file for resmgr!
  
@@ -46,7 +38,7 @@
  
  // What is the name of the users' calendar mailbox?
  $params['calendar_store'] = 'Calendar';
-@@ -66,13 +66,13 @@
+@@ -66,7 +66,7 @@
  $params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.ifb';
   
  // PFB url to trigger creation of pfb
@@ -54,13 +46,9 @@
 +$params['pfb_trigger_url'] = 'http://kolab.example.com/freebusy/trigger/${USER}/${FOLDER}.xpfb';
  
  // Where are we logging to?
--$params['log'] = 'file:/kolab/var/resmgr/resmgr.log';                // File...
-+$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'] = 'file:/kolab/var/resmgr/resmgr.log';                // File...
+@@ -77,4 +77,3 @@
  $params['log_level'] = RM_LOG_DEBUG;
--?>
-\ Pas de fin de ligne à la fin du fichier.
-+?>
+ ?>
+ 
+-

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2007-06-05 22:01:39 UTC (rev 599)
+++ kolabd/trunk/debian/changelog	2007-06-06 10:56:40 UTC (rev 600)
@@ -1,3 +1,12 @@
+kolabd (1.9.4-20060707.dfsg-5) unstable; urgency=low
+
+  [ Benoit Mortier ]
+  * Corrected README.Debian part 7 Resource manager
+  * Added an explanation in README.Debian when transport_maps is no needed
+    in postfix
+
+ -- Benoit Mortier <benoit.mortier at opensides.be>  Wed, 06 Jun 2007 12:35:00 +0100
+
 kolabd (1.9.4-20060707.dfsg-4) unstable; urgency=low
 
   [ Steffen Joeris ]