[pkg-kolab] r882 - in kolabd/branches/2.2/debian: . patches/common

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-06-10 21:53:38 +0000 (Tue, 10 Jun 2008)
New Revision: 882

Modified:
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
Log:
- kolab-webadmin url is now /admin
- added spamassassin_confdir (not used) as requested by Sascha Wilde on
  http://kolab.org/pipermail/kolab-devel/2008-June/009079.html



Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-06-10 21:43:35 UTC (rev 881)
+++ kolabd/branches/2.2/debian/changelog	2008-06-10 21:53:38 UTC (rev 882)
@@ -10,8 +10,11 @@
       within postfix
     - remove /etc/kolab/templates/local.cf.template (new amavisd config)
   * updated common/dist_conf.dpatch
+    - mostly integrated upstream
     - smarty has now the good path
-    - mostly integrated upstream
+    - kolab-webadmin url is now /admin
+    - added spamassassin_confdir (not used) as requested by Sascha Wilde on
+      http://kolab.org/pipermail/kolab-devel/2008-June/009079.html
   * updated patch 30-bootstrap to run newaliases at the end of kolab_bootstrap
   * new patch 40-disable-amavis: amavis is suggested, so disabled as default
   * new patch 50-postfix-hashes: Postfix hashes templates
@@ -36,7 +39,7 @@
     http://lists.debian.org/debian-legal/2008/04/msg00087.html
   * debian/postinst: add user cyrus to group kolab. This is needed for PKI.
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 10 Jun 2008 23:38:36 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 10 Jun 2008 23:51:39 +0200
 
 kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
 

Modified: kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-06-10 21:43:35 UTC (rev 881)
+++ kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-06-10 21:53:38 UTC (rev 882)
@@ -5,11 +5,23 @@
 
 @DPATCH@
 diff -urNad kolabd-2.1.99-20080521.dfsg~/dist_conf/debian kolabd-2.1.99-20080521.dfsg/dist_conf/debian
---- kolabd-2.1.99-20080521.dfsg~/dist_conf/debian	2008-03-19 22:43:15.000000000 +0100
-+++ kolabd-2.1.99-20080521.dfsg/dist_conf/debian	2008-05-25 12:02:28.000000000 +0200
-@@ -80,7 +80,7 @@
+--- kolabd-2.1.99-20080521.dfsg~/dist_conf/debian	2008-06-10 23:34:22.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/dist_conf/debian	2008-06-10 23:50:28.000000000 +0200
+@@ -31,6 +31,8 @@
+ amavisd_usr=kolab
+ amavisd_grp=kolab
+ 
++spamassassin_confdir=${sysconfdir}/spamassassin
++
+ fsl_logfile=${localstatedir}/log/fsl
+ 
+ sysrundir=${localstatedir}/run
+@@ -78,9 +80,9 @@
+ kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
+ kolab_scriptsdir=${sbindir}
  kolab_php_smarty_prefix=smarty/libs
- smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
+-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