[pkg-kolab] r1569 - in kolab-webadmin/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2011-11-19 18:13:13 +0000 (Sat, 19 Nov 2011)
New Revision: 1569

Removed:
   kolab-webadmin/trunk/debian/patches/80-issue4025.diff
Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/patches/series
Log:
removed 80-issue4025.diff: merged upstream



Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2011-11-19 18:02:33 UTC (rev 1568)
+++ kolab-webadmin/trunk/debian/changelog	2011-11-19 18:13:13 UTC (rev 1569)
@@ -6,6 +6,7 @@
     - Upstream is now a PEAR package, major rework
     - removed 10-dist_conf.diff, 60-no_extra_doc.diff: not needed with PEAR
     - removed 70-sieve-port-i18n.diff: merged upstream
+    - removed 80-issue4025.diff: merged upstream
   * Drop php4 support (probably not working already) 
   * Moved to debhelper compat level 8 and dh
   * Moved to pkg-php-tools

Deleted: kolab-webadmin/trunk/debian/patches/80-issue4025.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/80-issue4025.diff	2011-11-19 18:02:33 UTC (rev 1568)
+++ kolab-webadmin/trunk/debian/patches/80-issue4025.diff	2011-11-19 18:13:13 UTC (rev 1569)
@@ -1,41 +0,0 @@
-Author: gunnar
-
-Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
-In directory doto:/tmp/cvs-serv13268/kolab-webadmin/kolab-webadmin/www/admin/user
-
-Modified Files:
-      Tag: kolab_2_2_branch
-	user.php.in 
-Log Message:
-kolab/issue4025 (Users can not change theire password (in 2.2.3))
-
-Index: user.php.in
-===================================================================
-RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
-retrieving revision 1.28.2.3
-retrieving revision 1.28.2.4
-diff -u -d -r1.28.2.3 -r1.28.2.4
---- a/www/admin/user/user.php.in	7 Dec 2009 13:17:02 -0000	1.28.2.3
-+++ b/www/admin/user/user.php.in	15 Jan 2010 15:32:33 -0000	1.28.2.4
-@@ -521,7 +521,9 @@
-   $entries['givenname']['comment'] = '';
-   $entries['sn']['comment'] = '';
-   $entries['alias']['attrs'] = 'readonly';
-+  $entries['kolabdelegate']['attrs'] = 'readonly';
-   $entries['kolabhomeserver']['attrs'] = 'readonly';
-+  $entries['kolabAllowSMTPRecipient']['attrs'] = 'readonly';
-   $entries['accttype']['attrs'] = 'readonly';
-   $entries['uid']['attrs'] = 'readonly';
- }
-@@ -717,6 +719,8 @@
- 			   unset($ldap_object['mail']);
- 			   unset($ldap_object['uid']);
- 			   unset($ldap_object['kolabHomeServer']);
-+			   unset($ldap_object['kolabAllowSMTPRecipient']);
-+			   unset($ldap_object['kolabDelegate']);
- 			 }
- 			 if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {			   
- 			   array_push($errors, sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn,
-
-
-

Modified: kolab-webadmin/trunk/debian/patches/series
===================================================================
--- kolab-webadmin/trunk/debian/patches/series	2011-11-19 18:02:33 UTC (rev 1568)
+++ kolab-webadmin/trunk/debian/patches/series	2011-11-19 18:13:13 UTC (rev 1569)
@@ -1,3 +1 @@
-70-sieve-port-i18n.diff
 71-sieve-port-number.diff
-80-issue4025.diff