r17064 - in /trunk/libnetxap-perl/debian: ./ patches/
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sun Mar 9 14:47:16 UTC 2008
Author: gregoa-guest
Date: Sun Mar 9 14:47:11 2008
New Revision: 17064
URL: http://svn.debian.org/wsvn/?sc=1&rev=17064
Log:
Change patch system from dpatch to quilt.
Added:
trunk/libnetxap-perl/debian/patches/10shebang.patch
trunk/libnetxap-perl/debian/patches/20pod.patch
trunk/libnetxap-perl/debian/patches/30banner.patch
trunk/libnetxap-perl/debian/patches/40namespace.patch
trunk/libnetxap-perl/debian/patches/50debug.patch
trunk/libnetxap-perl/debian/patches/60lc.patch
trunk/libnetxap-perl/debian/patches/70search.patch
trunk/libnetxap-perl/debian/patches/80expunge.patch
trunk/libnetxap-perl/debian/patches/90quota.patch
trunk/libnetxap-perl/debian/patches/series
Removed:
trunk/libnetxap-perl/debian/patches/00list
trunk/libnetxap-perl/debian/patches/10shebang.dpatch
trunk/libnetxap-perl/debian/patches/20pod.dpatch
trunk/libnetxap-perl/debian/patches/30banner.dpatch
trunk/libnetxap-perl/debian/patches/40namespace.dpatch
trunk/libnetxap-perl/debian/patches/50debug.dpatch
trunk/libnetxap-perl/debian/patches/60lc.dpatch
trunk/libnetxap-perl/debian/patches/70search.dpatch
trunk/libnetxap-perl/debian/patches/80expunge.dpatch
trunk/libnetxap-perl/debian/patches/90quota.dpatch
Modified:
trunk/libnetxap-perl/debian/changelog
trunk/libnetxap-perl/debian/control
trunk/libnetxap-perl/debian/rules
Modified: trunk/libnetxap-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/changelog?rev=17064&op=diff
==============================================================================
--- trunk/libnetxap-perl/debian/changelog (original)
+++ trunk/libnetxap-perl/debian/changelog Sun Mar 9 14:47:11 2008
@@ -8,8 +8,9 @@
* Set Standards-Version to 3.7.3 (no changes).
* Add /me to Uploaders.
* debian/copyright: add download URL.
+ * Change patch system from dpatch to quilt.
- -- gregor herrmann <gregor+debian at comodo.priv.at> Sun, 09 Mar 2008 14:38:52 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sun, 09 Mar 2008 15:45:52 +0100
libnetxap-perl (0.02-6) unstable; urgency=low
Modified: trunk/libnetxap-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/control?rev=17064&op=diff
==============================================================================
--- trunk/libnetxap-perl/debian/control (original)
+++ trunk/libnetxap-perl/debian/control Sun Mar 9 14:47:11 2008
@@ -1,7 +1,7 @@
Source: libnetxap-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>= 5), quilt
Build-Depends-Indep: perl (>= 5.8.0-7)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jaldhar H. Vyas <jaldhar at debian.org>, Niko Tyni <ntyni at iki.fi>,
Added: trunk/libnetxap-perl/debian/patches/10shebang.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/10shebang.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/10shebang.patch (added)
+++ trunk/libnetxap-perl/debian/patches/10shebang.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,16 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Remove unneeded shebang lines from the module files.
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -1,4 +1,3 @@
+-#!/usr/local/bin/perl
+ #
+ # Copyright (c) 1997-1999 Kevin Johnson <kjj at pobox.com>.
+ #
+--- libnetxap-perl.orig/Net/xAP.pm
++++ libnetxap-perl/Net/xAP.pm
+@@ -1,4 +1,3 @@
+-#!/usr/local/bin/perl
+ #
+ # Copyright (c) 1997-1999 Kevin Johnson <kjj at pobox.com>.
+ #
Added: trunk/libnetxap-perl/debian/patches/20pod.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/20pod.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/20pod.patch (added)
+++ trunk/libnetxap-perl/debian/patches/20pod.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,38 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Fix POD markup.
+Originally probably from CPAN #346 by Michael Guennewig
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -2523,7 +2523,7 @@
+
+ =head1 Myrights
+
+-This is a container for C<myrights> responses>
++This is a container for C<myrights> responses
+
+ =head2 mailbox
+
+@@ -2807,7 +2807,7 @@
+
+ =head1 Multipart
+
+-This is a container for C<BodyStructure objects that are multipart entities.
++This is a container for C<BodyStructure> objects that are multipart entities.
+
+ =head2 parts
+
+@@ -2902,12 +2902,12 @@
+
+ =head2 envelope
+
+-If the MIME content type is C<message/rfc822, returns a
++If the MIME content type is C<message/rfc822>, returns a
+ C<Net::IMAP::Envelope> object, otherwise returns undef.
+
+ =head2 bodystructure
+
+-If the MIME content type is C<message/rfc822, returns a
++If the MIME content type is C<message/rfc822>, returns a
+ C<Net::IMAP::BodyStructure> object, otherwise returns undef.
+
+ =head2 md5
Added: trunk/libnetxap-perl/debian/patches/30banner.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/30banner.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/30banner.patch (added)
+++ trunk/libnetxap-perl/debian/patches/30banner.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,33 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Fix mishandling of IMAP banner (#256836)
+Originally by Jaldhar H. Vyas
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -232,6 +232,12 @@
+ return undef;
+ }
+
++ unless ($self->has_capability("IMAP4rev1")){
++ carp "server does not support IMAP4rev1";
++ $self->close_connection or carp "error closing connection: $!";
++ return undef;
++ }
++
+ return $self;
+ }
+
+@@ -262,14 +268,6 @@
+ } elsif (($list->[0] ne '*') || ($list->[1] !~ /^ok$/i)) {
+ return undef;
+ }
+- my $supports_imap4rev1 = 0;
+- for my $item (@{$list}) {
+- $supports_imap4rev1++ if ($item =~ /^imap4rev1$/i);
+- }
+- unless ($supports_imap4rev1) {
+- $self->close_connection;
+- return undef;
+- }
+
+ $self->{Banner} = $list;
+
Added: trunk/libnetxap-perl/debian/patches/40namespace.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/40namespace.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/40namespace.patch (added)
+++ trunk/libnetxap-perl/debian/patches/40namespace.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,33 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Fix an issue with the namespace function returning NIL. (#256837)
+Originally by Jaldhar H. Vyas
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -2391,14 +2391,21 @@
+ $self->{Parent} = $parent;
+
+ my $fields = Net::xAP->parse_fields($str);
+- for my $n (0 .. 2) {
+- my $field = $fields->[$n];
+- for my $item (@{$field}) {
+- $item->[1] = '' if (lc($item->[1]) eq 'nil');
+- $self->{Namespaces}{$namespace_types[$n]}{$item->[0]} = $item->[1];
++ if (lc($fields->[1]) eq 'nil')
++ {
++ for my $n (0 .. 2) {
++ $self->{Namespaces}{$namespace_types[$n]}{$fields->[0]} = '';
++ }
++ }
++ else
++ {
++ for my $n (0 .. 2) {
++ my $field = $fields->[$n];
++ for my $item (@{$field}) {
++ $self->{Namespaces}{$namespace_types[$n]}{$item->[0]} = $item->[1];
++ }
+ }
+ }
+-
+ return $self;
+ }
+
Added: trunk/libnetxap-perl/debian/patches/50debug.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/50debug.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/50debug.patch (added)
+++ trunk/libnetxap-perl/debian/patches/50debug.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,15 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Suppress debug output unless we actually asked for it.
+Originally from Morten Bgeskov (#319558)
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -2088,7 +2088,8 @@
+ my %hash = @{Net::xAP->parse_fields($str)->[0]};
+ for my $key (keys %hash) {
+ my $lckey = lc($key);
+- print "$lckey $hash{$key}\n";
++ print "$lckey $hash{$key}\n"
++ if $parent->debug;
+ if ($lckey eq 'envelope') {
+ $self->{Items}{$lckey} = Net::IMAP::Envelope->new($hash{$key});
+ } elsif (($lckey eq 'bodystructure') || ($lckey eq 'body')) {
Added: trunk/libnetxap-perl/debian/patches/60lc.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/60lc.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/60lc.patch (added)
+++ trunk/libnetxap-perl/debian/patches/60lc.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,14 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Fix lc() usage.
+Originally from CPAN #346 by Michael Guennewig
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -2465,7 +2465,7 @@
+ $self->{Mailbox} = shift(@fields);
+ my %hash = @fields;
+ for my $key (keys %hash) {
+- $self->{Identifiers}{lc{$key}} = $hash{$key};
++ $self->{Identifiers}{lc($key)} = $hash{$key};
+ }
+
+ return $self;
Added: trunk/libnetxap-perl/debian/patches/70search.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/70search.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/70search.patch (added)
+++ trunk/libnetxap-perl/debian/patches/70search.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,18 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Fix 'use of uninitialized value' messages when an IMAP search
+doesn't match.
+Originally from CPAN #346 by Michael Guennewig
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -2202,6 +2202,11 @@
+
+ $self->{Parent} = $parent;
+
++ if (!defined $str) {
++ $self->{Msgnums} = {};
++ return $self;
++ }
++
+ for my $item (split(/\s/, $str)) {
+ $self->{Msgnums}{$item}++;
+ }
Added: trunk/libnetxap-perl/debian/patches/80expunge.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/80expunge.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/80expunge.patch (added)
+++ trunk/libnetxap-perl/debian/patches/80expunge.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,14 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Fix handling of expunge responses. (#366209)
+Patch by Torsten Hilbrich.
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -1850,7 +1850,7 @@
+ return $self;
+ }
+
+-sub msgnum { $_->{Msgnum} }
++sub msgnum { $_[0]->{Msgnum} }
+
+ ###############################################################################
+
Added: trunk/libnetxap-perl/debian/patches/90quota.patch
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/90quota.patch?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/90quota.patch (added)
+++ trunk/libnetxap-perl/debian/patches/90quota.patch Sun Mar 9 14:47:11 2008
@@ -1,0 +1,16 @@
+Author: Niko Tyni <ntyni at iki.fi>
+Description: Fix quota support. (#366480)
+Original patch by Mike Beattie.
+--- libnetxap-perl.orig/Net/IMAP.pm
++++ libnetxap-perl/Net/IMAP.pm
+@@ -2621,8 +2621,8 @@
+ my @fields = @{Net::xAP->parse_fields($str)};
+ $self->{QuotaRoot} = shift(@fields);
+ while (@fields) {
+- my ($resource, $usage, $limit) = splice(@fields, 0, 3);
+- $self->{Quota}{lc($resource)} = [$usage, $limit];
++ my ($resource, $usage, $limit) = splice(@{$fields[0]}, 0, 3);
++ $self->{Quotas}{lc($resource)} = [$usage, $limit];
+ }
+
+ return $self;
Added: trunk/libnetxap-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/patches/series?rev=17064&op=file
==============================================================================
--- trunk/libnetxap-perl/debian/patches/series (added)
+++ trunk/libnetxap-perl/debian/patches/series Sun Mar 9 14:47:11 2008
@@ -1,0 +1,9 @@
+10shebang.patch
+20pod.patch
+30banner.patch
+40namespace.patch
+50debug.patch
+60lc.patch
+70search.patch
+80expunge.patch
+90quota.patch
Modified: trunk/libnetxap-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libnetxap-perl/debian/rules?rev=17064&op=diff
==============================================================================
--- trunk/libnetxap-perl/debian/rules (original)
+++ trunk/libnetxap-perl/debian/rules Sun Mar 9 14:47:11 2008
@@ -7,7 +7,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
PACKAGE=$(shell dh_listpackages)
@@ -20,8 +20,8 @@
endif
TMP =$(CURDIR)/debian/$(PACKAGE)
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor
More information about the Pkg-perl-cvs-commits
mailing list