[pkg-kolab] r1051 - in libkolab-perl/branches/2.2.1/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-16 21:03:44 +0000 (Tue, 16 Dec 2008)
New Revision: 1051

Added:
   libkolab-perl/branches/2.2.1/debian/patches/10-invoke-rc.diff
Modified:
   libkolab-perl/branches/2.2.1/debian/changelog
   libkolab-perl/branches/2.2.1/debian/control
   libkolab-perl/branches/2.2.1/debian/patches/series
Log:
Integrated kolabconf


Modified: libkolab-perl/branches/2.2.1/debian/changelog
===================================================================
--- libkolab-perl/branches/2.2.1/debian/changelog	2008-12-16 19:45:23 UTC (rev 1050)
+++ libkolab-perl/branches/2.2.1/debian/changelog	2008-12-16 21:03:44 UTC (rev 1051)
@@ -8,9 +8,16 @@
   * debian/rules:
     - taken manpage for undocumented (s)bin from kolabd
     - makefile parameters 
+  * kolabconf package integrated:
+   - added versioned conflicts 
+   - removed 10-kolabconf-perl-path.diff
+   - imported 30-invoke-rc.diff (now 10-invoke-rc)
+   - removed 85-slapd-syncrepl-24.diff, integrated upstream
+   - removed 95-runonchange.diff, integrated upstream
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 20:12:18 +0100
 
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 21:57:20 +0100
+
 libkolab-perl (1:2.2.0-4) UNRELEASED; urgency=low
 
   * added hidden debian/watch for beta and dev

Modified: libkolab-perl/branches/2.2.1/debian/control
===================================================================
--- libkolab-perl/branches/2.2.1/debian/control	2008-12-16 19:45:23 UTC (rev 1050)
+++ libkolab-perl/branches/2.2.1/debian/control	2008-12-16 21:03:44 UTC (rev 1051)
@@ -12,6 +12,9 @@
 
 Package: libkolab-perl
 Architecture: all
+Provides: kolabconf (<=2.2.1~)
+Conflicts: kolabconf (<=2.2.1~)
+Replaces: kolabconf (<=2.2.1~)
 Depends: ${perl:Depends}, libconvert-asn1-perl, libmail-imapclient-perl, libmime-tools-perl, libnet-ldap-perl (>= 1:0.39-1), liburi-perl, kolab-libcyrus-imap-perl
 Description: Perl modules for Kolab
  Kolab is a secure, scalable, and reliable groupware server.  It consists

Copied: libkolab-perl/branches/2.2.1/debian/patches/10-invoke-rc.diff (from rev 1037, kolabconf/trunk/debian/patches/30-invoke-rc.diff)
===================================================================
--- libkolab-perl/branches/2.2.1/debian/patches/10-invoke-rc.diff	                        (rev 0)
+++ libkolab-perl/branches/2.2.1/debian/patches/10-invoke-rc.diff	2008-12-16 21:03:44 UTC (rev 1051)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-invoke-rc.dpatch by  <math.parent at gmail.com>
+##
+## DP: Debian specific invocation of services
+
+ at DPATCH@
+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...');
+-        system("$Kolab::config{'KOLABRC'} rc openldap restart &");
++        system("invoke-rc.d slapd restart &");
+     }
+ 
+     if ($haschanged{'saslauthd'}) {
+         &Kolab::log('K', 'Restarting SASLAuthd...');
+-        system("$Kolab::config{'KOLABRC'} rc sasl stop; sleep 1; $Kolab::config{sbindir}/saslauthd -a ldap -n 5");
++        system("invoke-rc.d saslauthd restart");
+     }
+ 
+     if ($haschanged{'apache'}) {
+         &Kolab::log('K', 'Reloading Apache...');
+-        system("$Kolab::config{sbindir}/apachectl graceful");
++        system("invoke-rc.d apache2 graceful");
+     }
+ 
+     if ($haschanged{'postfix'}) {
+         &Kolab::log('K', 'Reloading Postfix...');
+-        system("$Kolab::config{sbindir}/postfix reload");
++        system("invoke-rc.d postfix reload");
+     }
+ 
+     if ($haschanged{'imapd'}) {
+         &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");
+-    }
+-
+-    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 = ();

Modified: libkolab-perl/branches/2.2.1/debian/patches/series
===================================================================
--- libkolab-perl/branches/2.2.1/debian/patches/series	2008-12-16 19:45:23 UTC (rev 1050)
+++ libkolab-perl/branches/2.2.1/debian/patches/series	2008-12-16 21:03:44 UTC (rev 1051)
@@ -1,3 +1,4 @@
+10-invoke-rc.diff
 30-bootstrap.diff 
 40-disable-amavis.diff