[pkg-kolab] r1068 - in kolab-webadmin/branches/2.2.1/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-16 23:12:45 +0000 (Tue, 16 Dec 2008)
New Revision: 1068

Removed:
   kolab-webadmin/branches/2.2.1/debian/patches/20-service_index.diff
Modified:
   kolab-webadmin/branches/2.2.1/debian/changelog
   kolab-webadmin/branches/2.2.1/debian/patches/series
Log:
removed 20-service_index.diff, integrated


Modified: kolab-webadmin/branches/2.2.1/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/changelog	2008-12-16 23:07:44 UTC (rev 1067)
+++ kolab-webadmin/branches/2.2.1/debian/changelog	2008-12-16 23:12:45 UTC (rev 1068)
@@ -1,8 +1,9 @@
 kolab-webadmin (2.2.1-20081212-1) UNRELEASED; urgency=low
 
   * New beta release 2.2.1-beta-1
+  * removed 20-service_index.diff, integrated
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 16 Dec 2008 23:58:23 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 00:10:20 +0100
 
 kolab-webadmin (2.2.0-20080709-2) UNRELEASED; urgency=low
 

Deleted: kolab-webadmin/branches/2.2.1/debian/patches/20-service_index.diff
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/patches/20-service_index.diff	2008-12-16 23:07:44 UTC (rev 1067)
+++ kolab-webadmin/branches/2.2.1/debian/patches/20-service_index.diff	2008-12-16 23:12:45 UTC (rev 1068)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-service_index.dpatch by Tobias König <tokoe at kde.org>
-##
-## DP: opportunity to delete freebusy value
-
- at DPATCH@
---- index.php.in.orig	2006-02-02 09:08:17.000000000 +0100
-+++ kolab-webadmin-0.4.0/www/admin/settings/index.php.in	2006-02-02 08:56:14.000000000 +0100
-@@ -151,7 +151,9 @@ if( $_REQUEST['submithttpallowunauthfb']
- 
- if( $_REQUEST['submitfreebusypast'] ) {
-   $attrs = array();
--  $attrs['kolabFreeBusyPast'] = trim( $_REQUEST['freebusypast'] );
-+  $value = trim( $_REQUEST['freebusypast'] );
-+  if( $value == '' ) $value = array();
-+  $attrs['kolabFreeBusyPast'] = $value;
-   if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
- 	$errors[] = _("LDAP Error: failed to modify kolab configuration object: ")
- 	  .ldap_error($ldap->connection);

Modified: kolab-webadmin/branches/2.2.1/debian/patches/series
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/patches/series	2008-12-16 23:07:44 UTC (rev 1067)
+++ kolab-webadmin/branches/2.2.1/debian/patches/series	2008-12-16 23:12:45 UTC (rev 1068)
@@ -1,3 +1,2 @@
 10-fix-require.diff
-20-service_index.diff
 60-no_extra_doc.diff