[pkg-kolab] r709 - in kolab-resource-handlers/trunk/debian: . patches

petere at alioth.debian.org petere at alioth.debian.org
Thu Dec 13 07:22:57 UTC 2007


Author: petere
Date: 2007-12-13 07:22:57 +0000 (Thu, 13 Dec 2007)
New Revision: 709

Added:
   kolab-resource-handlers/trunk/debian/patches/common/
Removed:
   kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch
Modified:
   kolab-resource-handlers/trunk/debian/apache.conf
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/00list
Log:
* Internal Subversion repository reorganization to keep common patches in
  common location, in particular patches/common/dist_conf.dpatch
* Moved /usr/share/kolab-resource-handlers/ to /usr/share/kolab/ for better
  consistency with upstream

Modified: kolab-resource-handlers/trunk/debian/apache.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/apache.conf	2007-12-12 23:28:24 UTC (rev 708)
+++ kolab-resource-handlers/trunk/debian/apache.conf	2007-12-13 07:22:57 UTC (rev 709)
@@ -5,13 +5,13 @@
 RewriteEngine On
 RewriteLog "/var/log/apache2/kolab_rewrite.log"
 RewriteLogLevel 0
-RewriteRule ^/freebusy/([^/]+)\.ifb /usr/share/kolab-resource-handlers/freebusy/freebusy.php?uid=$1
-RewriteRule ^/freebusy/([^/]+)\.vfb /usr/share/kolab-resource-handlers/freebusy/freebusy.php?uid=$1
-RewriteRule ^/freebusy/([^/]+)\.xfb /usr/share/kolab-resource-handlers/freebusy/freebusy.php?uid=$1&extended=1
-RewriteRule ^/freebusy/trigger/(.+)\.pfb /usr/share/kolab-resource-handlers/freebusy/pfb.php?folder=$1&cache=0
-RewriteRule ^/freebusy/(.+)\.pfb /usr/share/kolab-resource-handlers/freebusy/pfb.php?folder=$1&cache=1
-RewriteRule ^/freebusy/trigger/(.+)\.xpfb /usr/share/kolab-resource-handlers/freebusy/pfb.php?folder=$1&cache=0&extended=1
-RewriteRule ^/freebusy/(.+)\.xpfb /usr/share/kolab-resource-handlers/freebusy/pfb.php?folder=$1&cache=1&extended=1
+RewriteRule ^/freebusy/([^/]+)\.ifb /usr/share/kolab/freebusy/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+)\.vfb /usr/share/kolab/freebusy/freebusy.php?uid=$1
+RewriteRule ^/freebusy/([^/]+)\.xfb /usr/share/kolab/freebusy/freebusy.php?uid=$1&extended=1
+RewriteRule ^/freebusy/trigger/(.+)\.pfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=0
+RewriteRule ^/freebusy/(.+)\.pfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1
+RewriteRule ^/freebusy/trigger/(.+)\.xpfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=0&extended=1
+RewriteRule ^/freebusy/(.+)\.xpfb /usr/share/kolab/freebusy/pfb.php?folder=$1&cache=1&extended=1
 
 SSLEngine		on
 SSLCertificateFile	/etc/kolab/cert.pem
@@ -21,14 +21,14 @@
   SSLOptions +StdEnvVars
 </Files>
 
-Alias /freebusy /usr/share/kolab-resource-handlers/freebusy
+Alias /freebusy /usr/share/kolab/freebusy
 
 <Location /freebusy>
 	SSLRequireSSL
 </Location>
 
 # Options for freebusy
-<Directory /usr/share/kolab-resource-handlers/freebusy>
+<Directory /usr/share/kolab/freebusy>
   #Dav On
   #Script PUT /freebusy/freebusy.php
   AllowOverride None

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-12-12 23:28:24 UTC (rev 708)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-12-13 07:22:57 UTC (rev 709)
@@ -1,3 +1,12 @@
+kolab-resource-handlers (2.1.0-20070510-3) UNRELEASED; urgency=low
+
+  * Internal Subversion repository reorganization to keep common patches in
+    common location, in particular patches/common/dist_conf.dpatch
+  * Moved /usr/share/kolab-resource-handlers/ to /usr/share/kolab/ for better
+    consistency with upstream
+
+ -- Peter Eisentraut <petere at debian.org>  Thu, 13 Dec 2007 07:50:48 +0100
+
 kolab-resource-handlers (2.1.0-20070510-2) unstable; urgency=high
 
   * Readded apache.conf, which was lost in previous release

Modified: kolab-resource-handlers/trunk/debian/patches/00list
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/00list	2007-12-12 23:28:24 UTC (rev 708)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2007-12-13 07:22:57 UTC (rev 709)
@@ -1,2 +1,2 @@
-01-dist_conf
+common/dist_conf
 10-resmgr.conf

Deleted: kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch	2007-12-12 23:28:24 UTC (rev 708)
+++ kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch	2007-12-13 07:22:57 UTC (rev 709)
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-dist_conf.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Adjusts some paths
-
- at DPATCH@
-diff -urNad kolab-resource-handlers-2.1.0-20070510.obsolete.0.131198541102098~/dist_conf/debian kolab-resource-handlers-2.1.0-20070510.obsolete.0.131198541102098/dist_conf/debian
---- kolab-resource-handlers-2.1.0-20070510.obsolete.0.131198541102098~/dist_conf/debian	2007-05-10 12:28:48.000000000 +0200
-+++ kolab-resource-handlers-2.1.0-20070510.obsolete.0.131198541102098/dist_conf/debian	2007-08-03 17:58:06.000000000 +0200
-@@ -98,7 +98,7 @@
- ldapserver_grp=ldap
- ldapserver_rusr=ldap
- 
--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
-@@ -112,7 +112,7 @@
- webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
- webserver_sslscache=${sysrundir}/ssl_scache
- webserver_sslmutex=${sysrundir}/ssl_mutex
--webserver_web_prefix=/kolab
-+webserver_web_prefix=/kolab-resource-handlers
- webserver_musr=kolab
- webserver_usr=wwwrun
- webserver_grp=www
-@@ -126,15 +126,15 @@
- 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
- 
- 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
- 
- graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
- graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db

Copied: kolab-resource-handlers/trunk/debian/patches/common (from rev 706, common/patches)




More information about the pkg-kolab-devel mailing list