[Pkg-Cyrus-imapd-Debian-devel] [SVN] r250 - in trunk/cyrus-imapd-2.2.12/debian: changelog patches/45-kolab2-annotations.dpatch

[debian at incase.de]

Author: sven
Date: Wed Jan 11 15:46:02 2006
New Revision: 250

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=250
Log:
Implement patch proposed by Steffen Joeris (bug #347527)
Modified:
    trunk/cyrus-imapd-2.2.12/debian/changelog
    trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch

Modified: trunk/cyrus-imapd-2.2.12/debian/changelog
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/changelog?view=diff&rev=250&p1=trunk/cyrus-imapd-2.2.12/debian/changelog&r1=249&p2=trunk/cyrus-imapd-2.2.12/debian/changelog&r2=250
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.12/debian/changelog Wed Jan 11 15:46:02 2006
@@ -22,9 +22,11 @@
     Proper fix has to go into netsmp packages, also we need to properly use
     Debian's libtool. (Closes: #341580)
   * Add czech translation (thanks to Martin Sin and the debian-l10n-czech
-    team) with a spelling correction from Ondřej Surý.
+    team) with a spelling correction from Ondrej Surý.
+  * Adjust kolab2 annotation patch according to patch from Steffen Joeris
+    (Closes: #347527)
 
- -- Sven Mueller <debian at incase.de>  Thu, 29 Dec 2005 17:42:05 +0100
+ -- Sven Mueller <debian at incase.de>  Wed, 11 Jan 2006 15:43:33 +0100
 
 cyrus22-imapd (2.2.12-1) experimental; urgency=low
 

Modified: trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch?view=diff&rev=250&p1=trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch&r1=249&p2=trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch&r2=250
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch Wed Jan 11 15:46:02 2006
@@ -126,7 +126,7 @@
 diff -urNad cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm
 --- cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm	2005-03-12 23:09:22.000000000 +0100
 +++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm	2005-06-30 13:16:29.270725801 +0200
-@@ -782,7 +782,9 @@
+@@ -782,19 +782,21 @@
    my %values = ( "comment" => "/comment",
  		 "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
  		 "expire" => "/vendor/cmu/cyrus-imapd/expire",
@@ -137,3 +137,19 @@
  
    if(!$self->{support_annotatemore}) {
      $self->{error} = "Remote does not support ANNOTATEMORE.";
+     return undef;
+   }
+ 
+-  if(!exists($values{$entry})) {
+-    $self->{error} = "Unknown parameter $entry";
++  if(exists($values{$entry})) {
++    $entry = $values{$entry};
++  } else {
++    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
+   }
+ 
+-  $entry = $values{$entry};
+-
+   my ($rc, $msg);
+ 
+   $value = undef if($value eq "none");