[SVN] r733 - /branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcalling.sh.dpatch
debian at incase.de
debian at incase.de
Fri Jun 22 11:46:32 UTC 2007
Author: astronut
Date: Fri Jun 22 13:46:31 2007
New Revision: 733
URL: https://mail.incase.de/viewcvs?rev=3D733&root=3Dcyrus22&view=3Drev
Log:
Fix patch (we don't want to patch a .rej that doesn't exist)
Modified:
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcal=
ling.sh.dpatch
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_p=
erlcalling.sh.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/patches/30-update_perlcalling.sh.dpatch?rev=3D733&root=3Dcyrus22&r1=
=3D732&r2=3D733&view=3Ddiff
=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
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcal=
ling.sh.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcal=
ling.sh.dpatch Fri Jun 22 13:46:31 2007
@@ -138,46 +138,6 @@
require 5;
=
#Tim Martin
-diff -urNad cyrus-imapd-2.3-2.3.8/snmp/snmpgen.rej /tmp/dpep.uetA0X/cyrus-=
imapd-2.3-2.3.8/snmp/snmpgen.rej
---- cyrus-imapd-2.3-2.3.8/snmp/snmpgen.rej 2007-02-27 03:54:56.000000000 +=
0100
-+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/snmp/snmpgen.rej 1970-01-01 01:=
00:00.000000000 +0100
-@@ -1,36 +0,0 @@
--***************
--*** 38,45 ****
-- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- #
-- # $Id: snmpgen,v 1.15.4.3 2005/04/11 06:09:27 shadow Exp $
-- =
-- require 5;
-- =
-- #Tim Martin
----- 38,62 ----
-- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- #
--+ exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
--+ #!perl -w
-- # $Id: snmpgen,v 1.15.4.3 2005/04/11 06:09:27 shadow Exp $
-- =
--+ if ($] !~ /^5\..*/) {
--+ # uh-oh. this isn't perl 5.
--+ foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
--+ exec("$_/perl5", "-w", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
--+ }
--+ # we failed. bail.
--+ die "Your perl is too old; I need perl 5.\n";
--+ }
--+ =
--+ # load the real script. this is isolated in an 'eval' so perl4 won't
--+ # choke on the perl5-isms.
--+ eval join("\n", <DATA>);
--+ if ($@) { die "$@"; }
--+ =
--+ __END__
-- require 5;
-- =
-- #Tim Martin
diff -urNad cyrus-imapd-2.3-2.3.8/tools/arbitronsort.pl /tmp/dpep.uetA0X/c=
yrus-imapd-2.3-2.3.8/tools/arbitronsort.pl
--- cyrus-imapd-2.3-2.3.8/tools/arbitronsort.pl 2007-02-27 03:54:56.000000=
000 +0100
+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/arbitronsort.pl 2007-02-2=
7 03:54:57.952483403 +0100
@@ -221,21 +181,6 @@
require 5;
=
use strict;
-diff -urNad cyrus-imapd-2.3-2.3.8/tools/config2header.rej /tmp/dpep.uetA0X=
/cyrus-imapd-2.3-2.3.8/tools/config2header.rej
---- cyrus-imapd-2.3-2.3.8/tools/config2header.rej 2007-02-27 03:54:56.0000=
00000 +0100
-+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2header.rej 1970-01=
-01 01:00:00.000000000 +0100
-@@ -1,11 +0,0 @@
--***************
--*** 1,4 ****
--- #!/usr/bin/perl -w
-- # $Id: config2header,v 1.2.2.12 2005/04/13 15:43:33 shadow Exp $
-- #
-- # Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
----- 1,4 ----
--+ #!/bin/sh
-- # $Id: config2header,v 1.2.2.12 2005/04/13 15:43:33 shadow Exp $
-- #
-- # Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
diff -urNad cyrus-imapd-2.3-2.3.8/tools/config2man /tmp/dpep.uetA0X/cyrus-=
imapd-2.3-2.3.8/tools/config2man
--- cyrus-imapd-2.3-2.3.8/tools/config2man 2007-02-27 03:54:56.000000000 +=
0100
+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2man 2007-02-27 03:=
58:59.045529126 +0100
@@ -270,21 +215,6 @@
require 5;
=
use strict;
-diff -urNad cyrus-imapd-2.3-2.3.8/tools/config2man.rej /tmp/dpep.uetA0X/cy=
rus-imapd-2.3-2.3.8/tools/config2man.rej
---- cyrus-imapd-2.3-2.3.8/tools/config2man.rej 2007-02-27 03:54:56.0000000=
00 +0100
-+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2man.rej 1970-01-01=
01:00:00.000000000 +0100
-@@ -1,11 +0,0 @@
--***************
--*** 1,4 ****
--- #!/usr/bin/perl -w
-- # $Id: config2man,v 1.2.2.1 2003/12/19 18:33:58 ken3 Exp $
-- #
-- # Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
----- 1,4 ----
--+ #!/bin/sh
-- # $Id: config2man,v 1.2.2.1 2003/12/19 18:33:58 ken3 Exp $
-- #
-- # Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
diff -urNad cyrus-imapd-2.3-2.3.8/tools/dohash /tmp/dpep.uetA0X/cyrus-imap=
d-2.3-2.3.8/tools/dohash
--- cyrus-imapd-2.3-2.3.8/tools/dohash 2007-02-27 03:54:56.000000000 +0100
+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/dohash 2007-02-27 03:58:3=
9.706453594 +0100
@@ -322,48 +252,6 @@
require 5;
=
$| =3D 1;
-diff -urNad cyrus-imapd-2.3-2.3.8/tools/dohash.rej /tmp/dpep.uetA0X/cyrus-=
imapd-2.3-2.3.8/tools/dohash.rej
---- cyrus-imapd-2.3-2.3.8/tools/dohash.rej 2007-02-27 03:54:56.000000000 +=
0100
-+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/dohash.rej 1970-01-01 01:=
00:00.000000000 +0100
-@@ -1,38 +0,0 @@
--***************
--*** 38,45 ****
-- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- #
-- # $Id: dohash,v 1.10.18.1 2005/12/01 22:30:21 murch Exp $
-- =
-- require 5;
-- =
-- $| =3D 1;
----- 38,64 ----
-- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- #
--+ exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
--+ #!perl -w
--+ # script to upgrade from versions of imapd previous to 1.6.2
--+ # make sure you run it as the cyrus user
-- # $Id: dohash,v 1.10.18.1 2005/12/01 22:30:21 murch Exp $
-- =
--+ if ($] !~ /^5\..*/) {
--+ # uh-oh. this isn't perl 5.
--+ foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
--+ exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
--+ }
--+ # we failed. bail.
--+ die "Your perl is too old; I need perl 5.\n";
--+ }
--+ =
--+ # load the real script. this is isolated in an 'eval' so perl4 won't
--+ # choke on the perl5-isms.
--+ eval join("\n", <DATA>);
--+ if ($@) { die "$@"; }
--+ =
--+ __END__
-- require 5;
-- =
-- $| =3D 1;
diff -urNad cyrus-imapd-2.3-2.3.8/tools/masssievec /tmp/dpep.uetA0X/cyrus-=
imapd-2.3-2.3.8/tools/masssievec
--- cyrus-imapd-2.3-2.3.8/tools/masssievec 2007-02-27 03:54:56.000000000 +=
0100
+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/masssievec 2007-02-27 03:=
58:22.326183189 +0100
@@ -404,52 +292,6 @@
require 5;
=
$| =3D 1;
-diff -urNad cyrus-imapd-2.3-2.3.8/tools/masssievec.rej /tmp/dpep.uetA0X/cy=
rus-imapd-2.3-2.3.8/tools/masssievec.rej
---- cyrus-imapd-2.3-2.3.8/tools/masssievec.rej 2007-02-27 03:54:56.0000000=
00 +0100
-+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/masssievec.rej 1970-01-01=
01:00:00.000000000 +0100
-@@ -1,42 +0,0 @@
--***************
--*** 40,50 ****
-- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- #
-- #
-- # Script for mass compilation of sieve scripts.
-- #
-- # $Id: masssievec,v 1.2.2.3 2005/12/01 22:30:21 murch Exp $
-- =
-- require 5;
-- =
-- $| =3D 1;
----- 38,65 ----
-- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- #
--+ exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
--+ #!perl -w
-- #
-- # Script for mass compilation of sieve scripts.
-- #
-- # $Id: masssievec,v 1.2.2.3 2005/12/01 22:30:21 murch Exp $
-- =
--+ if ($] !~ /^5\..*/) {
--+ # uh-oh. this isn't perl 5.
--+ foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
--+ exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
--+ }
--+ # we failed. bail.
--+ die "Your perl is too old; I need perl 5.\n";
--+ }
--+ =
--+ # load the real script. this is isolated in an 'eval' so perl4 won't
--+ # choke on the perl5-isms.
--+ eval join("\n", <DATA>);
--+ if ($@) { die "$@"; }
--+ =
--+ __END__
-- require 5;
-- =
-- $| =3D 1;
diff -urNad cyrus-imapd-2.3-2.3.8/tools/mkimap /tmp/dpep.uetA0X/cyrus-imap=
d-2.3-2.3.8/tools/mkimap
--- cyrus-imapd-2.3-2.3.8/tools/mkimap 2007-02-27 03:54:56.000000000 +0100
+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mkimap 2007-02-27 03:57:4=
9.725426588 +0100
@@ -485,46 +327,6 @@
require 5;
=
sub read_conf {
-diff -urNad cyrus-imapd-2.3-2.3.8/tools/mkimap.rej /tmp/dpep.uetA0X/cyrus-=
imapd-2.3-2.3.8/tools/mkimap.rej
---- cyrus-imapd-2.3-2.3.8/tools/mkimap.rej 2007-02-27 03:54:56.000000000 +=
0100
-+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mkimap.rej 1970-01-01 01:=
00:00.000000000 +0100
-@@ -1,36 +0,0 @@
--***************
--*** 38,45 ****
-- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- #
-- # $Id: mkimap,v 1.15.2.4 2005/12/01 22:30:22 murch Exp $
-- =
-- require 5;
-- =
-- sub read_conf {
----- 38,62 ----
-- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- #
--+ exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
--+ #!perl -w
-- # $Id: mkimap,v 1.15.2.4 2005/12/01 22:30:22 murch Exp $
-- =
--+ if ($] !~ /^5\..*/) {
--+ # uh-oh. this isn't perl 5.
--+ foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
--+ exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
--+ }
--+ # we failed. bail.
--+ die "Your perl is too old; I need perl 5.\n";
--+ }
--+ =
--+ # load the real script. this is isolated in an 'eval' so perl4 won't
--+ # choke on the perl5-isms.
--+ eval join("\n", <DATA>);
--+ if ($@) { die "$@"; }
--+ =
--+ __END__
-- require 5;
-- =
-- sub read_conf {
diff -urNad cyrus-imapd-2.3-2.3.8/tools/mknewsgroups /tmp/dpep.uetA0X/cyru=
s-imapd-2.3-2.3.8/tools/mknewsgroups
--- cyrus-imapd-2.3-2.3.8/tools/mknewsgroups 2007-02-27 03:54:56.000000000=
+0100
+++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mknewsgroups 2007-02-27 0=
3:54:57.955483105 +0100
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list