r20728 - in /trunk/libmail-sendeasy-perl/debian: changelog control patches/001_plus-in-emailaddress.dpatch patches/001_plus-in-emailaddress.patch patches/002_pure-html-message.dpatch patches/002_pure-html-message.patch patches/00list patches/series rules
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Thu Jun 5 22:00:07 UTC 2008
Author: gregoa
Date: Thu Jun 5 22:00:06 2008
New Revision: 20728
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20728
Log:
* Change patch system from dpatch to quilt.
* Refresh debian/rules, no functional changes.
Added:
trunk/libmail-sendeasy-perl/debian/patches/001_plus-in-emailaddress.patch
trunk/libmail-sendeasy-perl/debian/patches/002_pure-html-message.patch
trunk/libmail-sendeasy-perl/debian/patches/series
Removed:
trunk/libmail-sendeasy-perl/debian/patches/001_plus-in-emailaddress.dpatch
trunk/libmail-sendeasy-perl/debian/patches/002_pure-html-message.dpatch
trunk/libmail-sendeasy-perl/debian/patches/00list
Modified:
trunk/libmail-sendeasy-perl/debian/changelog
trunk/libmail-sendeasy-perl/debian/control
trunk/libmail-sendeasy-perl/debian/rules
Modified: trunk/libmail-sendeasy-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-sendeasy-perl/debian/changelog?rev=20728&op=diff
==============================================================================
--- trunk/libmail-sendeasy-perl/debian/changelog (original)
+++ trunk/libmail-sendeasy-perl/debian/changelog Thu Jun 5 22:00:06 2008
@@ -1,3 +1,10 @@
+libmail-sendeasy-perl (1.2-2) UNRELEASED; urgency=low
+
+ * Change patch system from dpatch to quilt.
+ * Refresh debian/rules, no functional changes.
+
+ -- gregor herrmann <gregoa at debian.org> Thu, 05 Jun 2008 23:56:23 +0200
+
libmail-sendeasy-perl (1.2-1) unstable; urgency=low
* Initial Release (Closes: #464046).
Modified: trunk/libmail-sendeasy-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-sendeasy-perl/debian/control?rev=20728&op=diff
==============================================================================
--- trunk/libmail-sendeasy-perl/debian/control (original)
+++ trunk/libmail-sendeasy-perl/debian/control Thu Jun 5 22:00:06 2008
@@ -1,7 +1,7 @@
Source: libmail-sendeasy-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40)
Build-Depends-Indep: perl (>= 5.8.8-12)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Michael Mende <debian at menole.net>
Added: trunk/libmail-sendeasy-perl/debian/patches/001_plus-in-emailaddress.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-sendeasy-perl/debian/patches/001_plus-in-emailaddress.patch?rev=20728&op=file
==============================================================================
--- trunk/libmail-sendeasy-perl/debian/patches/001_plus-in-emailaddress.patch (added)
+++ trunk/libmail-sendeasy-perl/debian/patches/001_plus-in-emailaddress.patch Thu Jun 5 22:00:06 2008
@@ -1,0 +1,30 @@
+Author: Michael Mende <debian at menole.net>
+Description: The e-mail syntax checker does not handle plus signs in usernames.
+Let Mail::RFC822::Address do the address syntax check.
+--- libmail-sendeasy-perl.orig/lib/Mail/SendEasy.pm
++++ libmail-sendeasy-perl/lib/Mail/SendEasy.pm
+@@ -17,6 +17,7 @@
+ no warnings ;
+
+ use vars qw($VERSION @ISA) ;
++use Mail::RFC822::Address qw(valid);
+
+ $VERSION = '1.2' ;
+
+@@ -444,15 +445,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;
+ }
+
+ ################
Added: trunk/libmail-sendeasy-perl/debian/patches/002_pure-html-message.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-sendeasy-perl/debian/patches/002_pure-html-message.patch?rev=20728&op=file
==============================================================================
--- trunk/libmail-sendeasy-perl/debian/patches/002_pure-html-message.patch (added)
+++ trunk/libmail-sendeasy-perl/debian/patches/002_pure-html-message.patch Thu Jun 5 22:00:06 2008
@@ -1,0 +1,14 @@
+Author: Michael Mende <debian at menole.net>
+Description: Fix handling of pure html mails.
+--- libmail-sendeasy-perl.orig/lib/Mail/SendEasy.pm
++++ libmail-sendeasy-perl/lib/Mail/SendEasy.pm
+@@ -225,7 +225,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' ,
Added: trunk/libmail-sendeasy-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-sendeasy-perl/debian/patches/series?rev=20728&op=file
==============================================================================
--- trunk/libmail-sendeasy-perl/debian/patches/series (added)
+++ trunk/libmail-sendeasy-perl/debian/patches/series Thu Jun 5 22:00:06 2008
@@ -1,0 +1,2 @@
+001_plus-in-emailaddress.patch
+002_pure-html-message.patch
Modified: trunk/libmail-sendeasy-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmail-sendeasy-perl/debian/rules?rev=20728&op=diff
==============================================================================
--- trunk/libmail-sendeasy-perl/debian/rules (original)
+++ trunk/libmail-sendeasy-perl/debian/rules Thu Jun 5 22:00:06 2008
@@ -11,33 +11,25 @@
# always return the default without waiting for user input.
export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
+include /usr/share/quilt/quilt.make
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP = $(CURDIR)/debian/$(PACKAGE)
-
-include /usr/share/dpatch/dpatch.make
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp: patch
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
-
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
# `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
@@ -45,11 +37,10 @@
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"
-
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
touch $@
binary-arch:
@@ -58,7 +49,6 @@
binary-indep: build install
dh_testdir
dh_testroot
- dh_installexamples
dh_installdocs README
dh_installchangelogs Changes
dh_perl
@@ -69,8 +59,5 @@
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
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-perl-cvs-commits
mailing list