On Mon, Jan 09, 2006 at 12:12:51AM +1100, matt hope wrote: > If you'd like to go ahead and NMU, you have my blessing - or, if you > give me a week, I'll get this into better shape.
This week has quite passed, so I'll now upload an NMU to DELAYED/5-day. Let's see how this turns out. Anyway, I'll keep an eye on this as I wouldn't like this package to simply bitrot... Cheers, Flo
diff -u libmailtools-perl-1.62/Mail/Address.pm
libmailtools-perl-1.74/Mail/Address.pm
--- libmailtools-perl-1.62/Mail/Address.pm
+++ libmailtools-perl-1.74/Mail/Address.pm
@@ -194,12 +194,6 @@
}
elsif($_ eq '>') {
$depth-- if $depth;
- unless ($depth) {
- my $o = _complete($pkg,[EMAIL PROTECTED], [EMAIL PROTECTED], [EMAIL
PROTECTED]);
- push(@objs, $o) if(defined $o);
- $depth = 0;
- $next = _find_next($idx+1,$tokens,$len);
- }
}
elsif($_ eq ',') {
warn "Unmatched '<>' in $line" if($depth);
@@ -214,6 +208,12 @@
}
elsif($_ eq '>') {
$depth-- if $depth;
+ unless ($depth) {
+ my $o = _complete($pkg,[EMAIL PROTECTED], [EMAIL PROTECTED], [EMAIL
PROTECTED]);
+ push(@objs, $o) if(defined $o);
+ $depth = 0;
+ $next = _find_next($idx+1,$tokens,$len);
+ }
}
elsif($_ eq ',' || $_ eq ';') {
warn "Unmatched '<>' in $line" if($depth);
reverted:
--- libmailtools-perl-1.62/Mail/Mailer.pm
+++ libmailtools-perl-1.62.orig/Mail/Mailer.pm
@@ -34,10 +34,6 @@
Use the C<sendmail> program to deliver the mail. C<$command> is the
path to C<sendmail>.
-=item C<qmail>
-
-Use qmail's qmail-inject program to deliver the mail.
-
=item C<smtp>
Use the C<smtp> protocol via Net::SMTP to deliver the mail. The server
diff -u libmailtools-perl-1.62/debian/changelog
libmailtools-perl-1.74/debian/changelog
--- libmailtools-perl-1.62/debian/changelog
+++ libmailtools-perl-1.74/debian/changelog
@@ -1,3 +1,17 @@
+libmailtools-perl (1.74-0.1) unstable; urgency=low
+
+ * Non-maintainer upload with maintainer's blessing
+ * New upstream release (Closes: Bug#329583)
+ + doesn't taint parsed addresses anymore (Closes: Bug#346008)
+ * Revert patch for qmail, not needed anymore (Closes: Bug#316160)
+ * Correct manual page for Mail::Field -> extract (Closes: Bug#304155)
+ * Correct manual page for Mail::Header -> get (Closes: #247009)
+ * Upgrade debhelper compatibitly level
+ * Update upstream info
+ * Drop Suggests: libmail-audit-perl as it was removed from the archive
+
+ -- Florian Ernst <[EMAIL PROTECTED]> Tue, 28 Feb 2006 19:18:29 +0100
+
libmailtools-perl (1.62-1) unstable; urgency=low
* New upstream release
diff -u libmailtools-perl-1.62/debian/control
libmailtools-perl-1.74/debian/control
--- libmailtools-perl-1.62/debian/control
+++ libmailtools-perl-1.74/debian/control
@@ -2,15 +2,14 @@
Priority: optional
Section: mail
Maintainer: Matt Hope <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 3.0.5), perl (>= 5.6.0-17), libnet-perl,
libtimedate-perl
-Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 5), perl (>= 5.6.0-17), libnet-perl,
libtimedate-perl
+Standards-Version: 3.6.2
Package: libmailtools-perl
Architecture: all
Priority: optional
Section: mail
Depends: ${perl:Depends}, libnet-perl, libtimedate-perl
-Suggests: libmail-audit-perl
Conflicts: mailtools (<= 1.15-1)
Replaces: mailtools (<= 1.15-1)
Provides: libmail-perl, mailtools
diff -u libmailtools-perl-1.62/debian/rules libmailtools-perl-1.74/debian/rules
--- libmailtools-perl-1.62/debian/rules
+++ libmailtools-perl-1.74/debian/rules
@@ -1,8 +1,5 @@
#!/usr/bin/make -f
-# Use debhelper V. 2
-export DH_COMPAT := 2
-
# Make sure perl is defined
PERL ?= /usr/bin/perl
diff -u libmailtools-perl-1.62/debian/copyright
libmailtools-perl-1.74/debian/copyright
--- libmailtools-perl-1.62/debian/copyright
+++ libmailtools-perl-1.74/debian/copyright
@@ -5,9 +5,7 @@
Upstream Maintainer: Mark Overmeer <[EMAIL PROTECTED]>
Download URL:
- http://search.cpan.org/author/MARKOV/MailTools-1.48/
- http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/
- http://search.cpan.org/search?dist=Mailtools
+ http://search.cpan.org/~markov/MailTools-1.74/
Debianised:
Originally: Michael Alan Dorman <[EMAIL PROTECTED]>
only in patch2:
unchanged:
--- libmailtools-perl-1.74.orig/debian/compat
+++ libmailtools-perl-1.74/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- libmailtools-perl-1.74.orig/Mail/Header.pm
+++ libmailtools-perl-1.74/Mail/Header.pm
@@ -942,7 +942,7 @@
=item get ( TAG [, INDEX ] )
-Get the text form a line. If C<INDEX> is given then the text of the Nth
+Get the text from a line. If C<INDEX> is given then the text of the Nth
instance will be returned. If it is not given the return value depends on the
context in which C<get> was called. In an array context a list of all the
text from all the instances of C<TAG> will be returned. In a scalar context
only in patch2:
unchanged:
--- libmailtools-perl-1.74.orig/Mail/Field.pm
+++ libmailtools-perl-1.74/Mail/Field.pm
@@ -409,11 +409,11 @@
=item extract ( TAG, HEAD [, INDEX ] )
-This constuctor takes as arguments the tag name, a C<Mail::Head> object
+This constuctor takes as arguments the tag name, a C<Mail::Header> object
and optionally an index.
If the index argument is given then C<extract> will retrieve the given tag
-from the C<Mail::Head> object and create a new C<Mail::Field> based object.
+from the C<Mail::Header> object and create a new C<Mail::Field> based object.
I<undef> will be returned in the field does not exist.
If the index argument is not given the the result depends on the context
signature.asc
Description: Digital signature
