[pkg-kolab] r791 - in libkolab-perl/trunk/debian: . patches patches/common

Mon Apr 7 11:47:53 UTC 2008

Author: petere
Date: 2008-04-07 11:47:52 +0000 (Mon, 07 Apr 2008)
New Revision: 791

Added:
   libkolab-perl/trunk/debian/patches/common/
   libkolab-perl/trunk/debian/patches/common/dist_conf.dpatch
Removed:
   libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch
Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/00list
Log:
Internal Subversion repository reorganization to keep common patches in
common location, in particular patches/common/dist_conf.dpatch

Modified: libkolab-perl/trunk/debian/changelog
===================================================================

--- libkolab-perl/trunk/debian/changelog	2008-04-07 11:38:23 UTC (rev 790)
+++ libkolab-perl/trunk/debian/changelog	2008-04-07 11:47:52 UTC (rev 791)
@@ -1,11 +1,13 @@
 libkolab-perl (5.8.7-20070420-3) UNRELEASED; urgency=low
 
+  * Internal Subversion repository reorganization to keep common patches in
+    common location, in particular patches/common/dist_conf.dpatch
   * Fixed watch file
   * Updated standards version
   * Added Homepage control field
   * Changed control fields XS-Vcs-* to Vcs-*
 
- -- Peter Eisentraut <petere at debian.org>  Mon, 07 Apr 2008 13:38:06 +0200
+ -- Peter Eisentraut <petere at debian.org>  Mon, 07 Apr 2008 13:45:27 +0200
 
 libkolab-perl (5.8.7-20070420-2) unstable; urgency=low
 

Modified: libkolab-perl/trunk/debian/patches/00list
===================================================================
--- libkolab-perl/trunk/debian/patches/00list	2008-04-07 11:38:23 UTC (rev 790)
+++ libkolab-perl/trunk/debian/patches/00list	2008-04-07 11:47:52 UTC (rev 791)
@@ -1,3 +1,3 @@
+common/dist_conf
 10-Kolab.pm
 20-buildCyrusConfig
-40-dist_conf

Deleted: libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch	2008-04-07 11:38:23 UTC (rev 790)
+++ libkolab-perl/trunk/debian/patches/40-dist_conf.dpatch	2008-04-07 11:47:52 UTC (rev 791)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-dist_conf.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjusts some paths
-
- at DPATCH@
-diff -urNad libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865~/dist_conf/debian libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865/dist_conf/debian
---- libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865~/dist_conf/debian	2007-04-20 17:08:22.000000000 +0200
-+++ libkolab-perl-5.8.7-20070420.obsolete.0.59179420799865/dist_conf/debian	2007-06-19 16:58:28.000000000 +0200
-@@ -19,7 +19,7 @@
- pkgdocdir=${datadir}/doc/kolab
- 
- # 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

Added: libkolab-perl/trunk/debian/patches/common/dist_conf.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/common/dist_conf.dpatch	                        (rev 0)
+++ libkolab-perl/trunk/debian/patches/common/dist_conf.dpatch	2008-04-07 11:47:52 UTC (rev 791)
@@ -0,0 +1,170 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## common/dist_conf.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: Adjusts some paths
+
+ at DPATCH@
+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
+-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
+@@ -19,19 +20,19 @@
+ pkgdocdir=${datadir}/doc/kolab
+ 
+ # 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
+@@ -52,9 +53,11 @@
+ 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
+ 
+ ftpserver_scoreboardfile=${localstatedir}/proftpd/score
+ ftpserver_logfile=${localstatedir}/log/proftpd.log
+@@ -69,36 +72,39 @@
+ 
+ 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_logdir=${localstatedir}/log/kolab
+ 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_module_prefix=kolab/
+ 
+ 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
+ webserver_cgidir=${webserver_document_root}/cgi-bin
+ webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
+ webserver_logdir=${localstatedir}/log/apache2
+@@ -114,28 +120,39 @@
+ webserver_sslmutex=${sysrundir}/ssl_mutex
+ webserver_web_prefix=/kolab
+ 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_confdir=${sysconfdir}/kolab
++resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
+ resmgr_scriptsdir=${resmgr_confdir}
+-resmgr_usr=kolab
+-resmgr_grp=kolab-n
++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_cachedir=${webserver_document_root}${webserver_web_prefix}/freebusy/cache
++freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
++freebusy_usr=root
++freebusy_grp=www-data
+ 
+ graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
+ graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+ 
++backupdir=${localstatedir}/backups/kolab
++
++kolab_smtpdpolicy_conffile_usr=${kolab_musr}
++kolab_smtpdpolicy_conffile_grp=${kolab_grp}
++
++aliases_file=${sysconfdir}/aliases


Property changes on: libkolab-perl/trunk/debian/patches/common/dist_conf.dpatch
___________________________________________________________________
Name: svn:executable
   + *


