[pkg-kolab] r694 - in kolabd/trunk/debian: . patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-10-19 10:55:26 +0000 (Fri, 19 Oct 2007)
New Revision: 694

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/patches/10-dist_conf.dpatch
Log:
* Added aliases_file definition to dist_conf/debian (from Philip Hands)

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2007-10-12 21:41:59 UTC (rev 693)
+++ kolabd/trunk/debian/changelog	2007-10-19 10:55:26 UTC (rev 694)
@@ -4,8 +4,9 @@
     package
   * Dropped Apache templates; configuration is currently provided by
     kolab-resource-handlers package
+  * Added aliases_file definition to dist_conf/debian (from Philip Hands)
 
- -- Peter Eisentraut <petere at debian.org>  Mon, 06 Aug 2007 14:42:43 +0200
+ -- Peter Eisentraut <petere at debian.org>  Fri, 19 Oct 2007 12:54:15 +0200
 
 kolabd (2.1.0-20070510.dfsg-1) unstable; urgency=low
 

Modified: kolabd/trunk/debian/patches/10-dist_conf.dpatch
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.dpatch	2007-10-12 21:41:59 UTC (rev 693)
+++ kolabd/trunk/debian/patches/10-dist_conf.dpatch	2007-10-19 10:55:26 UTC (rev 694)
@@ -6,7 +6,7 @@
 @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	2006-03-09 22:52:02.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2007-08-06 14:42:21.000000000 +0200
++++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2007-10-19 12:45:49.000000000 +0200
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -106,7 +106,7 @@
  
  webserver_document_root=/var/www
  webserver_cgidir=${webserver_document_root}/cgi-bin
-@@ -114,28 +117,37 @@
+@@ -114,28 +117,39 @@
  webserver_sslmutex=${sysrundir}/ssl_mutex
  webserver_web_prefix=/kolab
  webserver_musr=kolab
@@ -153,3 +153,5 @@
 +
 +kolab_smtpdpolicy_conffile_usr=${kolab_musr}
 +kolab_smtpdpolicy_conffile_grp=${kolab_grp}
++
++aliases_file=${sysconfdir}/aliases