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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-06-10 22:00:05 +0000 (Tue, 10 Jun 2008)
New Revision: 883

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



Modified: kolab-webadmin/branches/2.2/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2/debian/changelog	2008-06-10 21:53:38 UTC (rev 882)
+++ kolab-webadmin/branches/2.2/debian/changelog	2008-06-10 22:00:05 UTC (rev 883)
@@ -2,12 +2,15 @@
 
   * New upstream version: 2.2-rc2
   * updated common/dist_conf.dpatch
+    - mostly integrated upstream
     - smarty has now the good path
-    - mostly applied 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 10-fix-requires.dpatch
   * 60-no_extra_doc partially dropped
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 25 May 2008 15:27:37 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 10 Jun 2008 23:59:11 +0200
 
 kolab-webadmin (2.1.0-20070510-3) UNRELEASED; urgency=low
 

Modified: kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-06-10 21:53:38 UTC (rev 882)
+++ kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-06-10 22:00:05 UTC (rev 883)
@@ -5,9 +5,18 @@
 
 @DPATCH@
 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-webadmin-2.1.99-20080521~/dist_conf/debian	2008-06-10 23:57:39.000000000 +0200
++++ kolab-webadmin-2.1.99-20080521/dist_conf/debian	2008-06-10 23:58:21.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