[pkg-kolab] r1003 - in kolabd/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-11-18 18:20:46 +0000 (Tue, 18 Nov 2008)
New Revision: 1003

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/dirs
   kolabd/trunk/debian/patches/30-bootstrap.diff
Log:
Create /var/backups/kolab on package installation. Reduce the bootstrap patch.


Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2008-11-18 18:12:03 UTC (rev 1002)
+++ kolabd/trunk/debian/changelog	2008-11-18 18:20:46 UTC (rev 1003)
@@ -8,8 +8,10 @@
   * refreshed patches, use quilt headers
   * debian/rules, debian/patches/90-slapd-template.diff, debian/dirs:
     move LDAP schemas to /etc/ldap/schema 
+  * debian/patches/30-bootstrap.diff, debian/dirs: Create /var/backups/kolab
+    on package installation. Reduce the bootstrap patch.
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 18 Nov 2008 19:08:20 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 18 Nov 2008 19:17:25 +0100
 
 kolabd (2.2.0-20080709.dfsg-1) unstable; urgency=low
 

Modified: kolabd/trunk/debian/dirs
===================================================================
--- kolabd/trunk/debian/dirs	2008-11-18 18:12:03 UTC (rev 1002)
+++ kolabd/trunk/debian/dirs	2008-11-18 18:20:46 UTC (rev 1003)
@@ -1,4 +1,5 @@
 var/lib/kolab
+var/backups/kolab
 etc/kolab/filter
 etc/kolab/freebusy
 etc/amavis/conf.d

Modified: kolabd/trunk/debian/patches/30-bootstrap.diff
===================================================================
--- kolabd/trunk/debian/patches/30-bootstrap.diff	2008-11-18 18:12:03 UTC (rev 1002)
+++ kolabd/trunk/debian/patches/30-bootstrap.diff	2008-11-18 18:20:46 UTC (rev 1003)
@@ -8,14 +8,6 @@
 ===================================================================
 --- a/kolab_bootstrap.in
 +++ b/kolab_bootstrap.in
-@@ -22,6 +22,7 @@
- use Net::LDAP::Entry;
- use Net::Netmask;
- use File::Copy;
-+use File::Path;
- use Getopt::Std;
- use Term::ReadKey;
- use Time::Local;
 @@ -69,7 +70,7 @@
      print ("Error: Found $name running on Port $port\n");
      print ("Check your installation!\n");
@@ -34,15 +26,6 @@
  if ($?==0) {
    print ("\nFound existing configuration\n");
    print "\nBootstrapping Kolab will overwrite old configuration\n";
-@@ -203,7 +204,7 @@
-   }
-   my $epochseconds = timelocal(gmtime);
-   my $backupdir="@backupdir@/backup".$epochseconds;
--  mkdir($backupdir,0700) || die "cannot mkdir : $!";
-+  mkpath($backupdir,0,0700) || die "cannot mkpath : $!";
- 
-   print "creating backup of LDAP repository\n";
-   system("cp -pRP \"@ldapserver_dir@\" \"$backupdir/openldap-data\"");
 @@ -375,8 +376,23 @@
    };