[pkg-kolab] r1560 - kolabd/trunk/debian

[Mathieu Parent]

Author: sathieu
Date: 2011-11-19 16:45:32 +0000 (Sat, 19 Nov 2011)
New Revision: 1560

Modified:
   kolabd/trunk/debian/apache.conf
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/rules
Log:
Moved to dh and updated apache.conf

- "namespace tools" are now installed (in /usr/lib/kolab)
- kolabsrv now included (in /usr/sbin)
- directory /var/cache/kolab/httpd_sessions created for PHP sessions

- apache.conf: updated to match upstream's RewriteRule



Modified: kolabd/trunk/debian/apache.conf
===================================================================
--- kolabd/trunk/debian/apache.conf	2011-11-19 12:40:28 UTC (rev 1559)
+++ kolabd/trunk/debian/apache.conf	2011-11-19 16:45:32 UTC (rev 1560)
@@ -3,15 +3,14 @@
 
 # FreeBusy list handling
 RewriteEngine On
-RewriteLog "/var/log/apache2/kolab_rewrite.log"
-RewriteLogLevel 0
+#RewriteLog "/var/log/apache2/kolab_rewrite.log"
+#RewriteLogLevel 9
 RewriteRule ^/freebusy/([^/]+)\.ifb /usr/share/php/htdocs/freebusy.php?uid=$1
 RewriteRule ^/freebusy/([^/]+)\.vfb /usr/share/php/htdocs/freebusy.php?uid=$1
 RewriteRule ^/freebusy/([^/]+)\.xfb /usr/share/php/htdocs/freebusy.php?uid=$1&extended=1
 RewriteRule ^/freebusy/trigger/(.+)\.pfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=0
 RewriteRule ^/freebusy/(.+)\.pfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=1
-RewriteRule ^/freebusy/trigger/(.+)\.xpfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=0&extended=1
-RewriteRule ^/freebusy/(.+)\.xpfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=1&extended=1
+RewriteRule ^/freebusy/(.+)\.pxfb /usr/share/php/htdocs/pfb.php?folder=$1&cache=1&extended=1
 
 SSLEngine		on
 SSLCertificateFile	/etc/kolab/cert.pem

Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2011-11-19 12:40:28 UTC (rev 1559)
+++ kolabd/trunk/debian/changelog	2011-11-19 16:45:32 UTC (rev 1560)
@@ -19,8 +19,12 @@
     only documented: manual steps are needed.
   * Drop old Breaks/Replaces on kolab-freebusy, kolab-resource-handlers (no more
     in oldstable=lenny)
-  * Moved to debhelper compat level 8 and dh_install
+  * Moved to debhelper compat level 8 and dh
+    - "namespace tools" are now installed (in /usr/lib/kolab)
+    - kolabsrv now included (in /usr/sbin)
+    - directory /var/cache/kolab/httpd_sessions created for PHP sessions
   * updated Standards-Version to 3.9.2: no changes
+  * apache.conf: updated to match upstream's RewriteRule
 
  -- Mathieu Parent <sathieu at debian.org>  Sat, 19 Nov 2011 13:08:21 +0100
 

Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules	2011-11-19 12:40:28 UTC (rev 1559)
+++ kolabd/trunk/debian/rules	2011-11-19 16:45:32 UTC (rev 1560)
@@ -1,50 +1,36 @@
 #!/usr/bin/make -f
 
-config.status: configure
-	dh_testdir
+%:
+	dh  $@
+
+override_dh_auto_configure:
 	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib --with-dist=debian --without-openpkg
 
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f kolabcheckperm
-	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep 
-	dh_installdirs
+override_dh_install:
 	dh_install
-
-	# Kolab bootstrapping templates
+	# Clean up
 	rm $(addprefix debian/kolabd/etc/kolab/templates/,clamd.* freshclam.* httpd.* local.cf.template)
+	rm -r debian/kolabd/etc/amavis/conf.d/*
+	rmdir debian/kolabd/usr/bin
+	rm    debian/kolabd/usr/sbin/kolab_sslcert.sh
+	rm -r debian/kolabd/usr/share/doc/kolab
+	rmdir debian/kolabd/usr/share/kolab/cgi-bin
+	rmdir debian/kolabd/usr/share/kolab/freebusy
+	rmdir debian/kolabd/usr/share/kolab/icons
+	rmdir debian/kolabd/usr/share/kolab/locks
+	rmdir debian/kolabd/usr/share/kolab
+	rmdir debian/kolabd/var/log/apache2/php
+	rmdir debian/kolabd/var/log/apache2
+	rmdir debian/kolabd/var/log/kolab
+	rmdir debian/kolabd/var/log
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
+override_dh_installchangelogs:
 	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_installexamples -i
+
+override_dh_installinit:
 	dh_installinit -i --update-rcd-params='start 30 2 3 4 5 . stop 30 0 1 6 .'
-	dh_installman -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i -X /etc/
-	dh_perl -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install