r20851 - in /trunk/libemail-send-perl/debian: changelog patches/add_usr_sbin_to_path rules
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 7 21:36:30 UTC 2008
Author: gregoa
Date: Sat Jun 7 21:36:29 2008
New Revision: 20851
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20851
Log:
* debian/rules:
- refresh with dh-make-perl's help
- actually use the patches that were prepared in 2.192-2; this should make
the package work with the new source package format "3.0 (quilt)", too
(closes: #485038); thanks to Raphaël Hertzog for the bug report
- don't install README any more (text version of the inline POD
documentation)
* Convert debian/changelog to UTF-8.
* Fix patch add_usr_sbin_to_path (missing semi-colons); comment out three
tests in t/sendmail.t that expect an empty path -- but we have patched in
/usr/sbin ...
Modified:
trunk/libemail-send-perl/debian/changelog
trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path
trunk/libemail-send-perl/debian/rules
Modified: trunk/libemail-send-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-send-perl/debian/changelog?rev=20851&op=diff
==============================================================================
--- trunk/libemail-send-perl/debian/changelog (original)
+++ trunk/libemail-send-perl/debian/changelog Sat Jun 7 21:36:29 2008
@@ -1,3 +1,19 @@
+libemail-send-perl (2.192-3) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - refresh with dh-make-perl's help
+ - actually use the patches that were prepared in 2.192-2; this should make
+ the package work with the new source package format "3.0 (quilt)", too
+ (closes: #485038); thanks to Raphaël Hertzog for the bug report
+ - don't install README any more (text version of the inline POD
+ documentation)
+ * Convert debian/changelog to UTF-8.
+ * Fix patch add_usr_sbin_to_path (missing semi-colons); comment out three
+ tests in t/sendmail.t that expect an empty path -- but we have patched in
+ /usr/sbin ...
+
+ -- gregor herrmann <gregoa at debian.org> Sat, 07 Jun 2008 23:00:53 +0200
+
libemail-send-perl (2.192-2) unstable; urgency=low
[ David Paleino ]
Modified: trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path?rev=20851&op=diff
==============================================================================
--- trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path (original)
+++ trunk/libemail-send-perl/debian/patches/add_usr_sbin_to_path Sat Jun 7 21:36:29 2008
@@ -1,30 +1,59 @@
-Index: libemail-send-perl/lib/Email/Send/Qmail.pm
-===================================================================
---- libemail-send-perl.orig/lib/Email/Send/Qmail.pm 2008-03-21 19:57:46.000000000 -0600
-+++ libemail-send-perl/lib/Email/Send/Qmail.pm 2008-03-21 19:58:05.000000000 -0600
+--- libemail-send-perl.orig/lib/Email/Send/Qmail.pm
++++ libemail-send-perl/lib/Email/Send/Qmail.pm
@@ -21,7 +21,9 @@
my $class = shift;
my $sendmail;
- for my $dir (File::Spec->path) {
+ my @path = File::Spec->path;
-+ push @path, '/usr/sbin' unless grep m!^/usr/sbin/?$!, @path
++ push @path, '/usr/sbin' unless grep m!^/usr/sbin/?$!, @path;
+ for my $dir (@path) {
if ( -x "$dir/$QMAIL" ) {
$sendmail = "$dir/$QMAIL";
last;
-Index: libemail-send-perl/lib/Email/Send/Sendmail.pm
-===================================================================
---- libemail-send-perl.orig/lib/Email/Send/Sendmail.pm 2008-03-21 19:56:57.000000000 -0600
-+++ libemail-send-perl/lib/Email/Send/Sendmail.pm 2008-03-21 19:57:39.000000000 -0600
+--- libemail-send-perl.orig/lib/Email/Send/Sendmail.pm
++++ libemail-send-perl/lib/Email/Send/Sendmail.pm
@@ -23,7 +23,9 @@
return $SENDMAIL if defined $SENDMAIL;
my $sendmail;
- for my $dir (File::Spec->path) {
+ my @path = File::Spec->path;
-+ push @path, '/usr/sbin' unless grep m!^/usr/sbin/?$!, @path
++ push @path, '/usr/sbin' unless grep m!^/usr/sbin/?$!, @path;
+ for my $dir (@path) {
if ( -x "$dir/sendmail" ) {
$sendmail = "$dir/sendmail";
last;
+--- libemail-send-perl.orig/t/sendmail.t
++++ libemail-send-perl/t/sendmail.t
+@@ -1,4 +1,4 @@
+-use Test::More tests => 11;
++use Test::More tests => 8;
+ use strict;
+ $^W = 1;
+
+@@ -14,15 +14,15 @@
+ blah blah blah
+ EOF
+
+-{
+- local $ENV{PATH} = '';
+- ok( Email::Send::Sendmail->is_available, 'Email::Send always is available' );
+- my $msg = Email::Send::Sendmail->is_available;
+- is $msg, 'No Sendmail found', 'is available return value says sendmail was not found';
+-
+- my $path = Email::Send::Sendmail->_find_sendmail;
+- ok( ! defined $path, 'no sendmail found because we have no path' );
+-}
++#{
++# local $ENV{PATH} = '';
++# ok( Email::Send::Sendmail->is_available, 'Email::Send always is available' );
++# my $msg = Email::Send::Sendmail->is_available;
++# is $msg, 'No Sendmail found', 'is available return value says sendmail was not found';
++#
++# my $path = Email::Send::Sendmail->_find_sendmail;
++# ok( ! defined $path, 'no sendmail found because we have no path' );
++#}
+
+ {
+ local $Email::Send::Sendmail::SENDMAIL = 'testing';
Modified: trunk/libemail-send-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-send-perl/debian/rules?rev=20851&op=diff
==============================================================================
--- trunk/libemail-send-perl/debian/rules (original)
+++ trunk/libemail-send-perl/debian/rules Sat Jun 7 21:36:29 2008
@@ -4,24 +4,23 @@
# 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
+
+# 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
+
include /usr/share/quilt/quilt.make
-export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
- $(PERL) Makefile.PL \
- INSTALLDIRS=vendor \
- VENDORARCHEXP=/usr/share/perl5 \
- INSTALLVENDORARCH=/usr/share/perl5
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
$(MAKE) test
touch $@
@@ -32,20 +31,25 @@
dh_clean build-stamp install-stamp sendmail.log
[ ! -f Makefile ] || $(MAKE) realclean
-install: build install-stamp
-install-stamp:
+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 eg/send-email.pl
- dh_installdocs README
+ dh_installexamples eg/*
+ dh_installdocs
dh_installchangelogs Changes
dh_perl
dh_compress
@@ -55,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