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

[pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org]

Author: sven
Date: Thu Jun 30 13:18:09 2005
New Revision: 156

URL: https://mail.incase.de/viewcvs?root=3Dcyrus22?view=3Drev&rev=3D156
Log:
Add cyradm/IMAP::Admin feature to allow kolab annotation type
Modified:
    trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch

Modified: trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpa=
tch
URL: https://mail.incase.de/viewcvs?root=3Dcyrus22/trunk/cyrus-imapd-2.2.12=
/debian/patches/45-kolab2-annotations.dpatch?view=3Ddiff&rev=3D156&p1=3Dtru=
nk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch&r1=3D155&=
p2=3Dtrunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch&r=
2=3D156
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch (o=
riginal)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/45-kolab2-annotations.dpatch Th=
u Jun 30 13:18:09 2005
@@ -5,9 +5,9 @@
 ## DP: No description.
 =

 @DPATCH@
-diff -urNad cyrus22-imapd-2.2.12/imap/annotate.c /tmp/dpep.djRMoj/cyrus22-=
imapd-2.2.12/imap/annotate.c
+diff -urNad cyrus22-imapd-2.2.12/imap/annotate.c /tmp/dpep.AQbIR0/cyrus22-=
imapd-2.2.12/imap/annotate.c
 --- cyrus22-imapd-2.2.12/imap/annotate.c	2005-03-12 23:09:22.000000000 +01=
00
-+++ /tmp/dpep.djRMoj/cyrus22-imapd-2.2.12/imap/annotate.c	2005-06-29 16:09=
:13.359785195 +0200
++++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c	2005-06-30 13:15=
:22.121300304 +0200
 @@ -1606,6 +1606,11 @@
      { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
  };
@@ -123,3 +123,17 @@
  	sdata.entry_list =3D sdata.entry_list->next;
  	free(freeme);
      }
+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.00000=
0000 +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 @@
+   my %values =3D ( "comment" =3D> "/comment",
+ 		 "news2mail" =3D> "/vendor/cmu/cyrus-imapd/news2mail",
+ 		 "expire" =3D> "/vendor/cmu/cyrus-imapd/expire",
+-		 "squat" =3D> "/vendor/cmu/cyrus-imapd/squat" );
++		 "squat" =3D> "/vendor/cmu/cyrus-imapd/squat",
++		 "folder-type" =3D> "/vendor/kolab/folder-type",
++		 "h-share-uid" =3D> "/vendor/kolab/h-share-uid" );
+ =

+   if(!$self->{support_annotatemore}) {
+     $self->{error} =3D "Remote does not support ANNOTATEMORE.";