[libmojomojo-perl] 03/05: Drop patches. All merged or obsolete.

gregor herrmann gregoa at debian.org
Sun Jul 5 18:28:36 UTC 2015


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

gregoa pushed a commit to branch master
in repository libmojomojo-perl.

commit fcc805330ad6ac7710b3c2cd017fbbe8e9ed6b2c
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Jul 5 20:22:55 2015 +0200

    Drop patches. All merged or obsolete.
---
 debian/patches/encode.patch                 | 37 --------------------
 debian/patches/no-initial-qmark-split.patch | 17 ---------
 debian/patches/plack-engine.patch           | 53 -----------------------------
 debian/patches/series                       |  3 --
 4 files changed, 110 deletions(-)

diff --git a/debian/patches/encode.patch b/debian/patches/encode.patch
deleted file mode 100644
index 400969a..0000000
--- a/debian/patches/encode.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f3fb6a261e047ca7068b08c0c292ae22d9007656 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Tue, 29 Apr 2014 12:37:39 +0200
-Subject: [PATCH] normalize name as a byte string
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since Encode-2.53, Encode::decode_utf8() requires argument to be
-a byte string. Because URI::Escape::uri_unescape() returns unicode
-string on unicode string input, one need to convert it to a byte
-string before.
-
-<https://github.com/mojomojo/mojomojo/issues/121#issuecomment-41651507>
-
-Signed-off-by: Petr Písař <ppisar at redhat.com>
----
- lib/MojoMojo/Schema/ResultSet/Page.pm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/MojoMojo/Schema/ResultSet/Page.pm b/lib/MojoMojo/Schema/ResultSet/Page.pm
-index 306aa6a..3f1a7e2 100644
---- a/lib/MojoMojo/Schema/ResultSet/Page.pm
-+++ b/lib/MojoMojo/Schema/ResultSet/Page.pm
-@@ -177,8 +177,8 @@ sub normalize_name {
-     $name =~ s/\s+/_/g;
-     $name = lc($name);
-     return (
--        Encode::decode_utf8(URI::Escape::uri_unescape($name_orig)),
--        Encode::decode_utf8(URI::Escape::uri_unescape($name)),
-+        Encode::decode_utf8(URI::Escape::uri_unescape(Encode::encode_utf8($name_orig))),
-+        Encode::decode_utf8(URI::Escape::uri_unescape(Encode::encode_utf8($name))),
-     );
- }
-
--- 
-1.9.0
diff --git a/debian/patches/no-initial-qmark-split.patch b/debian/patches/no-initial-qmark-split.patch
deleted file mode 100644
index 7798fd9..0000000
--- a/debian/patches/no-initial-qmark-split.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Splitting the initial '(?' is deprecated in regex
- Without this there is a warning on every request and all over the testsuite
-Author: Soren Dossing <https://github.com/sauber>
-Bug: https://github.com/mojomojo/mojomojo/pull/120
-Reviewed-By: Damyan Ivanov <dmn at debian.org>
-
---- a/lib/MojoMojo/Formatter/Wiki.pm
-+++ b/lib/MojoMojo/Formatter/Wiki.pm
-@@ -83,7 +83,7 @@ sub _generate_non_wikiword_check {
-     # but why the question mark ('\?') at the end?
-     my $non_wikiword_chars =
-         ( join '', _explicit_start_delims() ) . $wikiword_escape . '\/' . '\?';
--    return qr{( ?<! [$non_wikiword_chars] )}x;
-+    return qr{(?<! [$non_wikiword_chars] )}x;
- }
- 
- my $non_wikiword_check = _generate_non_wikiword_check();
diff --git a/debian/patches/plack-engine.patch b/debian/patches/plack-engine.patch
deleted file mode 100644
index d929abf..0000000
--- a/debian/patches/plack-engine.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: port from Catalyst::Engine::PSGI to Plack
- Catalyst::Engine::PSGI is deprecated and failing its test in Debian.
- Cf. #759960
- .
- The changes follow the "Upgrading the PSGI Engine" section in
- Catalyst::Upgrading.
-Origin: vendor
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-10-24
-Forwarded: https://github.com/mojomojo/mojomojo/issues/123
-Bug: https://github.com/mojomojo/mojomojo/issues/123
-Applied-Upstream: https://github.com/mojomojo/mojomojo/commit/6c0bed02dd1807ce831651ce57425441b6647614
-
---- a/app.psgi
-+++ b/app.psgi
-@@ -4,6 +4,5 @@
- use lib 'lib';
- use MojoMojo;
- 
--MojoMojo->setup_engine('PSGI');
--my $app = sub { MojoMojo->run(@_) };
-+my $app = MojoMojo->psgi_app(@_);
- 
---- a/script/mojomojo.psgi
-+++ b/script/mojomojo.psgi
-@@ -3,6 +3,5 @@
- use warnings;
- use MojoMojo;
- 
--MojoMojo->setup_engine('PSGI');
--my $app = sub { MojoMojo->run(@_) };
-+my $app = MojoMojo->psgi_app(@_);
- 
---- a/META.yml
-+++ b/META.yml
-@@ -35,7 +35,6 @@
-   Catalyst::Action::RenderView: 0.07
-   Catalyst::Authentication::Store::DBIx::Class: 0.101
-   Catalyst::Controller::HTML::FormFu: 0.03007
--  Catalyst::Engine::PSGI: 0
-   Catalyst::Model::DBIC::Schema: 0.01
-   Catalyst::Plugin::Authentication: 0.10005
-   Catalyst::Plugin::Cache: 0.08
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -18,7 +18,6 @@
-     'Catalyst::Action::RenderView' => '0.07',
-     'Catalyst::Authentication::Store::DBIx::Class' => '0.101',
-     'Catalyst::Controller::HTML::FormFu'           => '0.03007',
--    'Catalyst::Engine::PSGI'                       => '0',
-     'Catalyst::Model::DBIC::Schema'                => '0.01',
-     'Catalyst::Plugin::Authentication'             => '0.10005',
-     'Catalyst::Plugin::Cache'                      => 0.08,
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b322972..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-no-initial-qmark-split.patch
-encode.patch
-plack-engine.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmojomojo-perl.git



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