[SVN] r350 - /trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch

[debian at incase.de]

Author: sven
Date: Tue Apr 18 18:33:32 2006
New Revision: 350

URL: https://mail.incase.de/viewcvs?rev=350&root=cyrus22&view=rev
Log:
Remove weird .rej patch from debian/patches/65-sieveshell-enhancements.dpatch

Modified:
    trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch?rev=350&root=cyrus22&r1=349&r2=350&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch Tue Apr 18 18:33:32 2006
@@ -5,9 +5,9 @@
 ## DP: Adds some enhancements to sieveshell and fixes some paths.
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm
---- cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm	2006-03-31 22:44:20.000000000 +0200
-+++ /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm	2006-03-31 22:49:09.179194218 +0200
+diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm
+--- cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm	2006-04-18 18:24:55.000000000 +0200
++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm	2006-04-18 18:26:19.796548250 +0200
 @@ -126,7 +126,7 @@
  		  [\&_sc_info, '[mailbox]',
  		   'display mailbox/server metadata'],
@@ -53,64 +53,9 @@
    }
    if (!$cyrref || !$$cyrref) {
      die "mboxconfig: no connection to server\n";
-diff -urNad cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm.rej /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm.rej
---- cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm.rej	2006-03-31 22:44:20.000000000 +0200
-+++ /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/imap/IMAP/Shell.pm.rej	1970-01-01 01:00:00.000000000 +0100
-@@ -1,51 +0,0 @@
--***************
--*** 126,132 ****
--  		  [\&_sc_info, '[mailbox]',
--  		   'display mailbox/server metadata'],
--  		mboxcfg =>
--- 		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
--  		   'configure mailbox'],
--  		mboxconfig => 'mboxcfg',
--  		reconstruct =>
----- 126,132 ----
--  		  [\&_sc_info, '[mailbox]',
--  		   'display mailbox/server metadata'],
--  		mboxcfg =>
--+ 		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
--  		   'configure mailbox'],
--  		mboxconfig => 'mboxcfg',
--  		reconstruct =>
--***************
--*** 1347,1353 ****
--    while (defined ($opt = shift(@argv))) {
--      last if $opt eq '--';
--      if ($opt =~ /^-/) {
---       die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
--      }
--      else {
--        push(@nargv, $opt);
----- 1347,1353 ----
--    while (defined ($opt = shift(@argv))) {
--      last if $opt eq '--';
--      if ($opt =~ /^-/) {
--+       die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
--      }
--      else {
--        push(@nargv, $opt);
--***************
--*** 1356,1362 ****
--    }
--    push(@nargv, @argv);
--    if (@nargv < 2) {
---     die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
--    }
--    if (!$cyrref || !$$cyrref) {
--      die "mboxconfig: no connection to server\n";
----- 1356,1362 ----
--    }
--    push(@nargv, @argv);
--    if (@nargv < 2) {
--+     die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
--    }
--    if (!$cyrref || !$$cyrref) {
--      die "mboxconfig: no connection to server\n";
-diff -urNad cyrus-imapd-2.2/perl/sieve/lib/request.c /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/sieve/lib/request.c
---- cyrus-imapd-2.2/perl/sieve/lib/request.c	2006-03-31 22:44:20.000000000 +0200
-+++ /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/sieve/lib/request.c	2006-03-31 22:44:28.734855670 +0200
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/lib/request.c /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c
+--- cyrus-imapd-2.2.13/perl/sieve/lib/request.c	2006-04-18 18:24:55.000000000 +0200
++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c	2006-04-18 18:25:11.549208277 +0200
 @@ -560,7 +560,6 @@
  	      char **refer_to, char **errstrp)
  {
@@ -119,9 +64,9 @@
    mystring_t *errstr=NULL;
    lexstate_t state;
    int ret = 0;
-diff -urNad cyrus-imapd-2.2/perl/sieve/scripts/sieveshell.pl /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/sieve/scripts/sieveshell.pl
---- cyrus-imapd-2.2/perl/sieve/scripts/sieveshell.pl	2006-03-31 22:44:21.000000000 +0200
-+++ /tmp/dpep.NCY00o/cyrus-imapd-2.2/perl/sieve/scripts/sieveshell.pl	2006-03-31 22:44:28.734855670 +0200
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl	2006-04-18 18:25:07.000000000 +0200
++++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl	2006-04-18 18:25:11.550208179 +0200
 @@ -60,7 +60,9 @@
  my $username = $ENV{USER};
  my $authname = $ENV{USER};