r25354 - in /trunk/libemail-filter-perl: Changes META.yml debian/changelog debian/compat debian/control debian/copyright debian/rules lib/Email/Filter.pm

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Fri Sep 19 12:30:47 UTC 2008


Author: ansgar-guest
Date: Fri Sep 19 12:30:44 2008
New Revision: 25354

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25354
Log:
* New upstream release.
* Refresh debian/rules for debhelper 7
* Convert debian/copyright to proposed machine-readable format
* Add myself to Uploaders
* Bump Standards Version to 3.8.0 (no changes needed)
* debian/control: Don't start short description with a capital letter

Modified:
    trunk/libemail-filter-perl/Changes
    trunk/libemail-filter-perl/META.yml
    trunk/libemail-filter-perl/debian/changelog
    trunk/libemail-filter-perl/debian/compat
    trunk/libemail-filter-perl/debian/control
    trunk/libemail-filter-perl/debian/copyright
    trunk/libemail-filter-perl/debian/rules
    trunk/libemail-filter-perl/lib/Email/Filter.pm

Modified: trunk/libemail-filter-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/Changes?rev=25354&op=diff
==============================================================================
--- trunk/libemail-filter-perl/Changes (original)
+++ trunk/libemail-filter-perl/Changes Fri Sep 19 12:30:44 2008
@@ -1,4 +1,7 @@
 Changes file for Email::Filter
+
+1.032     2008-09-14
+          attempt to address https://rt.cpan.org/Ticket/Display.html?id=31018
 
 1.031     2007-03-22
           packaging improvements

Modified: trunk/libemail-filter-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/META.yml?rev=25354&op=diff
==============================================================================
--- trunk/libemail-filter-perl/META.yml (original)
+++ trunk/libemail-filter-perl/META.yml Fri Sep 19 12:30:44 2008
@@ -1,9 +1,10 @@
 --- #YAML:1.0
 name:                Email-Filter
-version:             1.031
+version:             1.032
 abstract:            ~
 license:             perl
-generated_by:        ExtUtils::MakeMaker version 6.32
+author:              ~
+generated_by:        ExtUtils::MakeMaker version 6.44
 distribution_type:   module
 requires:     
     Class::Trigger:                0.08
@@ -12,5 +13,5 @@
     IPC::Run:                      0.77
     Test::More:                    0.47
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.2.html
-    version: 1.2
+    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
+    version: 1.3

Modified: trunk/libemail-filter-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/debian/changelog?rev=25354&op=diff
==============================================================================
--- trunk/libemail-filter-perl/debian/changelog (original)
+++ trunk/libemail-filter-perl/debian/changelog Fri Sep 19 12:30:44 2008
@@ -1,3 +1,14 @@
+libemail-filter-perl (1.032-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh debian/rules for debhelper 7
+  * Convert debian/copyright to proposed machine-readable format
+  * Add myself to Uploaders
+  * Bump Standards Version to 3.8.0 (no changes needed)
+  * debian/control: Don't start short description with a capital letter
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Fri, 19 Sep 2008 14:30:20 +0200
+
 libemail-filter-perl (1.031-2) unstable; urgency=low
 
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser

Modified: trunk/libemail-filter-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/debian/compat?rev=25354&op=diff
==============================================================================
--- trunk/libemail-filter-perl/debian/compat (original)
+++ trunk/libemail-filter-perl/debian/compat Fri Sep 19 12:30:44 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libemail-filter-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/debian/control?rev=25354&op=diff
==============================================================================
--- trunk/libemail-filter-perl/debian/control (original)
+++ trunk/libemail-filter-perl/debian/control Fri Sep 19 12:30:44 2008
@@ -1,11 +1,14 @@
 Source: libemail-filter-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: perl (>= 5.8.0-7), libemail-localdelivery-perl (>= 0.07), libclass-trigger-perl (>= 0.08), libemail-simple-perl (>= 1.91), libipc-run-perl (>= 0.77), libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.08)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Niko Tyni <ntyni at iki.fi>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
-Standards-Version: 3.7.3
+Uploaders: Niko Tyni <ntyni at iki.fi>,
+ Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
+ gregor herrmann <gregor+debian at comodo.priv.at>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Standards-Version: 3.8.0
 Homepage: http://emailproject.perl.org/wiki/Email::Filter
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libemail-filter-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/
@@ -13,7 +16,7 @@
 Package: libemail-filter-perl
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, libemail-localdelivery-perl, libclass-trigger-perl, libemail-simple-perl, libipc-run-perl
-Description:  Library for creating easy email filters
+Description: library for creating easy email filters
  Email::Filter is another module produced by the "Perl Email Project",
  a reaction against the complexity and increasing bugginess of the
  "Mail::*" modules. It replaces Mail::Audit, and allows you to write

Modified: trunk/libemail-filter-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/debian/copyright?rev=25354&op=diff
==============================================================================
--- trunk/libemail-filter-perl/debian/copyright (original)
+++ trunk/libemail-filter-perl/debian/copyright Fri Sep 19 12:30:44 2008
@@ -1,23 +1,26 @@
-This is the debian package for the Email::Filter module.
-It was created by Niko Tyni <ntyni at iki.fi> using dh-make-perl on
-Mon, 19 Dec 2005 20:06:30 +0200
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=228
+Upstream-Name: Email-Filter
+Upstream-Maintainer: Ricardo SIGNES
+Upstream-Source: http://search.cpan.org/dist/Email-Filter/
 
-It was downloaded from http://www.cpan.org/modules/by-module/Email/
-
-Upstream authors:
-
- Casey West <casey at geeknest.com>
- Simon Cozens <simon at cpan.org>
-
-Copyright:
-
- Copyright 2003, Simon Cozens <simon at cpan.org>
-
+Files: *
+Copyright: © 2003, Simon Cozens <simon at cpan.org>
+License: GPL-1+ | Artistic | BSD
  You may use this module under the terms of the BSD, Artistic, or GPL
  licenses, any version.
+ .
+ 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',
+ the Artistic Licence in `/usr/share/common-licenses/Artistic' and the
+ BSD License in `/usr/share/common-licenses/BSD'.
 
-You can find copies of these licenses in 
-/usr/share/common-licenses/BSD ,
-/usr/share/common-licenses/GPL , and
-/usr/share/common-licenses/Artistic .
+Files: debian/*
+Copyright:
+ © 2005-2007, Niko Tyni <ntyni at iki.fi>
+ © 2007-2008, gregor herrmann <gregor+debian at comodo.priv.at>
+ © 2008,      Ansgar Burchardt <ansgar at 43-1.org>
+License: GPL-1+ | Artistic | BSD
+ It is assumed that all contributors put their work under the same license
+ as the module itself.
 

Modified: trunk/libemail-filter-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/debian/rules?rev=25354&op=diff
==============================================================================
--- trunk/libemail-filter-perl/debian/rules (original)
+++ trunk/libemail-filter-perl/debian/rules Fri Sep 19 12:30:44 2008
@@ -1,70 +1,23 @@
 #!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> 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
-
-# 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)
 
 build: build-stamp
 build-stamp:
-	dh_testdir
-
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
-	$(MAKE) test
-
+	dh build
 	touch $@
 
 clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) realclean
+	dh $@
 
 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
-
+	dh install
 	touch $@
 
 binary-arch:
-# We have nothing to do here for an architecture-independent package
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs Changes
-	dh_perl
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-indep: install
+	dh $@
 
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary: binary-arch binary-indep
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: binary binary-arch binary-indep install clean build

Modified: trunk/libemail-filter-perl/lib/Email/Filter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libemail-filter-perl/lib/Email/Filter.pm?rev=25354&op=diff
==============================================================================
--- trunk/libemail-filter-perl/lib/Email/Filter.pm (original)
+++ trunk/libemail-filter-perl/lib/Email/Filter.pm Fri Sep 19 12:30:44 2008
@@ -10,7 +10,7 @@
 use constant TEMPFAIL  => 75;
 use constant REJECTED  => 100;
 
-$Email::Filter::VERSION = "1.031";
+$Email::Filter::VERSION = "1.032";
 
 =head1 NAME
 
@@ -84,8 +84,10 @@
 
 sub fail_gracefully {
     my $self = shift;
-    if ($self->{emergency} and $self->accept($self->{emergency})) {
-        $self->done_ok; # That worked.
+    our $FAILING_GRACEFULLY;
+    if ($self->{emergency} and ! $FAILING_GRACEFULLY) {
+      local $FAILING_GRACEFULLY = 1;
+      $self->done_ok if $self->accept($self->{emergency});
     }
     $self->fail_badly;
 }




More information about the Pkg-perl-cvs-commits mailing list