diff -Nru libmail-sendeasy-perl-1.2/debian/changelog libmail-sendeasy-perl-1.2/debian/changelog --- libmail-sendeasy-perl-1.2/debian/changelog 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/changelog 2011-09-18 13:54:20.000000000 +0000 @@ -1,3 +1,33 @@ +libmail-sendeasy-perl (1.2-2) unstable; urgency=low + + [ gregor herrmann ] + * Change patch system from dpatch to quilt. + * Refresh debian/rules, no functional changes. + * Add debian/README.source to document quilt usage, as required by + Debian Policy since 3.8.0. + * debian/control: Changed: Switched Vcs-Browser field to ViewSVN + (source stanza). + * debian/control: Added: ${misc:Depends} to Depends: field. + + [ Nathan Handler ] + * debian/watch: Update to ignore development releases. + + [ gregor herrmann ] + * Remove Michael Mende from Uploaders on request of the MIA team + (closes: #578181). + + [ Ansgar Burchardt ] + * debian/control: Convert Vcs-* fields to Git. + * Use source format 3.0 (quilt). + * Make build-dep on perl unversioned. + * Use tiny debian/rules with debhelper 8. + * Convert debian/copyright to proposed machine-readable format. + * debian/control: Mention module name in description. + * Add myself to Uploaders. + * Bumped Standards-Version to 3.9.2. + + -- Ansgar Burchardt Sun, 18 Sep 2011 15:54:14 +0200 + libmail-sendeasy-perl (1.2-1) unstable; urgency=low * Initial Release (Closes: #464046). diff -Nru libmail-sendeasy-perl-1.2/debian/compat libmail-sendeasy-perl-1.2/debian/compat --- libmail-sendeasy-perl-1.2/debian/compat 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/compat 2011-09-18 13:48:38.000000000 +0000 @@ -1 +1 @@ -5 +8 diff -Nru libmail-sendeasy-perl-1.2/debian/control libmail-sendeasy-perl-1.2/debian/control --- libmail-sendeasy-perl-1.2/debian/control 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/control 2011-09-18 13:54:13.000000000 +0000 @@ -1,20 +1,20 @@ Source: libmail-sendeasy-perl Section: perl Priority: optional -Build-Depends: debhelper (>= 5.0.0), dpatch -Build-Depends-Indep: perl (>= 5.8.8-12) -Maintainer: Debian Perl Group -Uploaders: Michael Mende -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 8) +Build-Depends-Indep: perl +Maintainer: Debian Perl Group +Uploaders: Ansgar Burchardt +Standards-Version: 3.9.2 Homepage: http://search.cpan.org/dist/Mail-SendEasy/ -Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmail-sendeasy-perl/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-sendeasy-perl/ +Vcs-Git: git://git.debian.org/pkg-perl/packages/libmail-sendeasy-perl.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libmail-sendeasy-perl.git Package: libmail-sendeasy-perl Architecture: all -Depends: ${perl:Depends}, libmail-rfc822-address-perl -Description: Send plain/html e-mails through SMTP servers - This modules will send in a easy way e-mails, and doesn't have +Depends: ${misc:Depends}, ${perl:Depends}, libmail-rfc822-address-perl +Description: Perl module to send plain/html e-mails through SMTP servers + Mail::SendEasy will send in a easy way e-mails, and doesn't have dependencies on libnet packages. . It supports SMTP authentication and attachments. diff -Nru libmail-sendeasy-perl-1.2/debian/copyright libmail-sendeasy-perl-1.2/debian/copyright --- libmail-sendeasy-perl-1.2/debian/copyright 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/copyright 2011-09-18 13:52:19.000000000 +0000 @@ -1,20 +1,31 @@ -This is the debian package for the Mail::SendEasy module. -It was created by Michael Mende using dh-make-perl. - -It was downloaded from http://search.cpan.org/dist/Mail-SendEasy/ - -The upstream author is: Graciliano M. P. - -Copyright (C) 2004 Graciliano M. P. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. - -Perl is distributed under your choice of the GNU General Public License or -the Artistic License. On Debian GNU/Linux systems, the complete text of the -GNU General Public License can be found in `/usr/share/common-licenses/GPL' -and the Artistic Licence in `/usr/share/common-licenses/Artistic'. - - -The Debian packaging is (C) 2008, Michael Mende and -is licensed under the same terms as the software itself (see above). +Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=59 +Maintainer: Graciliano Monteiro Passos +Source: http://search.cpan.org/dist/Mail-SendEasy/ +Name: Mail-SendEasy + +Files: * +Copyright: 2003-2004, Graciliano M. P. +License: Artistic or GPL-1+ + +Files: debian/* +Copyright: + 2008, Michael Mende + 2008, gregor herrmann + 2011, Ansgar Burchardt +License: Artistic or GPL-1+ + +License: Artistic + This program is free software; you can redistribute it and/or modify + it under the terms of the Artistic License, which comes with Perl. + . + On Debian systems, the complete text of the Artistic License can be + found in `/usr/share/common-licenses/Artistic'. + +License: GPL-1+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + . + On Debian systems, the complete text of version 1 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-1'. diff -Nru libmail-sendeasy-perl-1.2/debian/patches/001_plus-in-emailaddress.dpatch libmail-sendeasy-perl-1.2/debian/patches/001_plus-in-emailaddress.dpatch --- libmail-sendeasy-perl-1.2/debian/patches/001_plus-in-emailaddress.dpatch 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/patches/001_plus-in-emailaddress.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 001_plus-in-emailaddress.dpatch by Michael Mende -## -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: The e-mail syntax checker does not handle plus signs in usernames. -## DP: Let Mail::RFC822::Address do the address syntax check. - -diff -urNad /tmp/SendEasy.pm libmail-sendeasy-perl-1.2/lib/Mail/SendEasy.pm ---- /tmp/SendEasy.pm 2004-04-09 07:48:46.000000000 +0000 -+++ libmail-sendeasy-perl-1.2/lib/Mail/SendEasy.pm 2008-02-05 10:12:12.000000000 +0000 -@@ -17,6 +17,7 @@ - no warnings ; - - use vars qw($VERSION @ISA) ; -+use Mail::RFC822::Address qw(valid); - - $VERSION = '1.2' ; - -@@ -444,15 +446,7 @@ - - my ( $mail ) = @_ ; - -- my $stat = 1 ; -- -- if ($mail !~ /^[\w\.-]+\@localhost$/gsi) { -- if ($mail !~ /^[\w\.-]+\@(?:[\w-]+\.)*?(?:\w+(?:-\w+)*)(?:\.\w+)+$/ ) { $stat = undef ;} -- } -- elsif ($mail !~ /^[\w\.-]+\@[\w-]+$/ ) { $stat = undef ;} -- -- return 1 if $stat ; -- return undef ; -+ return Mail::RFC822::Address::valid($mail) ? 1 : undef; - } - - ################ diff -Nru libmail-sendeasy-perl-1.2/debian/patches/001_plus-in-emailaddress.patch libmail-sendeasy-perl-1.2/debian/patches/001_plus-in-emailaddress.patch --- libmail-sendeasy-perl-1.2/debian/patches/001_plus-in-emailaddress.patch 1970-01-01 00:00:00.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/patches/001_plus-in-emailaddress.patch 2011-09-18 13:44:30.000000000 +0000 @@ -0,0 +1,30 @@ +Author: Michael Mende +Description: The e-mail syntax checker does not handle plus signs in usernames. +Let Mail::RFC822::Address do the address syntax check. +--- a/lib/Mail/SendEasy.pm ++++ b/lib/Mail/SendEasy.pm +@@ -17,6 +17,7 @@ use strict qw(vars); + no warnings ; + + use vars qw($VERSION @ISA) ; ++use Mail::RFC822::Address qw(valid); + + $VERSION = '1.2' ; + +@@ -444,15 +445,7 @@ sub _format { + + my ( $mail ) = @_ ; + +- my $stat = 1 ; +- +- if ($mail !~ /^[\w\.-]+\@localhost$/gsi) { +- if ($mail !~ /^[\w\.-]+\@(?:[\w-]+\.)*?(?:\w+(?:-\w+)*)(?:\.\w+)+$/ ) { $stat = undef ;} +- } +- elsif ($mail !~ /^[\w\.-]+\@[\w-]+$/ ) { $stat = undef ;} +- +- return 1 if $stat ; +- return undef ; ++ return Mail::RFC822::Address::valid($mail) ? 1 : undef; + } + + ################ diff -Nru libmail-sendeasy-perl-1.2/debian/patches/002_pure-html-message.dpatch libmail-sendeasy-perl-1.2/debian/patches/002_pure-html-message.dpatch --- libmail-sendeasy-perl-1.2/debian/patches/002_pure-html-message.dpatch 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/patches/002_pure-html-message.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 001_pure-html-message.dpatch by Michael Mende -## -## DP: Fix handling of pure html mails. - -diff -urNad /tmp/SendEasy.pm libmail-sendeasy-perl-1.2/lib/Mail/SendEasy.pm ---- /tmp/SendEasy.pm 2004-04-09 07:48:46.000000000 +0000 -+++ libmail-sendeasy-perl-1.2/lib/Mail/SendEasy.pm 2008-02-05 11:59:23.000000000 +0000 -@@ -224,7 +224,8 @@ - } - - if ( defined $mail{html} ) { -- $mail{msg} =~ s/\r\n?/\n/gs ; -+ $mail{html} =~ s/\r\n?/\n/gs ; -+ if ( $mail{html} !~ /\n\n$/s) { $mail{html} =~ s/\n?$/\n\n/s ;} - - my %part = ( - 'Content-Type' => 'text/html; charset=ISO-8859-1' , diff -Nru libmail-sendeasy-perl-1.2/debian/patches/002_pure-html-message.patch libmail-sendeasy-perl-1.2/debian/patches/002_pure-html-message.patch --- libmail-sendeasy-perl-1.2/debian/patches/002_pure-html-message.patch 1970-01-01 00:00:00.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/patches/002_pure-html-message.patch 2011-09-18 13:44:30.000000000 +0000 @@ -0,0 +1,14 @@ +Author: Michael Mende +Description: Fix handling of pure html mails. +--- a/lib/Mail/SendEasy.pm ++++ b/lib/Mail/SendEasy.pm +@@ -225,7 +225,8 @@ sub send { + } + + if ( defined $mail{html} ) { +- $mail{msg} =~ s/\r\n?/\n/gs ; ++ $mail{html} =~ s/\r\n?/\n/gs ; ++ if ( $mail{html} !~ /\n\n$/s) { $mail{html} =~ s/\n?$/\n\n/s ;} + + my %part = ( + 'Content-Type' => 'text/html; charset=ISO-8859-1' , diff -Nru libmail-sendeasy-perl-1.2/debian/patches/00list libmail-sendeasy-perl-1.2/debian/patches/00list --- libmail-sendeasy-perl-1.2/debian/patches/00list 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -001_plus-in-emailaddress.dpatch -002_pure-html-message.dpatch diff -Nru libmail-sendeasy-perl-1.2/debian/patches/series libmail-sendeasy-perl-1.2/debian/patches/series --- libmail-sendeasy-perl-1.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/patches/series 2011-09-18 13:44:30.000000000 +0000 @@ -0,0 +1,2 @@ +001_plus-in-emailaddress.patch +002_pure-html-message.patch diff -Nru libmail-sendeasy-perl-1.2/debian/rules libmail-sendeasy-perl-1.2/debian/rules --- libmail-sendeasy-perl-1.2/debian/rules 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/rules 2011-09-18 13:48:22.000000000 +0000 @@ -1,76 +1,8 @@ #!/usr/bin/make -f -# This debian/rules file is provided as a template for normal perl -# packages. It was created by Marc Brockschmidt for -# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may -# be used freely wherever it is useful. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ -# If set to a true value then MakeMaker's prompt function will -# always return the default without waiting for user input. -export PERL_MM_USE_DEFAULT=1 - -PACKAGE=$(shell dh_listpackages) - -ifndef PERL -PERL = /usr/bin/perl -endif - -TMP = $(CURDIR)/debian/$(PACKAGE) - -include /usr/share/dpatch/dpatch.make - -build: build-stamp -build-stamp: patch - dh_testdir - - $(PERL) Makefile.PL INSTALLDIRS=vendor - $(MAKE) +override_dh_auto_test: # `make test` needs interaction - #$(MAKE) test - - touch $@ - -clean: unpatch - dh_testdir - dh_testroot - - dh_clean build-stamp install-stamp - - [ ! -f Makefile ] || $(MAKE) realclean - -install: install-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_clean -k - - $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr - [ ! -d "$(TMP)/usr/lib/perl5" ] || \ - rmdir --ignore-fail-on-non-empty --parents --verbose "$(TMP)/usr/lib/perl5" - - touch $@ - -binary-arch: -# We have nothing to do here for an architecture-independent package - -binary-indep: build install - dh_testdir - dh_testroot - dh_installexamples - dh_installdocs README - dh_installchangelogs Changes - dh_perl - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary + #dh_auto_test disabled diff -Nru libmail-sendeasy-perl-1.2/debian/source/format libmail-sendeasy-perl-1.2/debian/source/format --- libmail-sendeasy-perl-1.2/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/source/format 2011-10-17 14:14:24.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru libmail-sendeasy-perl-1.2/debian/watch libmail-sendeasy-perl-1.2/debian/watch --- libmail-sendeasy-perl-1.2/debian/watch 2011-10-17 14:14:23.000000000 +0000 +++ libmail-sendeasy-perl-1.2/debian/watch 2011-09-18 13:44:30.000000000 +0000 @@ -1,3 +1,3 @@ # format version number, currently 3; this line is compulsory! version=3 -http://search.cpan.org/dist/Mail-SendEasy/ .*/Mail-SendEasy-v?(\d[\d_.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip) +http://search.cpan.org/dist/Mail-SendEasy/ .*/Mail-SendEasy-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)