[pkg-kolab] r774 - in libkolab-perl/branches/2.2/debian: . patches

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Sat Mar 29 11:07:48 UTC 2008


Author: mparent-guest
Date: 2008-03-29 11:07:47 +0000 (Sat, 29 Mar 2008)
New Revision: 774

Removed:
   libkolab-perl/branches/2.2/debian/patches/10-Kolab.pm.dpatch
   libkolab-perl/branches/2.2/debian/patches/20-buildCyrusConfig.dpatch
   libkolab-perl/branches/2.2/debian/patches/40-dist_conf.dpatch
Modified:
   libkolab-perl/branches/2.2/debian/changelog
   libkolab-perl/branches/2.2/debian/patches/00list
Log:
* Added FDS Backend
* Removed unused patches


Modified: libkolab-perl/branches/2.2/debian/changelog
===================================================================
--- libkolab-perl/branches/2.2/debian/changelog	2008-03-27 14:42:19 UTC (rev 773)
+++ libkolab-perl/branches/2.2/debian/changelog	2008-03-29 11:07:47 UTC (rev 774)
@@ -1,3 +1,10 @@
+libkolab-perl (5.8.7-20080314-2) UNRELEASED; urgency=low
+
+  * Added FDS LDAP Backend, for persistent searches (OpenLDAP 2.4 doesn't have
+    slurpd anymore)
+
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 29 Mar 2008 12:05:50 +0100
+
 libkolab-perl (5.8.7-20080314-1) UNRELEASED; urgency=low
 
   * New upstream version: 2.2rc2

Modified: libkolab-perl/branches/2.2/debian/patches/00list
===================================================================
--- libkolab-perl/branches/2.2/debian/patches/00list	2008-03-27 14:42:19 UTC (rev 773)
+++ libkolab-perl/branches/2.2/debian/patches/00list	2008-03-29 11:07:47 UTC (rev 774)
@@ -1,3 +1 @@
-#10-Kolab.pm
-#20-buildCyrusConfig
-#40-dist_conf
+90-fds-backend

Deleted: libkolab-perl/branches/2.2/debian/patches/10-Kolab.pm.dpatch
===================================================================
--- libkolab-perl/branches/2.2/debian/patches/10-Kolab.pm.dpatch	2008-03-27 14:42:19 UTC (rev 773)
+++ libkolab-perl/branches/2.2/debian/patches/10-Kolab.pm.dpatch	2008-03-29 11:07:47 UTC (rev 774)
@@ -1,62 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-diff -urNad libkolab-perl-5.8.7-20070420~/Kolab/Kolab.pm.in libkolab-perl-5.8.7-20070420/Kolab/Kolab.pm.in
---- libkolab-perl-5.8.7-20070420~/Kolab/Kolab.pm.in	2007-07-27 19:17:42.000000000 +0200
-+++ libkolab-perl-5.8.7-20070420/Kolab/Kolab.pm.in	2007-07-27 19:17:44.000000000 +0200
-@@ -399,50 +399,28 @@
- {
-     if ($haschanged{'slapd'}) {
-         &log('K', 'Restarting OpenLDAP...');
--        system("@KOLABRC@ rc openldap restart &");
-+        system("invoke-rc.d slapd restart &");
-     }
- 
-     if ($haschanged{'saslauthd'}) {
-         &log('K', 'Restarting SASLAuthd...');
--        system("@KOLABRC@ rc sasl stop; sleep 1; @sbindir@/saslauthd -a ldap -n 5");
-+        system("invoke-rc.d saslauthd restart");
-     }
- 
-     if ($haschanged{'apache'}) {
-         &log('K', 'Reloading Apache...');
--        system("@sbindir@/apachectl graceful");
-+        system("invoke-rc.d apache2 graceful");
-     }
- 
-     if ($haschanged{'postfix'}) {
-         &log('K', 'Reloading Postfix...');
--        system("@sbindir@/postfix reload");
-+        system("invoke-rc.d postfix reload");
-     }
- 
-     if ($haschanged{'imapd'}) {
-         &log('K', 'Restarting imapd...');
- 	# Would it be enough with a reload here? /steffen
--        system("@KOLABRC@ rc imapd restart");
--    }
--
--    if ($haschanged{'amavisd'}) {
--        &log('K', 'Restarting amavisd...');
--        system("@KOLABRC@ rc amavisd restart");
--    }
--
--    if ($haschanged{'clamav'}) {
--        &log('K', 'Restarting clamav...');
--        system("@KOLABRC@ rc clamav restart");
--    }
--
--    if ($config{'proftpd-ftp'} =~ /true/i) {
--        Kolab::log('K', 'Starting ProFTPd if not running');
--        system("@KOLABRC@ rc proftpd start");
--        if ($haschanged{'proftpd'}) {
--            &log('K', 'Reloading ProFTPd...');
--            kill('SIGHUP', `cat @ftpserver_pidfile@`);
--        }
--    } else {
--        &log('K', 'Stopping ProFTPd, if running...');
--        system("@KOLABRC@ rc proftpd stop");
-+        system("invoke-rc.d kolab-cyrus restart");
-     }
- 
-     %Kolab::Conf::haschanged = ();

Deleted: libkolab-perl/branches/2.2/debian/patches/20-buildCyrusConfig.dpatch
===================================================================
--- libkolab-perl/branches/2.2/debian/patches/20-buildCyrusConfig.dpatch	2008-03-27 14:42:19 UTC (rev 773)
+++ libkolab-perl/branches/2.2/debian/patches/20-buildCyrusConfig.dpatch	2008-03-29 11:07:47 UTC (rev 774)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-cyrusBuildConfig.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Disables buildCyrusConfig function, because we don't want to provide the
-## DP: necessary template files.  This unbreaks kolabconf.
-
- at DPATCH@
-diff -urNad libkolab-perl-5.8.7-20070420~/Kolab-Conf/Conf.pm.in libkolab-perl-5.8.7-20070420/Kolab-Conf/Conf.pm.in
---- libkolab-perl-5.8.7-20070420~/Kolab-Conf/Conf.pm.in	2007-01-06 22:36:20.000000000 +0100
-+++ libkolab-perl-5.8.7-20070420/Kolab-Conf/Conf.pm.in	2007-07-27 19:29:00.000000000 +0200
-@@ -434,6 +434,7 @@
- 
- sub buildCyrusConfig
- {
-+    return; # not used on Debian
-     Kolab::log('T', 'Building Cyrus config', KOLAB_DEBUG);
- 
-     my $keytemplate = "$templatedir/cyrus.conf.template";

Deleted: libkolab-perl/branches/2.2/debian/patches/40-dist_conf.dpatch
===================================================================
--- libkolab-perl/branches/2.2/debian/patches/40-dist_conf.dpatch	2008-03-27 14:42:19 UTC (rev 773)
+++ libkolab-perl/branches/2.2/debian/patches/40-dist_conf.dpatch	2008-03-29 11:07:47 UTC (rev 774)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-dist_conf.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjusts some paths
-
- at DPATCH@
-diff -urNad libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865~/dist_conf/debian libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865/dist_conf/debian
---- libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865~/dist_conf/debian	2007-04-20 17:08:22.000000000 +0200
-+++ libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865/dist_conf/debian	2007-06-19 16:58:28.000000000 +0200
-@@ -19,7 +19,7 @@
- pkgdocdir=${datadir}/doc/kolab
- 
- # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
--perllib=${libdir}/perl5
-+perllib=/usr/share/perl5
- 
- amavisd_conffile=${sysconfdir}/amavis/conf.d
- amavisd_templatedir=${sysconfdir}/amavis/conf.d




More information about the pkg-kolab-devel mailing list