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

[Mathieu Parent]

Author: sathieu
Date: 2011-11-19 18:32:34 +0000 (Sat, 19 Nov 2011)
New Revision: 1571

Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/patches/71-sieve-port-number.diff
Log:
updated 71-sieve-port-number.diff

Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2011-11-19 18:31:54 UTC (rev 1570)
+++ kolab-webadmin/trunk/debian/changelog	2011-11-19 18:32:34 UTC (rev 1571)
@@ -6,10 +6,11 @@
     - 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
+    - updated 71-sieve-port-number.diff
     - 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
+  * Moved to pkg-php-tools (>= 0.6 for aNN and bNN support)
 
  -- Mathieu Parent <sathieu at debian.org>  Wed, 06 Apr 2011 19:23:56 +0200
 

Modified: kolab-webadmin/trunk/debian/patches/71-sieve-port-number.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/71-sieve-port-number.diff	2011-11-19 18:31:54 UTC (rev 1570)
+++ kolab-webadmin/trunk/debian/patches/71-sieve-port-number.diff	2011-11-19 18:32:34 UTC (rev 1571)
@@ -3,10 +3,10 @@
 Bug: https://issues.kolab.org/issue4373
 Bug-Debian: http://bugs.debian.org/598010
 
-Index: kolab-webadmin-2.2.3-20091217/www/admin/settings/index.php.in
+Index: b/KolabAdmin-2.3.4/www/admin/settings/index.php
 ===================================================================
---- kolab-webadmin-2.2.3-20091217.orig/www/admin/settings/index.php.in	2010-09-30 23:37:57.000000000 +0200
-+++ kolab-webadmin-2.2.3-20091217/www/admin/settings/index.php.in	2010-09-30 23:38:08.000000000 +0200
+--- a/KolabAdmin-2.3.4/www/admin/settings/index.php	2010-09-30 23:37:57.000000000 +0200
++++ b/KolabAdmin-2.3.4/www/admin/settings/index.php	2010-09-30 23:38:08.000000000 +0200
 @@ -276,7 +276,7 @@
  				  array( 'service' => 'pop3s', 'name' => _('POP3/SSL service (TCP port 995)'), 'enabled' => toboolstr( $pop3s ) ),
  				  array( 'service' => 'imap', 'name'  => _('IMAP Service'), 'enabled' => toboolstr( $imap ) ),
@@ -16,10 +16,10 @@
  				  array( 'service' => 'http', 'name'  => _('FreeBusy Service via HTTP (in addition to HTTPS)'), 'enabled' => toboolstr( $http ) ),
  				  array( 'service' => 'amavis', 'name' => _('Amavis Email Scanning (Virus/Spam)'), 
  						 'enabled' => toboolstr( $amavis ) ) );
-Index: kolab-webadmin-2.2.3-20091217/php/admin/include/Sieve.php
+Index: b/KolabAdmin-2.3.4/lib/KolabAdmin/include/Sieve.php
 ===================================================================
---- kolab-webadmin-2.2.3-20091217.orig/php/admin/include/Sieve.php	2010-09-30 23:42:41.000000000 +0200
-+++ kolab-webadmin-2.2.3-20091217/php/admin/include/Sieve.php	2010-09-30 23:42:50.000000000 +0200
+--- a/KolabAdmin-2.3.4/lib/KolabAdmin/include/Sieve.php	2010-09-30 23:42:41.000000000 +0200
++++ b/KolabAdmin-2.3.4/lib/KolabAdmin/include/Sieve.php	2010-09-30 23:42:50.000000000 +0200
 @@ -147,7 +147,7 @@
      * @param  string $logintype Type of login to perform
      * @param  string $euser     Effective User (if $user=admin, login as $euser)