Attachment 9210 Details for Bug 20687 – proposed fix

[patch] proposed fix

identity_fix_encoding.diff (text/plain), 3.06 KB, created by Frédéric "LpSolit" Buclin on 2017-04-17 14:13:33 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric "LpSolit" Buclin

Created: 2017-04-17 14:13:33 CEST

Size: 3.06 KB

patch

obsolete

>diff --git a/CatDap.spec b/CatDap.spec
>index 3fa1b51..06964af 100644
>--- a/CatDap.spec
>+++ b/CatDap.spec
>@@ -14,7 +14,6 @@ BuildRequires: perl(Module::Install::Catalyst)
> BuildRequires: perl(Catalyst::Plugin::ConfigLoader)
> BuildRequires: perl(Catalyst::Plugin::Static::Simple)
> BuildRequires: perl(Catalyst::Plugin::I18N)
>-BuildRequires: perl(Catalyst::Plugin::Unicode::Encoding)
> BuildRequires: perl(Catalyst::Plugin::Authentication)
> BuildRequires: perl(Catalyst::Plugin::Authentication::Store::LDAP)
> BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)
>diff --git a/Changes b/Changes
>index c7443e8..b6df34b 100644
>--- a/Changes
>+++ b/Changes
>@@ -1,4 +1,8 @@
> This file documents the revision history for Perl extension CatDap.
> 
>+0.10  2017-04-17
>+        - bump the min version of Catalyst::Runtime to 5.90042
>+          which has the Unicode::Encoding plugin in core.
>+
> 0.01  2010-10-11 09:11:10
>         - initial revision, generated by Catalyst
>diff --git a/Makefile.PL b/Makefile.PL
>index c93307b..f387a8f 100644
>--- a/Makefile.PL
>+++ b/Makefile.PL
>@@ -9,11 +9,10 @@ use Module::Install::Catalyst; # Complain loudly if you don't have
> name 'CatDap';
> all_from 'lib/CatDap.pm';
> 
>-requires 'Catalyst::Runtime' => '5.80022';
>+requires 'Catalyst::Runtime' => '5.90042';
> requires 'Catalyst::Plugin::ConfigLoader';
> requires 'Catalyst::Plugin::Static::Simple';
> requires 'Catalyst::Plugin::I18N';
>-requires 'Catalyst::Plugin::Unicode::Encoding';
> requires 'Catalyst::Plugin::Authentication';
> requires 'Catalyst::Plugin::Authentication::Store::LDAP';
> requires 'Catalyst::Plugin::Authorization::Roles';
>diff --git a/catdap.yml b/catdap.yml
>index 0fb6166..052f5b7 100644
>--- a/catdap.yml
>+++ b/catdap.yml
>@@ -9,6 +9,7 @@
> 
> name: CatDap
> default_view: Web
>+encoding: UTF-8
> 
> organisation: Mageia
> project_url: http://www.mageia.org/
>diff --git a/lib/CatDap.pm b/lib/CatDap.pm
>index d53ca8f..0faed59 100644
>--- a/lib/CatDap.pm
>+++ b/lib/CatDap.pm
>@@ -2,7 +2,7 @@ package CatDap;
> use Moose;
> use namespace::autoclean;
> 
>-use Catalyst::Runtime 5.80;
>+use Catalyst::Runtime 5.90042;
> 
> # Set flags and add plugins for the application
> #
>@@ -22,12 +22,11 @@ use Catalyst qw/
>     Authentication
>     Authorization::Roles
>     I18N
>-    Unicode::Encoding
> /;
> 
> extends 'Catalyst';
> 
>-our $VERSION = '0.01';
>+our $VERSION = '0.10';
> $VERSION = eval $VERSION;
> 
> # Configure the application.
>diff --git a/root/template/html b/root/template/html
>index a363870..fe90adb 100644
>--- a/root/template/html
>+++ b/root/template/html
>@@ -4,7 +4,6 @@
>     <meta charset="utf-8">
>     <title>[% template.title or site.title or c.config.apptitle %]</title>
>     <meta name="description" content="[% template.title or site.title or c.config.apptitle %]">
>-    <meta name="keywords" content="mageia, user, account, password, compte, accÃ¨s, identity, identitÃ©, utilisateur, participate, participez, contribute">
>     <meta name="robots" content="index,nofollow">
>     <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css">
>     <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css">

diff --git a/CatDap.spec b/CatDap.spec
index 3fa1b51..06964af 100644
--- a/CatDap.spec
+++ b/CatDap.spec
@@ -14,7 +14,6 @@ BuildRequires: perl(Module::Install::Catalyst)
 BuildRequires: perl(Catalyst::Plugin::ConfigLoader)
 BuildRequires: perl(Catalyst::Plugin::Static::Simple)
 BuildRequires: perl(Catalyst::Plugin::I18N)
-BuildRequires: perl(Catalyst::Plugin::Unicode::Encoding)
 BuildRequires: perl(Catalyst::Plugin::Authentication)
 BuildRequires: perl(Catalyst::Plugin::Authentication::Store::LDAP)
 BuildRequires: perl(Catalyst::Plugin::Authorization::Roles)
diff --git a/Changes b/Changes
index c7443e8..b6df34b 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,8 @@
 This file documents the revision history for Perl extension CatDap.
 
+0.10  2017-04-17
+        - bump the min version of Catalyst::Runtime to 5.90042
+          which has the Unicode::Encoding plugin in core.
+
 0.01  2010-10-11 09:11:10
         - initial revision, generated by Catalyst
diff --git a/Makefile.PL b/Makefile.PL
index c93307b..f387a8f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,11 +9,10 @@ use Module::Install::Catalyst; # Complain loudly if you don't have
 name 'CatDap';
 all_from 'lib/CatDap.pm';
 
-requires 'Catalyst::Runtime' => '5.80022';
+requires 'Catalyst::Runtime' => '5.90042';
 requires 'Catalyst::Plugin::ConfigLoader';
 requires 'Catalyst::Plugin::Static::Simple';
 requires 'Catalyst::Plugin::I18N';
-requires 'Catalyst::Plugin::Unicode::Encoding';
 requires 'Catalyst::Plugin::Authentication';
 requires 'Catalyst::Plugin::Authentication::Store::LDAP';
 requires 'Catalyst::Plugin::Authorization::Roles';
diff --git a/catdap.yml b/catdap.yml
index 0fb6166..052f5b7 100644
--- a/catdap.yml
+++ b/catdap.yml
@@ -9,6 +9,7 @@
 
 name: CatDap
 default_view: Web
+encoding: UTF-8
 
 organisation: Mageia
 project_url: http://www.mageia.org/
diff --git a/lib/CatDap.pm b/lib/CatDap.pm
index d53ca8f..0faed59 100644
--- a/lib/CatDap.pm
+++ b/lib/CatDap.pm
@@ -2,7 +2,7 @@ package CatDap;
 use Moose;
 use namespace::autoclean;
 
-use Catalyst::Runtime 5.80;
+use Catalyst::Runtime 5.90042;
 
 # Set flags and add plugins for the application
 #
@@ -22,12 +22,11 @@ use Catalyst qw/
     Authentication
     Authorization::Roles
     I18N
-    Unicode::Encoding
 /;
 
 extends 'Catalyst';
 
-our $VERSION = '0.01';
+our $VERSION = '0.10';
 $VERSION = eval $VERSION;
 
 # Configure the application.
diff --git a/root/template/html b/root/template/html
index a363870..fe90adb 100644
--- a/root/template/html
+++ b/root/template/html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <title>[% template.title or site.title or c.config.apptitle %]</title>
     <meta name="description" content="[% template.title or site.title or c.config.apptitle %]">
-    <meta name="keywords" content="mageia, user, account, password, compte, accÃ¨s, identity, identitÃ©, utilisateur, participate, participez, contribute">
     <meta name="robots" content="index,nofollow">
     <link rel="stylesheet" type="text/css" href="/static/style/yui/reset-fonts-grids.css">
     <link rel="stylesheet" type="text/css" href="/static/style/yui/base-min.css">

Actions: View | Diff

Attachments on bug 20687: 9210 | 9211 | 9212