r4919 - in /packages/libmail-imapclient-perl/trunk: ./
BodyStructure/Parse/ Thread/ debian/ debian/patches/
gwolf at users.alioth.debian.org
gwolf at users.alioth.debian.org
Thu Mar 1 01:53:13 CET 2007
Author: gwolf
Date: Thu Mar 1 01:53:12 2007
New Revision: 4919
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=4919
Log:
Ok, seems I identified and moved all the patches into dpatch!
Added:
packages/libmail-imapclient-perl/trunk/debian/patches/30_uninitialized_warning.dpatch (with props)
packages/libmail-imapclient-perl/trunk/debian/patches/40_pod_whatis_parse_error.dpatch (with props)
Modified:
packages/libmail-imapclient-perl/trunk/BodyStructure/Parse/Makefile.PL
packages/libmail-imapclient-perl/trunk/IMAPClient.pm
packages/libmail-imapclient-perl/trunk/IMAPClient.pod
packages/libmail-imapclient-perl/trunk/Makefile.PL
packages/libmail-imapclient-perl/trunk/Thread/Makefile.PL
packages/libmail-imapclient-perl/trunk/debian/changelog
packages/libmail-imapclient-perl/trunk/debian/control
packages/libmail-imapclient-perl/trunk/debian/patches/00list
packages/libmail-imapclient-perl/trunk/debian/patches/20_ssl_support.dpatch
Modified: packages/libmail-imapclient-perl/trunk/BodyStructure/Parse/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/BodyStructure/Parse/Makefile.PL?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/BodyStructure/Parse/Makefile.PL (original)
+++ packages/libmail-imapclient-perl/trunk/BodyStructure/Parse/Makefile.PL Thu Mar 1 01:53:12 2007
@@ -42,7 +42,5 @@
'Parse.pm' =>
'$(INST_LIBDIR)/BodyStructure/Parse.pm'
},
- 'MAN3PODS' => {'Parse.pod' =>
- '$(INST_MAN3DIR)/Mail::IMAPClient::BodyStructure::Parse.3pm'},
);
Modified: packages/libmail-imapclient-perl/trunk/IMAPClient.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/IMAPClient.pm?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/IMAPClient.pm (original)
+++ packages/libmail-imapclient-perl/trunk/IMAPClient.pm Thu Mar 1 01:53:12 2007
@@ -1906,7 +1906,7 @@
return undef;
}
# successfully wrote to other end, keep going...
- $count += $ret if defined($ret);
+ $count += $ret;
LINES: while ( $iBuffer =~ s/^(.*?\x0d?\x0a)// ) {
my $current_line = $1;
Modified: packages/libmail-imapclient-perl/trunk/IMAPClient.pod
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/IMAPClient.pod?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/IMAPClient.pod (original)
+++ packages/libmail-imapclient-perl/trunk/IMAPClient.pod Thu Mar 1 01:53:12 2007
@@ -3414,25 +3414,6 @@
parameter/value pairs to the method, or later by calling the
parameter's eponymous object method.
-=head2 Ssl
-
-Example:
-
- $is_ssl_active = $imap->Ssl();
- # or:
- $imap->Ssl($activate_ssl);
-
-Specifies whether a connection should be established using a SSL (cyphered)
-channel or via a regular clear TCP connection. Of course, setting this
-parameter makes sense only before the connection is established.
-
-Please note that this parameter was specifically added for the Debian
-packaging. If you are developing software to be deployed over different
-machines, we suggest you not to use it - or to specify your users to install
-this patch. You can get it at Debian's bug tracking system at
-L<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=111960>, or at CPAN's
-L<http://rt.cpan.org/NoAuth/Bug.html?id=9256>.
-
=cut
Modified: packages/libmail-imapclient-perl/trunk/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/Makefile.PL?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/Makefile.PL (original)
+++ packages/libmail-imapclient-perl/trunk/Makefile.PL Thu Mar 1 01:53:12 2007
@@ -28,7 +28,6 @@
'Fcntl' => 0,
'IO::Select' => 0,
'IO::File' => 0,
- 'IO::Socket::SSL'=>0,
'Data::Dumper' => 0,
'Carp' => 0,
},
Modified: packages/libmail-imapclient-perl/trunk/Thread/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/Thread/Makefile.PL?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/Thread/Makefile.PL (original)
+++ packages/libmail-imapclient-perl/trunk/Thread/Makefile.PL Thu Mar 1 01:53:12 2007
@@ -41,7 +41,5 @@
'Thread.pm' =>
'$(INST_LIBDIR)/Thread.pm'
},
- 'MAN3PODS' => {'Thread.pod' =>
- '$(INST_MAN3DIR)/Mail::IMAPClient::Thread.3pm'},
);
Modified: packages/libmail-imapclient-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/debian/changelog?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/debian/changelog (original)
+++ packages/libmail-imapclient-perl/trunk/debian/changelog Thu Mar 1 01:53:12 2007
@@ -4,8 +4,9 @@
* Now creates the inner state for externally created sockets. Thanks
to Alexander Zangerl for the patch. (dpatch:
10_get_socket_on_external) (Closes: #401144)
+ * Bumped up standards-version to 3.7.2.2 - no changes needed
- -- Gunnar Wolf <gwolf at debian.org> Wed, 28 Feb 2007 18:08:33 -0600
+ -- Gunnar Wolf <gwolf at debian.org> Wed, 28 Feb 2007 18:48:40 -0600
libmail-imapclient-perl (2.2.9+deb-4) unstable; urgency=low
Modified: packages/libmail-imapclient-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/debian/control?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/debian/control (original)
+++ packages/libmail-imapclient-perl/trunk/debian/control Thu Mar 1 01:53:12 2007
@@ -5,7 +5,7 @@
Uploaders: Joachim Breitner <nomeata at debian.org>, Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>, Russ Allbery <rra at debian.org>
Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9)
Build-Depends-Indep: perl (>= 5.6.0-17), libparse-recdescent-perl, libio-socket-ssl-perl
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-perl/packages/libmail-imapclient-perl/trunk/
Package: libmail-imapclient-perl
Modified: packages/libmail-imapclient-perl/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/debian/patches/00list?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/debian/patches/00list (original)
+++ packages/libmail-imapclient-perl/trunk/debian/patches/00list Thu Mar 1 01:53:12 2007
@@ -1,2 +1,4 @@
10_get_socket_on_external
20_ssl_support
+30_uninitialized_warning
+40_pod_whatis_parse_error
Modified: packages/libmail-imapclient-perl/trunk/debian/patches/20_ssl_support.dpatch
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/debian/patches/20_ssl_support.dpatch?rev=4919&op=diff
==============================================================================
--- packages/libmail-imapclient-perl/trunk/debian/patches/20_ssl_support.dpatch (original)
+++ packages/libmail-imapclient-perl/trunk/debian/patches/20_ssl_support.dpatch Thu Mar 1 01:53:12 2007
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad trunk~/IMAPClient.pm trunk/IMAPClient.pm
---- trunk~/IMAPClient.pm 2007-02-28 18:14:12.000000000 -0600
-+++ trunk/IMAPClient.pm 2007-02-28 18:15:17.000000000 -0600
+--- trunk~/IMAPClient.pm 2007-02-28 18:32:12.000000000 -0600
++++ trunk/IMAPClient.pm 2007-02-28 18:32:12.000000000 -0600
@@ -8,6 +8,7 @@
use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
use Socket();
@@ -25,7 +25,7 @@
)
) {
no strict 'refs';
-@@ -245,13 +247,15 @@
+@@ -246,13 +248,15 @@
and $IO::Socket::INET::VERSION eq '1.25'
and !$self->Port;
%$self = (%$self, @_);
@@ -44,7 +44,7 @@
unless ( defined($sock) ) {
-@@ -302,9 +306,10 @@
+@@ -303,9 +307,10 @@
my $id = $self->User;
my $has_quotes = $id =~ /^".*"$/ ? 1 : 0;
@@ -58,7 +58,7 @@
$self->_imap_command($string)
and $self->State(Authenticated);
# $self->folders and $self->separator unless $self->NoAutoList;
-@@ -1628,7 +1633,7 @@
+@@ -1629,7 +1634,7 @@
return undef;
}
# successfully wrote to other end, keep going...
@@ -67,7 +67,7 @@
LINES: while ( $iBuffer =~ s/^(.*?\x0d?\x0a)// ) {
my $current_line = $1;
-@@ -2167,8 +2172,8 @@
+@@ -2168,8 +2173,8 @@
(?:"[^"]*"|NIL)\s+ # "delimiter" or NIL
(?:"([^"]*)"|(.*))\x0d\x0a$ # Name or "Folder name"
/ix;
@@ -78,3 +78,43 @@
# $self->_debug("folders: line $list[$m]: 1=$1 and 2=$2\n");
}
+diff -urNad trunk~/IMAPClient.pod trunk/IMAPClient.pod
+--- trunk~/IMAPClient.pod 2007-02-28 18:31:17.000000000 -0600
++++ trunk/IMAPClient.pod 2007-02-28 18:33:34.000000000 -0600
+@@ -3414,6 +3414,25 @@
+ parameter/value pairs to the method, or later by calling the
+ parameter's eponymous object method.
+
++=head2 Ssl
++
++Example:
++
++ $is_ssl_active = $imap->Ssl();
++ # or:
++ $imap->Ssl($activate_ssl);
++
++Specifies whether a connection should be established using a SSL (cyphered)
++channel or via a regular clear TCP connection. Of course, setting this
++parameter makes sense only before the connection is established.
++
++Please note that this parameter was specifically added for the Debian
++packaging. If you are developing software to be deployed over different
++machines, we suggest you not to use it - or to specify your users to install
++this patch. You can get it at Debian's bug tracking system at
++L<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=111960>, or at CPAN's
++L<http://rt.cpan.org/NoAuth/Bug.html?id=9256>.
++
+ =cut
+
+
+diff -urNad trunk~/Makefile.PL trunk/Makefile.PL
+--- trunk~/Makefile.PL 2007-02-28 18:31:55.000000000 -0600
++++ trunk/Makefile.PL 2007-02-28 18:32:34.000000000 -0600
+@@ -28,6 +28,7 @@
+ 'Fcntl' => 0,
+ 'IO::Select' => 0,
+ 'IO::File' => 0,
++ 'IO::Socket::SSL'=>0,
+ 'Data::Dumper' => 0,
+ 'Carp' => 0,
+ },
Added: packages/libmail-imapclient-perl/trunk/debian/patches/30_uninitialized_warning.dpatch
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/debian/patches/30_uninitialized_warning.dpatch?rev=4919&op=file
==============================================================================
--- packages/libmail-imapclient-perl/trunk/debian/patches/30_uninitialized_warning.dpatch (added)
+++ packages/libmail-imapclient-perl/trunk/debian/patches/30_uninitialized_warning.dpatch Thu Mar 1 01:53:12 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_uninitialized_warning.dpatch by <gwolf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes an uninitialized value warning (bug #158617)
+
+ at DPATCH@
+diff -urNad trunk~/IMAPClient.pm trunk/IMAPClient.pm
+--- trunk~/IMAPClient.pm 2007-02-28 18:37:59.000000000 -0600
++++ trunk/IMAPClient.pm 2007-02-28 18:39:11.000000000 -0600
+@@ -1628,7 +1628,7 @@
+ return undef;
+ }
+ # successfully wrote to other end, keep going...
+- $count += $ret;
++ $count += $ret if defined($ret);
+ LINES: while ( $iBuffer =~ s/^(.*?\x0d?\x0a)// ) {
+ my $current_line = $1;
+
Propchange: packages/libmail-imapclient-perl/trunk/debian/patches/30_uninitialized_warning.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/libmail-imapclient-perl/trunk/debian/patches/40_pod_whatis_parse_error.dpatch
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libmail-imapclient-perl/trunk/debian/patches/40_pod_whatis_parse_error.dpatch?rev=4919&op=file
==============================================================================
--- packages/libmail-imapclient-perl/trunk/debian/patches/40_pod_whatis_parse_error.dpatch (added)
+++ packages/libmail-imapclient-perl/trunk/debian/patches/40_pod_whatis_parse_error.dpatch Thu Mar 1 01:53:12 2007
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_pod_whatis_parse_error.dpatch by <gwolf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes a whatis parse error in several manpage, as the result mans of
+## DP: some .pod files were being overwritten by the empty contents of the
+## DP: corresponding .pm files (see bug #283660)
+
+ at DPATCH@
+diff -urNad trunk~/BodyStructure/Parse/Makefile.PL trunk/BodyStructure/Parse/Makefile.PL
+--- trunk~/BodyStructure/Parse/Makefile.PL 2007-02-28 18:41:29.000000000 -0600
++++ trunk/BodyStructure/Parse/Makefile.PL 2007-02-28 18:43:47.000000000 -0600
+@@ -42,5 +42,7 @@
+ 'Parse.pm' =>
+ '$(INST_LIBDIR)/BodyStructure/Parse.pm'
+ },
++ 'MAN3PODS' => {'Parse.pod' =>
++ '$(INST_MAN3DIR)/Mail::IMAPClient::BodyStructure::Parse.3pm'},
+ );
+
+diff -urNad trunk~/Thread/Makefile.PL trunk/Thread/Makefile.PL
+--- trunk~/Thread/Makefile.PL 2007-02-28 18:41:26.000000000 -0600
++++ trunk/Thread/Makefile.PL 2007-02-28 18:43:35.000000000 -0600
+@@ -41,5 +41,7 @@
+ 'Thread.pm' =>
+ '$(INST_LIBDIR)/Thread.pm'
+ },
++ 'MAN3PODS' => {'Thread.pod' =>
++ '$(INST_MAN3DIR)/Mail::IMAPClient::Thread.3pm'},
+ );
+
Propchange: packages/libmail-imapclient-perl/trunk/debian/patches/40_pod_whatis_parse_error.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-perl-cvs-commits
mailing list