[libdatetime-format-human-duration-perl] 03/06: Drop patches, both applied upstream.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libdatetime-format-human-duration-perl.

commit fb25c526728a580d318a3def5b082bddadef6623
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Jul 24 16:20:54 2016 +0200

    Drop patches, both applied upstream.
---
 debian/patches/DateTime-Locale-compatibility.diff | 55 -----------------------
 debian/patches/series                             |  2 -
 debian/patches/spelling-error-in-manpage.diff     | 27 -----------
 3 files changed, 84 deletions(-)

diff --git a/debian/patches/DateTime-Locale-compatibility.diff b/debian/patches/DateTime-Locale-compatibility.diff
deleted file mode 100644
index ed91423..0000000
--- a/debian/patches/DateTime-Locale-compatibility.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Add compatibility for newer versions of DateTime::Locale (RT #108601)
-Bug: https://github.com/mstratman/DateTime-Format-Human-Duration/pull/7
-Author: Slaven Rezic <slaven at rezic.de>
-Last-Update: 2016-03-10
-
---- a/lib/DateTime/Format/Human/Duration.pm
-+++ b/lib/DateTime/Format/Human/Duration.pm
-@@ -17,7 +17,11 @@
-     my $dur = $dt - $dtb;
- 
-     if (!exists $args{'locale'}) {
--        $args{'locale'} = $dt->{'locale'}{'id'};
-+	if (UNIVERSAL::can($dt->{'locale'}, 'code')) {
-+	    $args{'locale'} = $dt->{'locale'}->code; # DateTime::Locale v1
-+	} else {
-+	    $args{'locale'} = $dt->{'locale'}->id;   # DateTime::Locale v0
-+	}
-     }
-     
-     return $span->format_duration($dur, %args);    
---- a/lib/DateTime/Format/Human/Duration/Locale.pm
-+++ b/lib/DateTime/Format/Human/Duration/Locale.pm
-@@ -46,15 +46,24 @@
-     return '' if !$args_hr->{'get_locale_from'};
- 
-     if (ref $args_hr->{'get_locale_from'}) {
--        my $ns = ref($args_hr->{'get_locale_from'});
-+	my $locale_obj;
-+	if (UNIVERSAL::can($args_hr->{'get_locale_from'}, 'locale')) {
-+	    $locale_obj = $args_hr->{'get_locale_from'}->locale;
-+	}
-+	else {
-+	    $locale_obj = $args_hr->{'get_locale_from'};
-+	}
- 
--        if (exists $args_hr->{'get_locale_from'}{'locale'}) {
--            $ns = exists $args_hr->{'get_locale_from'}{'locale'}{'id'} ? $args_hr->{'get_locale_from'}{'locale'}{'id'} : ref($args_hr->{'get_locale_from'}{'locale'});
--        }
--        elsif ($ns =~ m{^DateTime::Locale::} && exists $args_hr->{'get_locale_from'}{'id'}) {
--            $ns = $args_hr->{'get_locale_from'}{'id'};
--        }
--        ($args_hr->{'get_locale_from'}) = reverse split /::/, $ns;
-+	if (UNIVERSAL::can($locale_obj, 'code')) {
-+	    $args_hr->{'get_locale_from'} = $locale_obj->code; # DateTime::Locale v1
-+	}
-+	elsif (UNIVERSAL::can($locale_obj, 'id')) {
-+	    $args_hr->{'get_locale_from'} = $locale_obj->id;   # DateTime::Locale v0
-+	}
-+	else {
-+	    my $ns = ref($args_hr->{'get_locale_from'});
-+	    ($args_hr->{'get_locale_from'}) = reverse split /::/, $ns;
-+	}
-     }
-     
-     my ($short) = split(/[-_]+/,$args_hr->{'get_locale_from'});
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 79a824b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-DateTime-Locale-compatibility.diff
-spelling-error-in-manpage.diff
diff --git a/debian/patches/spelling-error-in-manpage.diff b/debian/patches/spelling-error-in-manpage.diff
deleted file mode 100644
index 4e3ce13..0000000
--- a/debian/patches/spelling-error-in-manpage.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix spelling errors detected by lintian
-Author: Nick Morrott <knowledgejunkie at gmail.com>
-Bug: https://github.com/mstratman/DateTime-Format-Human-Duration/pull/8
-Last-Update: 2016-03-10
----
---- a/README
-+++ b/README
-@@ -213,7 +213,7 @@
-     XYZ::Locale should handle looking up (and caching if appropriate) the
-     locale and loading the necessary locale module XYZ::Locale::fr
- 
--    The specific locale module holds the data and possibly logic neccesary
-+    The specific locale module holds the data and possibly logic necessary
-     to do what XYZ does in the vernacular of the given locale.
- 
-   TODO
---- a/lib/DateTime/Format/Human/Duration.pm
-+++ b/lib/DateTime/Format/Human/Duration.pm
-@@ -370,7 +370,7 @@
- 
- XYZ::Locale should handle looking up (and caching if appropriate) the locale and loading the necessary locale module XYZ::Locale::fr
- 
--The specific locale module holds the data and possibly logic neccesary to do what XYZ does in the vernacular of the given locale.
-+The specific locale module holds the data and possibly logic necessary to do what XYZ does in the vernacular of the given locale.
- 
- =head2 TODO 
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdatetime-format-human-duration-perl.git