[pkg-kolab] r68 - trunk/kolabd/debian/patches

[Steffen Joeris]

Author: white-guest
Date: 2006-01-04 11:30:20 +0000 (Wed, 04 Jan 2006)
New Revision: 68

Modified:
   trunk/kolabd/debian/patches/10-perl-path-fixes.dpatch
Log:
* modify patch for kolab_bootstrap


Modified: trunk/kolabd/debian/patches/10-perl-path-fixes.dpatch
===================================================================
--- trunk/kolabd/debian/patches/10-perl-path-fixes.dpatch	2006-01-04 10:53:29 UTC (rev 67)
+++ trunk/kolabd/debian/patches/10-perl-path-fixes.dpatch	2006-01-04 11:30:20 UTC (rev 68)
@@ -47,14 +47,6 @@
  
  ##
  ##  Copyright (c) 2003  Code Fusion cc
---- kolabd-1.9.4/kolab_bootstrap.orig	2005-12-16 15:15:39.000000000 +0100
-+++ kolabd-1.9.4/kolab_bootstrap	2005-12-16 15:15:45.000000000 +0100
-@@ -1,4 +1,4 @@
--#!@l_prefix@/bin/perl
-+#!/usr/bin/perl
- 
- # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
- # (c) 2003,2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 --- kolabd-1.9.4/kolabconf.orig	2005-12-16 15:16:42.000000000 +0100
 +++ kolabd-1.9.4/kolabconf	2005-12-16 15:16:48.000000000 +0100
 @@ -1,4 +1,4 @@
@@ -202,3 +194,51 @@
  
  ##
  ##  Copyright (c) 2004 Klarälvdalens Datakonsult AB
+--- kolabd-1.9.4/kolab_bootstrap.orig	2006-01-04 11:26:17.000000000 +0100
++++ kolabd-1.9.4/kolab_bootstrap	2006-01-04 11:27:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!@l_prefix@/bin/perl
++#!/usr/bin/perl
+ 
+ # (c) 2004 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ # (c) 2003,2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+@@ -27,7 +27,7 @@
+ use Time::Local;
+ use Time::localtime;
+ 
+-my $kolab_prefix = "@l_prefix@";
++my $kolab_prefix = "";
+ my $kolab_config = $kolab_prefix."/etc/kolab/kolab.conf";
+ my %kolab_config;
+ 
+@@ -593,8 +593,8 @@
+   if( lc $tmp eq 'n' ) {
+     print <<'EOS';
+ Skipping certificate creation. Please copy your certificate to
+- at l_prefix@/etc/kolab/cert.pem and private key to
+- at l_prefix@/etc/kolab/key.pem when the bootstrap script is finished.
++/etc/kolab/cert.pem and private key to
++/etc/kolab/key.pem when the bootstrap script is finished.
+ 
+ EOS
+   } else {
+@@ -615,7 +615,7 @@
+ ################################################################################
+ CA and certificate creation complete.
+ 
+-You can install @l_prefix@/etc/kolab/ca/cacert.pem on your clients to allow them
++You can install /etc/kolab/ca/cacert.pem on your clients to allow them
+ to verify the validity of your server certificates.
+ 
+ EOS
+@@ -773,8 +773,8 @@
+   if( lc $tmp eq 'n' ) {
+     print <<'EOS';
+ Skipping certificate creation. Please copy your certificate to
+- at l_prefix@/etc/kolab/cert.pem and private key to
+- at l_prefix@/etc/kolab/key.pem when the bootstrap script is finished.
++/etc/kolab/cert.pem and private key to
++/etc/kolab/key.pem when the bootstrap script is finished.
+ 
+ EOS
+   } else {