[pkg-kolab] r870 - in kolab-webadmin/branches/2.2/debian: . patches patches/common

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Sun May 25 13:31:48 UTC 2008


Author: mparent-guest
Date: 2008-05-25 13:31:43 +0000 (Sun, 25 May 2008)
New Revision: 870

Modified:
   kolab-webadmin/branches/2.2/debian/changelog
   kolab-webadmin/branches/2.2/debian/patches/10-fix-require.dpatch
   kolab-webadmin/branches/2.2/debian/patches/20-service_index.dpatch
   kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
   kolab-webadmin/branches/2.2/debian/rules
Log:
New upstream rc.
Use the new smarty_compiledir dist_conf parameter.


Modified: kolab-webadmin/branches/2.2/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2/debian/changelog	2008-05-25 13:28:28 UTC (rev 869)
+++ kolab-webadmin/branches/2.2/debian/changelog	2008-05-25 13:31:43 UTC (rev 870)
@@ -1,12 +1,13 @@
-kolab-webadmin (2.1.99-20080314-1) experimental; urgency=low
+kolab-webadmin (2.1.99-20080521-1) experimental; urgency=low
 
   * New upstream version: 2.2-rc2
   * updated common/dist_conf.dpatch
     - smarty has now the good path
+    - mostly applied upstream
   * updated 10-fix-requires.dpatch
   * 60-no_extra_doc partially dropped
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 26 Apr 2008 14:16:24 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 25 May 2008 15:27:37 +0200
 
 kolab-webadmin (2.1.0-20070510-3) UNRELEASED; urgency=low
 

Modified: kolab-webadmin/branches/2.2/debian/patches/10-fix-require.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/10-fix-require.dpatch	2008-05-25 13:28:28 UTC (rev 869)
+++ kolab-webadmin/branches/2.2/debian/patches/10-fix-require.dpatch	2008-05-25 13:31:43 UTC (rev 870)
@@ -16,15 +16,3 @@
  require_once('debug.php');
  
  /* We dont have any better place to put this right now... */
-diff -urNad kolab-webadmin-2.1.99+20080314~/php/admin/include/mysmarty.php.in kolab-webadmin-2.1.99+20080314/php/admin/include/mysmarty.php.in
---- kolab-webadmin-2.1.99+20080314~/php/admin/include/mysmarty.php.in	2007-07-03 16:55:17.000000000 +0200
-+++ kolab-webadmin-2.1.99+20080314/php/admin/include/mysmarty.php.in	2008-03-17 19:52:01.000000000 +0100
-@@ -36,7 +36,7 @@
- 	
- 	$basedir = "$php_dir/@kolab_php_module_prefix at admin/";
- 	$this->template_dir = $basedir.'templates/';
--	$this->compile_dir = $basedir.'templates_c/';
-+	$this->compile_dir = '/var/cache/kolab-webadmin/templates/';
- 	$this->config_dir = $basedir.'configs/';
- 	//$this->cache_dir = $basedir.'cache/';
- 	// Added for i18n management (Romain 05-03-03)

Modified: kolab-webadmin/branches/2.2/debian/patches/20-service_index.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/20-service_index.dpatch	2008-05-25 13:28:28 UTC (rev 869)
+++ kolab-webadmin/branches/2.2/debian/patches/20-service_index.dpatch	2008-05-25 13:31:43 UTC (rev 870)
@@ -5,7 +5,7 @@
 
 @DPATCH@
 --- index.php.in.orig	2006-02-02 09:08:17.000000000 +0100
-+++ kolab-webadmin-0.4.0/www/admin/service/index.php.in	2006-02-02 08:56:14.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/settings/index.php.in	2006-02-02 08:56:14.000000000 +0100
 @@ -151,7 +151,9 @@ if( $_REQUEST['submithttpallowunauthfb']
  
  if( $_REQUEST['submitfreebusypast'] ) {

Modified: kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-05-25 13:28:28 UTC (rev 869)
+++ kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-05-25 13:31:43 UTC (rev 870)
@@ -4,172 +4,18 @@
 ## DP: Adjusts some paths
 
 @DPATCH@
-diff -urNad kolab-webadmin-2.1.99+20080314~/dist_conf/debian kolab-webadmin-2.1.99+20080314/dist_conf/debian
---- kolab-webadmin-2.1.99+20080314~/dist_conf/debian	2008-02-26 14:58:04.000000000 +0100
-+++ kolab-webadmin-2.1.99+20080314/dist_conf/debian	2008-03-17 20:38:51.000000000 +0100
-@@ -1,14 +1,15 @@
--kolab_usr=root
--kolab_grp=root
--kolab_musr=root
--kolab_mgrp=root
-+kolab_usr=kolab
-+kolab_grp=kolab
-+kolab_musr=kolab
-+kolab_mgrp=kolab
- kolab_uid=1002
- kolab_gid=1002
--restricted_kolab_usr=root
--restricted_kolab_grp=root
-+restricted_kolab_usr=kolab
-+restricted_kolab_grp=kolab
- kolab_rusr=${restricted_kolab_usr}
- kolab_rgrp=${restricted_kolab_grp}
- kolab_susr=root
-+pki_grp=${kolab_rgrp}
- 
- BASHELL=/bin/bash
- PERL=${bindir}/perl
-@@ -20,19 +21,19 @@
- kolabconf_script=${sbindir}/kolabconf
- 
- # 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
- amavisd_logfile=${localstatedir}/log/amavis.log
- amavisd_home=${localstatedir}/lib//amavis
--amavisd_rusr=kolab-r
-+amavisd_rusr=kolab
- amavisd_usr=kolab
--amavisd_grp=kolab-r
-+amavisd_grp=kolab
- 
- fsl_logfile=${localstatedir}/log/fsl
- 
--sysrundir=${localstatedir}/run/amavis
-+sysrundir=${localstatedir}/run
- 
- clamav_confdir=${sysconfdir}/clamav
- clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -53,45 +54,48 @@
- emailserver_socket=${libdir}/postfix/lmtp
- emailserver_localstatedir=${localstatedir}/spool/postfix
- emailserver_logfile=${localstatedir}/log/mail.log
--emailserver_usr=${kolab_usr}
-+emailserver_usr=root
-+emailserver_tables_usr=root
- emailserver_musr=kolab
--emailserver_grp=${restricted_kolab_grp}
-+emailserver_grp=root
-+emailserver_master_usr=kolab
- 
- imap_confdir=${sysconfdir}
- imap_confperm=0640
--imap_usr=cyrus
--imap_grp=sasl
-+imap_usr=root
-+imap_grp=root
- imap_masterlogfile=${localstatedir}/log/mail.log
- imap_misclogfile=${localstatedir}/log/mail.log
- imap_statedir=${localstatedir}/lib/cyrus
- imap_spool=${localstatedir}/spool/cyrus/mail
- imap_sievedir=${localstatedir}/spool/sieve
- imap_lmtp=${localstatedir}/run/cyrus/socket/lmtp
-+imap_notify_socket=${localstatedir}/run/cyrus/socket/notify
- 
--kolab_statedir=${localstatedir}/kolab
-+kolab_statedir=${localstatedir}/lib/kolab
- kolab_logdir=${localstatedir}/log/kolab
- kolab_pidfile=${sysrundir}/kolab.pid
+diff -urNad kolab-webadmin-2.1.99-20080521~/dist_conf/debian kolab-webadmin-2.1.99-20080521/dist_conf/debian
+--- kolab-webadmin-2.1.99-20080521~/dist_conf/debian	2008-05-25 15:20:14.000000000 +0200
++++ kolab-webadmin-2.1.99-20080521/dist_conf/debian	2008-05-25 15:20:55.000000000 +0200
+@@ -78,9 +78,9 @@
  kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
--kolab_scriptsdir=$(sysconfdir)/kolab
-+kolab_scriptsdir=$(sbindir)
+ kolab_scriptsdir=${sbindir}
  kolab_php_smarty_prefix=smarty/libs
- 
+-smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
++smarty_compiledir=/var/cache/kolab-webadmin/templates
  # Kolab web user interface
 -kolab_wui=/kolab/admin
 +kolab_wui=/admin
  
  ldapserver_statedir=${localstatedir}/lib/ldap
  ldapserver_dir=${localstatedir}/lib/ldap
--ldapserver_replogfile=${localstatedir}/log/ldap-replicalog
--ldapserver_argsfile=${sysrundir}/slapd.args
-+ldapserver_replogfile=${ldapserver_statedir}/replog
-+ldapserver_argsfile=${sysrundir}/slapd/slapd.args
- ldapserver_logfile=${localstatedir}/log/syslog
--ldapserver_pidfile=${sysrundir}/slapd.pid
--ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid
-+ldapserver_pidfile=${sysrundir}/slapd/slapd.pid
-+ldapserverslurpd_pidfile=${sysrundir}/slapd/slurpd.pid
- ldapserver_schemadir=${sysconfdir}/ldap/schema
- ldapserver_confdir=${sysconfdir}/ldap
--ldapserver_usr=ldap
--ldapserver_grp=ldap
--ldapserver_rusr=ldap
-+ldapserver_usr=openldap
-+ldapserver_grp=openldap
-+ldapserver_rusr=openldap
- 
--webserver_document_root=/var/www
-+webserver_document_root=/usr/share/kolab
- webserver_cgidir=${webserver_document_root}/cgi-bin
- webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
- webserver_logdir=${localstatedir}/log/apache2
-@@ -105,31 +109,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=
- webserver_musr=kolab
--webserver_usr=wwwrun
--webserver_grp=www
-+webserver_usr=www-data
-+webserver_grp=www-data
- 
-+phpini_dir=${sysconfdir}/kolab
- phplibdir=${datadir}/php
- phplibdir2=${datadir}/php
- phppeardir=${phplibdir}/PEAR
- 
--sasl_authdconffile=${sysconfdir}/sasl/____
--sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
-+sasl_authdconffile=${sysconfdir}/saslauthd.conf
-+sasl_smtpconffile=${sysconfdir}/postfix/sasl/smtpd.conf
- sasl_logfile=${localstatedir}/log/saslauthd.log
- 
- resmgr_logfile=${localstatedir}/log/resmgr.log
--resmgr_confdir=${sysconfdir}/resmgr
--resmgr_filterdir=${localstatedir}/resmgr/filter
--resmgr_scriptsdir=${resmgr_confdir}
--resmgr_usr=kolab
--resmgr_grp=kolab-n
-+resmgr_confdir=${sysconfdir}/kolab
-+resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
-+resmgr_scriptsdir=/usr/share/kolab/filter
-+resmgr_conffile_usr=kolab
-+resmgr_conffile_grp=root
-+resmgr_usr=root
-+resmgr_grp=www-data
- 
- 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
- 
- graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
- graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
- 
-+backupdir=${localstatedir}/backups/kolab
-+
-+kolab_smtpdpolicy_conffile_usr=${kolab_musr}
-+kolab_smtpdpolicy_conffile_grp=${kolab_grp}
-+
-+aliases_file=${sysconfdir}/aliases
-+

Modified: kolab-webadmin/branches/2.2/debian/rules
===================================================================
--- kolab-webadmin/branches/2.2/debian/rules	2008-05-25 13:28:28 UTC (rev 869)
+++ kolab-webadmin/branches/2.2/debian/rules	2008-05-25 13:31:43 UTC (rev 870)
@@ -26,7 +26,6 @@
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-webadmin
-	rmdir $(CURDIR)/debian/kolab-webadmin/usr/share/php/admin/templates_c/
 	install -D -m 644 debian/apache.conf $(CURDIR)/debian/kolab-webadmin/etc/kolab/kolab-webadmin-apache.conf
 	install -D -m 644 debian/session_vars.php $(CURDIR)/debian/kolab-webadmin/etc/kolab-webadmin/session_vars.php
 




More information about the pkg-kolab-devel mailing list