[pkg-kolab] r750 - in kolab-webadmin: branches/2.2/debian/patches/common trunk/debian/patches/common

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-02-29 16:41:18 +0000 (Fri, 29 Feb 2008)
New Revision: 750

Modified:
   kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
   kolab-webadmin/trunk/debian/patches/common/dist_conf.dpatch
Log:
Patch was not applied at the right place


Modified: kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-02-29 16:24:16 UTC (rev 749)
+++ kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-02-29 16:41:18 UTC (rev 750)
@@ -4,9 +4,9 @@
 ## DP: Adjusts some paths
 
 @DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg~/dist_conf/debian kolabd-2.1.0-20070510.dfsg/dist_conf/debian
---- kolabd-2.1.0-20070510.dfsg~/dist_conf/debian	2007-10-18 11:20:32.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2008-02-13 20:12:29.000000000 +0100
+diff -urNad kolab-webadmin-2.1.99+20080204~/dist_conf/debian kolab-webadmin-2.1.99+20080204/dist_conf/debian
+--- kolab-webadmin-2.1.99+20080204~/dist_conf/debian	2008-02-29 17:18:30.000000000 +0100
++++ kolab-webadmin-2.1.99+20080204/dist_conf/debian	2008-02-29 17:21:20.000000000 +0100
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -112,9 +112,12 @@
  webserver_cgidir=${webserver_document_root}/cgi-bin
  webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
  webserver_logdir=${localstatedir}/log/apache2
-@@ -104,29 +108,41 @@
+@@ -102,31 +106,43 @@
+ webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
+ webserver_sslscache=${sysrundir}/ssl_scache
  webserver_sslmutex=${sysrundir}/ssl_mutex
- webserver_web_prefix=/kolab
+-webserver_web_prefix=/kolab
++webserver_web_prefix=
  webserver_musr=kolab
 -webserver_usr=wwwrun
 -webserver_grp=www

Modified: kolab-webadmin/trunk/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/common/dist_conf.dpatch	2008-02-29 16:24:16 UTC (rev 749)
+++ kolab-webadmin/trunk/debian/patches/common/dist_conf.dpatch	2008-02-29 16:41:18 UTC (rev 750)
@@ -4,9 +4,9 @@
 ## DP: Adjusts some paths
 
 @DPATCH@
-diff -urNad kolab-webadmin-2.1.99+20080204~/dist_conf/debian kolab-webadmin-2.1.99+20080204/dist_conf/debian
---- kolab-webadmin-2.1.99+20080204~/dist_conf/debian	2008-02-29 17:18:30.000000000 +0100
-+++ kolab-webadmin-2.1.99+20080204/dist_conf/debian	2008-02-29 17:21:20.000000000 +0100
+diff -urNad kolab-webadmin-2.1.0-20070510~/dist_conf/debian kolab-webadmin-2.1.0-20070510/dist_conf/debian
+--- kolab-webadmin-2.1.0-20070510~/dist_conf/debian	2008-02-22 17:21:05.000000000 +0100
++++ kolab-webadmin-2.1.0-20070510/dist_conf/debian	2008-02-22 17:22:20.000000000 +0100
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -29,8 +29,8 @@
  
  BASHELL=/bin/bash
  PERL=${bindir}/perl
-@@ -20,19 +21,19 @@
- kolabconf_script=${sbindir}/kolabconf
+@@ -19,19 +20,19 @@
+ pkgdocdir=${datadir}/doc/kolab
  
  # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 -perllib=${libdir}/perl5
@@ -53,7 +53,7 @@
  
  clamav_confdir=${sysconfdir}/clamav
  clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -53,42 +54,45 @@
+@@ -52,9 +53,11 @@
  emailserver_socket=${libdir}/postfix/lmtp
  emailserver_localstatedir=${localstatedir}/spool/postfix
  emailserver_logfile=${localstatedir}/log/mail.log
@@ -65,6 +65,10 @@
 +emailserver_grp=root
 +emailserver_master_usr=kolab
  
+ ftpserver_scoreboardfile=${localstatedir}/proftpd/score
+ ftpserver_logfile=${localstatedir}/log/proftpd.log
+@@ -69,36 +72,39 @@
+ 
  imap_confdir=${sysconfdir}
  imap_confperm=0640
 -imap_usr=cyrus
@@ -84,8 +88,11 @@
  kolab_pidfile=${sysrundir}/kolab.pid
  kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
 -kolab_scriptsdir=$(sysconfdir)/kolab
+-kolab_php_smarty_prefix=Smarty
 +kolab_scriptsdir=${sbindir}
- kolab_php_smarty_prefix=smarty/libs
++kolab_php_smarty_prefix=smarty/libs
++
++kolab_php_module_prefix=kolab/
  
  ldapserver_statedir=${localstatedir}/lib/ldap
  ldapserver_dir=${localstatedir}/lib/ldap
@@ -112,12 +119,9 @@
  webserver_cgidir=${webserver_document_root}/cgi-bin
  webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
  webserver_logdir=${localstatedir}/log/apache2
-@@ -102,31 +106,43 @@
- webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
- webserver_sslscache=${sysrundir}/ssl_scache
+@@ -114,28 +120,39 @@
  webserver_sslmutex=${sysrundir}/ssl_mutex
--webserver_web_prefix=/kolab
-+webserver_web_prefix=
+ webserver_web_prefix=/kolab
  webserver_musr=kolab
 -webserver_usr=wwwrun
 -webserver_grp=www
@@ -150,9 +154,7 @@
  
  fbview_logfile=${localstatedir}/resmgr/fbview.log
  freebusy_logfile=${localstatedir}/resmgr/freebusy.log
--freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
 -freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
-+freebusy_confdir=${sysconfdir}/kolab
 +freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
 +freebusy_usr=root
 +freebusy_grp=www-data
@@ -166,4 +168,3 @@
 +kolab_smtpdpolicy_conffile_grp=${kolab_grp}
 +
 +aliases_file=${sysconfdir}/aliases
-+