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

petere at alioth.debian.org petere at alioth.debian.org
Thu Aug 2 15:24:59 UTC 2007


Author: petere
Date: 2007-08-02 15:24:59 +0000 (Thu, 02 Aug 2007)
New Revision: 672

Added:
   kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch
Removed:
   kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
   kolab-resource-handlers/trunk/debian/resmgr.conf
Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/patches/00list
   kolab-resource-handlers/trunk/debian/rules
Log:
* New upstream release
  - Obsoleted patches: 10-resmgr.conf.dpatch

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-07-31 16:50:37 UTC (rev 671)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-08-02 15:24:59 UTC (rev 672)
@@ -1,3 +1,10 @@
+kolab-resource-handlers (2.1.0-20070510-1) unstable; urgency=low
+
+  * New upstream release
+    - Obsoleted patches: 10-resmgr.conf.dpatch
+
+ -- Peter Eisentraut <petere at debian.org>  Wed, 01 Aug 2007 13:38:31 +0200
+
 kolab-resource-handlers (0.3.9-20060811-4) unstable; urgency=low
 
   [ Peter Eisentraut ]

Modified: kolab-resource-handlers/trunk/debian/patches/00list
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/00list	2007-07-31 16:50:37 UTC (rev 671)
+++ kolab-resource-handlers/trunk/debian/patches/00list	2007-08-02 15:24:59 UTC (rev 672)
@@ -1,10 +1,10 @@
-10-resmgr.conf.dpatch
-20-kolabmailtransport.php.dpatch
-30-kolabmailboxfilter.php.dpatch
-40-resmgr.php.dpatch
-50-kolabfilter.php.dpatch
-60-olhacks.php.dpatch
-70-IMAP.php.dpatch
-80-freebusycache.class.php-path.dpatch
-90-freebusy.php-path.dpatch
-100-pfb.php-path.dpatch
+01-dist_conf
+#20-kolabmailtransport.php.dpatch
+#30-kolabmailboxfilter.php.dpatch
+#40-resmgr.php.dpatch
+#50-kolabfilter.php.dpatch
+#60-olhacks.php.dpatch
+#70-IMAP.php.dpatch
+#80-freebusycache.class.php-path.dpatch
+#90-freebusy.php-path.dpatch
+#100-pfb.php-path.dpatch

Added: kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch	                        (rev 0)
+++ kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch	2007-08-02 15:24:59 UTC (rev 672)
@@ -0,0 +1,36 @@
+#! /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~/dist_conf/debian kolab-resource-handlers-2.1.0-20070510/dist_conf/debian
+--- kolab-resource-handlers-2.1.0-20070510~/dist_conf/debian	2007-05-10 12:28:48.000000000 +0200
++++ kolab-resource-handlers-2.1.0-20070510/dist_conf/debian	2007-08-01 14:24:19.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
+@@ -127,7 +127,7 @@
+ 
+ resmgr_logfile=${localstatedir}/log/resmgr.log
+ resmgr_confdir=${sysconfdir}/resmgr
+-resmgr_filterdir=${localstatedir}/resmgr/filter
++resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
+ resmgr_scriptsdir=${resmgr_confdir}
+ resmgr_usr=kolab
+ resmgr_grp=kolab-n


Property changes on: kolab-resource-handlers/trunk/debian/patches/01-dist_conf.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-07-31 16:50:37 UTC (rev 671)
+++ kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-08-02 15:24:59 UTC (rev 672)
@@ -1,44 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-resmgr.conf.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Here we correct the pathes of the conffile
-
- at DPATCH@
---- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.conf.orig	2006-01-04 13:52:17.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.conf	2006-01-04 13:51:56.000000000 +0100
-@@ -2,7 +2,7 @@
- // Example conf file for resmgr!
- 
- // What is the root directory of our Horde instance?
-- at define('HORDE_BASE', '/kolab/var/kolab/www/fbview');
-+ at define('HORDE_BASE', '/var/kolab/www/fbview');
- 
- // What is the address of the Cyrus server where the calendar data is stored?
- $params['server'] = 'localhost';
-@@ -39,7 +39,7 @@
- 
- // LDAP data
- // What is the address of the LDAP server address where user objects reside
--$params['ldap_uri'] = 'ldaps://ldap.example.com';
-+$params['ldap_uri'] = 'ldaps://localhost';
- 
- // What is the Base DN of our LDAP database?
- $params['base_dn'] = 'dc=example,dc=com';
-@@ -57,7 +57,7 @@
- $params['calendar_pass'] = 'zyx';
- 
- // Filename of private key used to decrypt password from LDAP
--$params['priv_key_file'] = '/kolab/etc/kolab/res_priv.pem';
-+$params['priv_key_file'] = '/etc/kolab/res_priv.pem';
- 
- // What is the name of the users' calendar mailbox?
- $params['calendar_store'] = 'Calendar';
-@@ -69,7 +69,7 @@
- $params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
- 
- // Where are we logging to?
--$params['log'] = 'file:/kolab/var/resmgr/resmgr.log';                // File...
-+$params['log'] = 'file:/var/log/kolab/resmgr.log';                // File...
- // $params['log'] = 'syslog:cons, pid';            // Or syslog...
- 
- // What level of output should we log? Higher levels give more verbose output.

Deleted: kolab-resource-handlers/trunk/debian/resmgr.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/resmgr.conf	2007-07-31 16:50:37 UTC (rev 671)
+++ kolab-resource-handlers/trunk/debian/resmgr.conf	2007-08-02 15:24:59 UTC (rev 672)
@@ -1,78 +0,0 @@
-<?php
-// Example conf file for resmgr!
-
-// What is the root directory of our Horde instance?
- at define('HORDE_BASE', '/var/kolab/www/fbview');
-
-// What is the address of the Cyrus server where the calendar data is stored?
-$params['server'] = 'localhost';
-
-// What is our default mail domain? This is used if any users do not have
-// '@domain' specified after their username as part of their email address.
-$params['email_domain'] = 'example.com';
-
-// Are we using virtual domains with Cyrus?
-$params['virtual_domains'] = true;
-
-// Should we append domains to mailbox URIs? This only applies when
-// virtual_domains is true, and when using manager accounts.
-$params['append_domains'] = false;
-
-// Should we make sure that the sender and From header match for mail
-// that origins on this server?
-$params['verify_from_header'] = true;
-
-// Should we perform this check on mail from our
-// subdomains too?
-$params['verify_subdomains'] = true;
-
-// Should the Sender: header be used over From: if present?
-$params['allow_sender_header'] = true;
-
-// Should reject messages with From headers that dont match
-// the envelope? Default is to rewrite the header
-$params['reject_forged_from_header'] = false;
-
-// Should we allow forwarded ical messages from Outlook
-// by encapsulating them in a MIME multipart
-$params['allow_outlook_ical_forward']  = true;
-
-// LDAP data
-// What is the address of the LDAP server address where user objects reside
-$params['ldap_uri'] = 'ldaps://localhost';
-
-// What is the Base DN of our LDAP database?
-$params['base_dn'] = 'dc=example,dc=com';
-
-// What DN should we use to bind to the LDAP server?
-$params['bind_dn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
-
-// What password should we use with the above DN when binding?
-$params['bind_pw'] = 'xyz';
-
-
-// What account should we use to read/write calendar data? This account should
-// have access to the calendar mailbox of all resource/group mailboxes.
-$params['calendar_user'] = 'calendar@'.$params['email_domain'];
-$params['calendar_pass'] = 'zyx';
-
-// Filename of private key used to decrypt password from LDAP
-$params['priv_key_file'] = '/etc/kolab/res_priv.pem';
-
-// What is the name of the users' calendar mailbox?
-$params['calendar_store'] = 'Calendar';
-
-// Where can we get free/busy information from?
-$params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.ifb';
- 
-// PFB url to trigger creation of pfb
-$params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
-
-// Where are we logging to?
-// $params['log'] = 'file:/var/log/kolab/resmgr.log';                // File...
-$params['log'] = 'syslog:cons, pid';            // Or syslog...
-
-// What level of output should we log? Higher levels give more verbose output.
-// One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
-$params['log_level'] = RM_LOG_DEBUG;
-?>

Modified: kolab-resource-handlers/trunk/debian/rules
===================================================================
--- kolab-resource-handlers/trunk/debian/rules	2007-07-31 16:50:37 UTC (rev 671)
+++ kolab-resource-handlers/trunk/debian/rules	2007-08-02 15:24:59 UTC (rev 672)
@@ -2,64 +2,47 @@
 
 include /usr/share/dpatch/dpatch.make
 
-build: patch
+config.status: configure patch-stamp
+	dh_testdir
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-dist=debian
 
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
 clean: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
-	dh_clean 
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-resource-handlers
+	rm -r $(CURDIR)/debian/kolab-resource-handlers/usr/share/doc/kolab/
 	
-	# Install files for kolabmailtransport.php
-	install -D -m 644 kolab-resource-handlers/fbview/fbview/framework/Net_LMTP/LMTP.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/php/LMTP.php
-	
-	# Install files for kolabmailboxfilter.php
-	install -D -m 644 kolab-resource-handlers/resmgr/misc.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/php/misc.php
-	install -D -m 644 kolab-resource-handlers/resmgr/resmgr.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/php/resmgr.php
-	
-	# Install files for kolabfilter.php
-	install -D -m 644 kolab-resource-handlers/resmgr/olhacks.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/php/olhacks.php
-	
-	# Install the resource manager php scripts
-	install -D -m 644 kolab-resource-handlers/resmgr/kolabfilter.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/kolabfilter.php
-	install -D -m 644 kolab-resource-handlers/resmgr/kolabmailboxfilter.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/kolabmailboxfilter.php
-	install -D -m 644 kolab-resource-handlers/resmgr/kolabmailtransport.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/kolabmailtransport.php
-
-	# Install the freebusy scripts, classes
-	install -D -m 644 kolab-resource-handlers/freebusy/freebusycache.class.php debian/kolab-resource-handlers/usr/share/php/freebusy/freebusycache.class.php
-	install -D -m 644 kolab-resource-handlers/freebusy/freebusy.class.php debian/kolab-resource-handlers/usr/share/php/freebusy/freebusy.class.php
-	install -D -m 644 kolab-resource-handlers/freebusy/freebusycollector.class.php debian/kolab-resource-handlers/usr/share/php/freebusy/freebusycollector.class.php
-	install -D -m 644 kolab-resource-handlers/freebusy/freebusyldap.class.php debian/kolab-resource-handlers/usr/share/php/freebusy/freebusyldap.class.php
-	install -D -m 644 kolab-resource-handlers/freebusy/recurrence.class.php debian/kolab-resource-handlers/usr/share/php/freebusy/recurrence.class.php
-	install -D -m 644 kolab-resource-handlers/freebusy/freebusy.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/freebusy/freebusy.php
-	install -D -m 644 kolab-resource-handlers/freebusy/misc.php debian/kolab-resource-handlers/usr/share/php/freebusy/misc.php
-	install -D -m 644 kolab-resource-handlers/freebusy/pfb.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/freebusy/pfb.php
-
-	# Install conffiles
-	install -D -m 644 debian/resmgr.conf debian/kolab-resource-handlers/etc/kolab/resmgr.conf
-	install -D -m 644 debian/freebusy.conf debian/kolab-resource-handlers/etc/kolab/freebusy.conf
-	install -D -m 644 debian/apache.conf debian/kolab-resource-handlers/etc/kolab/apache.conf
-	
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -i ChangeLog
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installman -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -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 configure
+
+.PHONY: build clean binary-indep binary-arch binary install




More information about the pkg-kolab-devel mailing list