[SCM] Debian packaging of Dist-Zilla-LocaleTextDomain CPAN distribution branch, master, updated. debian/0.81-1-6-g58c805b

gregor herrmann gregoa at debian.org
Sun Dec 9 15:28:41 UTC 2012


The following commit has been merged in the master branch:
commit 050bfbb56e1eba52ce785757fc4b05c33a77ee61
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Dec 9 16:24:22 2012 +0100

    Drop patches, both applied upstream.

diff --git a/debian/patches/0001-log_fatal-lives-in-Dist-Zilla.patch b/debian/patches/0001-log_fatal-lives-in-Dist-Zilla.patch
deleted file mode 100644
index 38c3278..0000000
--- a/debian/patches/0001-log_fatal-lives-in-Dist-Zilla.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: log_fatal lives in Dist::Zilla not in
- Dist::Zilla::App::Command::msg_init'
-Origin: vendor
-Bug: http://github.com/theory/dist-zilla-localetextdomain/issues/4
-Forwarded: http://github.com/theory/dist-zilla-localetextdomain/pull/5
-Author: Joenio Costa <joenio at colivre.coop.br>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2012-10-18
-
---- a/lib/Dist/Zilla/App/Command/msg_init.pm
-+++ b/lib/Dist/Zilla/App/Command/msg_init.pm
-@@ -105,7 +105,7 @@
-             [@cmd,  "--locale=$lang", '--output-file=' . $dest],
-             undef, $log, $log
-         );
--        $self->log_fatal("Cannot generate $dest") if $?;
-+        $dzil->log_fatal("Cannot generate $dest") if $?;
-     }
- }
- 
diff --git a/debian/patches/0002-Making-msg-init-correctly-handle-with-Locale-Codes.patch b/debian/patches/0002-Making-msg-init-correctly-handle-with-Locale-Codes.patch
deleted file mode 100644
index dd78fab..0000000
--- a/debian/patches/0002-Making-msg-init-correctly-handle-with-Locale-Codes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Making 'msg-init' correctly handle with Locale::Codes before 3.17
-Origin: vendor
-Bug: http://github.com/theory/dist-zilla-localetextdomain/pull/9
-Forwarded: http://github.com/theory/dist-zilla-localetextdomain/pull/9
-Author: Joenio Costa <joenio at colivre.coop.br>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2012-10-18
-
---- a/lib/Dist/Zilla/App/Command/msg_init.pm
-+++ b/lib/Dist/Zilla/App/Command/msg_init.pm
-@@ -58,8 +58,8 @@
-     $self->usage_error('dzil msg-init takes one or more arguments')
-         if @{ $args } < 1;
- 
--    require Locale::Codes::Language;
--    require Locale::Codes::Country;
-+    require Locale::Language;
-+    require Locale::Country;
- 
-     for my $lang ( @{ $args } ) {
-         my ($name, $enc) = split /[.]/, $lang, 2;
-@@ -71,10 +71,10 @@
- 
-         my ($lang, $country) = split /[-_]/, $name;
-         $self->zilla->log_fatal(qq{"$lang" is not a valid language code})
--            unless Locale::Codes::Language::code2language($lang);
-+            unless Locale::Language::code2language($lang);
-         if ($country) {
-             $self->zilla->log_fatal(qq{"$country" is not a valid country code})
--                unless Locale::Codes::Country::code2country($country);
-+                unless Locale::Country::code2country($country);
-         }
-     }
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6686d9c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-log_fatal-lives-in-Dist-Zilla.patch
-0002-Making-msg-init-correctly-handle-with-Locale-Codes.patch

-- 
Debian packaging of Dist-Zilla-LocaleTextDomain CPAN distribution



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