[pkg-kolab] r951 - in kolabconf/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-10-14 17:57:02 +0000 (Tue, 14 Oct 2008)
New Revision: 951

Modified:
   kolabconf/trunk/debian/changelog
   kolabconf/trunk/debian/patches/30-invoke-rc.dpatch
Log:
change imapd service path in 30-invoke-rc patch


Modified: kolabconf/trunk/debian/changelog
===================================================================
--- kolabconf/trunk/debian/changelog	2008-10-14 17:13:58 UTC (rev 950)
+++ kolabconf/trunk/debian/changelog	2008-10-14 17:57:02 UTC (rev 951)
@@ -3,8 +3,9 @@
   * Updated 85-slapd-syncrepl-24.dpatch to match current upstream proposed
     patch
   * make dependencies stronger 
+  * change imapd service path in 30-invoke-rc patch
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 28 Sep 2008 20:56:14 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 14 Oct 2008 19:54:30 +0200
 
 kolabconf (2.2.0-1) unstable; urgency=low
 

Modified: kolabconf/trunk/debian/patches/30-invoke-rc.dpatch
===================================================================
--- kolabconf/trunk/debian/patches/30-invoke-rc.dpatch	2008-10-14 17:13:58 UTC (rev 950)
+++ kolabconf/trunk/debian/patches/30-invoke-rc.dpatch	2008-10-14 17:57:02 UTC (rev 951)
@@ -4,10 +4,10 @@
 ## DP: Debian specific invocation of services
 
 @DPATCH@
-diff -urNad kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm
---- kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm	2008-02-17 21:22:21.000000000 +0100
-+++ kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm	2008-02-17 21:26:05.000000000 +0100
-@@ -724,22 +724,22 @@
+diff -urNad kolabconf-2.2.0~/lib/Kolab/Conf.pm kolabconf-2.2.0/lib/Kolab/Conf.pm
+--- kolabconf-2.2.0~/lib/Kolab/Conf.pm	2008-10-14 19:50:45.000000000 +0200
++++ kolabconf-2.2.0/lib/Kolab/Conf.pm	2008-10-14 19:51:43.000000000 +0200
+@@ -724,38 +724,28 @@
  {
      if ($haschanged{'slapd'}) {
          &Kolab::log('K', 'Restarting OpenLDAP...');
@@ -34,10 +34,11 @@
      }
  
      if ($haschanged{'imapd'}) {
-@@ -748,16 +748,6 @@
-         system("$Kolab::config{'KOLABRC'} rc imapd restart");
-     }
- 
+         &Kolab::log('K', 'Restarting imapd...');
+ 	# Would it be enough with a reload here? /steffen
+-        system("$Kolab::config{'KOLABRC'} rc imapd restart");
+-    }
+-
 -    if ($haschanged{'amavisd'}) {
 -        &Kolab::log('K', 'Restarting amavisd...');
 -        system("$Kolab::config{'KOLABRC'} rc amavisd restart");
@@ -46,8 +47,7 @@
 -    if ($haschanged{'clamav'}) {
 -        &Kolab::log('K', 'Restarting clamav...');
 -        system("$Kolab::config{'KOLABRC'} rc clamav restart");
--    }
--
++        system("invoke-rc.d kolab-cyrus restart");
+     }
+ 
      %Kolab::Conf::haschanged = ();
- 
-     &Kolab::log('K', 'Reload finished');