From 1274d75a6acabc098759d82e4036060c86dbf62e Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Sun, 11 Dec 2016 10:45:59 +0000
Subject: [PATCH] Import 1.9 changes

---
 Makefile                                                 | 9 ++++-----
 debian/lemonldap-ng-doc.docs                             | 2 +-
 debian/lemonldap-ng-fr-doc.docs                          | 2 +-
 debian/rules                                             | 7 +++++--
 lemonldap-ng-common/scripts/lemonldap-ng-cli             | 2 +-
 lemonldap-ng-manager/site/static/languages/en.json       | 2 +-
 lemonldap-ng-portal/example/oauth2.pl                    | 4 ++--
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm           | 2 +-
 .../lib/Lemonldap/NG/Portal/_OpenIDConnect.pm            | 4 ++--
 9 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 6be984bb3..37e42cdef 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,9 @@ PORTALLIBSTOREMOVEFORDEBIAN=$(RPORTALSKINSDIR)/bootstrap/fonts \
 			$(RPORTALSKINSDIR)/bootstrap/js/bootstrap* \
 			$(RPORTALSKINSDIR)/common/js/jquery-* \
 			$(RPORTALSKINSDIR)/common/js/jquery.cookie*
-DOCLIBSTOREMOVEFORDEBIAN=pages/documentation/current/lib/tpl/bootstrap3 pages/documentation/current/lib/scripts/jquery-ui*.js
+DOCLIBSTOREMOVEFORDEBIAN=pages/documentation/current/lib/tpl/bootstrap3 \
+			pages/documentation/current/lib/scripts/jquery-ui*.js \
+			pages/documentation/current/bootswatch/3.3.4/flatly/bootstrap.min.css
 DOCEXTERNALLIBS=$(DOCLIBSTOREMOVEFORDEBIAN)
 MANAGEREXTERNALLIBS=$(RMANAGERSTATICDIR)/bwr/
 PORTALEXTERNALLIBS=$(PORTALLIBSTOREMOVEFORDEBIAN) $(RPORTALSKINSDIR)/common/js/jquery*
@@ -943,10 +945,7 @@ debian-packages: debian-dist
 	rm -rf lemonldap-ng-$$version && \
 	$(UNCOMPRESS) lemonldap-ng_$$version.orig.$(COMPRESSSUFFIX) && \
 	cd lemonldap-ng-$$version && \
-	debuild -us -uc -b --lintian-opts -i \
-		--lintian-opts -v --lintian-opts -I --lintian-opts -E \
-		--lintian-opts --color --lintian-opts auto --lintian-opts -L \
-		--lintian-opts +=pedantic
+	dpkg-buildpackage -us -uc
 
 # Developper corner
 # -----------------
diff --git a/debian/lemonldap-ng-doc.docs b/debian/lemonldap-ng-doc.docs
index 30d29dea9..ca23b2f09 100644
--- a/debian/lemonldap-ng-doc.docs
+++ b/debian/lemonldap-ng-doc.docs
@@ -1 +1 @@
-doc/*
+debian/tmp/usr/share/doc/lemonldap-ng-doc/*
diff --git a/debian/lemonldap-ng-fr-doc.docs b/debian/lemonldap-ng-fr-doc.docs
index 074b6ff53..5cd20686a 100644
--- a/debian/lemonldap-ng-fr-doc.docs
+++ b/debian/lemonldap-ng-fr-doc.docs
@@ -1 +1 @@
-po-doc/fr/*
+debian/tmp/usr/share/doc/lemonldap-ng-fr-doc/fr-doc/*
diff --git a/debian/rules b/debian/rules
index 72006dacd..18865a002 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_auto_build:
 	$(MAKE) all
 
 override_dh_auto_install:
-	$(MAKE) install install_fr_doc_site \
+	$(MAKE) install \
 			DESTDIR=$(CURDIR)/debian/tmp \
 			PREFIX=/usr \
 			LMPREFIX=/usr/share/lemonldap-ng/ \
@@ -49,7 +49,10 @@ override_dh_auto_install:
 			DEFDOCDIR=/usr/share/doc/lemonldap-ng-doc \
 			FRDOCDIR=/usr/share/doc/lemonldap-ng-fr-doc \
 			PROD=yes
-
+	$(MAKE) install_fr_doc_site \
+			DESTDIR=$(CURDIR)/debian/tmp \
+			DOCDIR=/usr/share/doc/lemonldap-ng-fr-doc \
+			USEDEBIANLIBS=yes
 	mkdir $(TMP)/$(LMSHAREDIR)/portal
 	mv $(TMP)/$(LMVARDIR)/portal/*.pl $(TMP)/$(LMSHAREDIR)/portal/
 	for i in handler portal manager test; do \
diff --git a/lemonldap-ng-common/scripts/lemonldap-ng-cli b/lemonldap-ng-common/scripts/lemonldap-ng-cli
index 139436871..559bbc3ca 100755
--- a/lemonldap-ng-common/scripts/lemonldap-ng-cli
+++ b/lemonldap-ng-common/scripts/lemonldap-ng-cli
@@ -79,7 +79,7 @@ lemonldap-ng-cli - Command-line manager for Lemonldap::NG web-SSO system.
 =head1 DESCRIPTION
 
 lemonldap-ng-cli is a command line client that can be used to do some actions
-on Lemonldap::NG configuration. Commands are detailled in
+on Lemonldap::NG configuration. Commands are detailed in
 L<Lemonldap::NG::Manager::Cli> and L<Lemonldap::NG::Common::CLi>
 
 =head1 SEE ALSO
diff --git a/lemonldap-ng-manager/site/static/languages/en.json b/lemonldap-ng-manager/site/static/languages/en.json
index 561ded5bf..d1a39d854 100644
--- a/lemonldap-ng-manager/site/static/languages/en.json
+++ b/lemonldap-ng-manager/site/static/languages/en.json
@@ -420,7 +420,7 @@
 "oidcRPName": "OpenID Connect RP Name",
 "oidcRPStateTimeout": "State session timeout",
 "oidcServiceMetaData": "OpenID Connect Service",
-"oidcServiceMetaDataAuthorizeURI": "Autorization",
+"oidcServiceMetaDataAuthorizeURI": "Authorization",
 "oidcServiceMetaDataEndPoints": "End points",
 "oidcServiceMetaDataJWKSURI": "JWKS",
 "oidcServiceMetaDataKeys": "Keys",
diff --git a/lemonldap-ng-portal/example/oauth2.pl b/lemonldap-ng-portal/example/oauth2.pl
index 0dc362c98..d187ddb55 100644
--- a/lemonldap-ng-portal/example/oauth2.pl
+++ b/lemonldap-ng-portal/example/oauth2.pl
@@ -703,9 +703,9 @@ else {
     print
 "<a href=\"$hybrid_redirect_url\" class=\"btn btn-info\" role=\"button\">Hybrid Flow</a>\n";
     print
-"<a href=\"$request_redirect_url\" class=\"btn btn-info\" role=\"button\">Autorization Code Flow with request</a>\n";
+"<a href=\"$request_redirect_url\" class=\"btn btn-info\" role=\"button\">Authorization Code Flow with request</a>\n";
     print
-"<a href=\"$request_uri_redirect_url\" class=\"btn btn-info\" role=\"button\">Autorization Code Flow with request_uri</a>\n";
+"<a href=\"$request_uri_redirect_url\" class=\"btn btn-info\" role=\"button\">Authorization Code Flow with request_uri</a>\n";
     print "</div>\n";
     print "<h2 class=\"text-center\">Configuration</h2>\n";
     print "<div class=\"text-center\">\n";
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm
index ad3a2f909..b8b6d743c 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm
@@ -110,7 +110,7 @@ described below.
 The portal part inherits from L<CGI> so yo can use it both with Apache 1 and 2
 and use all L<CGI> features.
 
-=head2 Authentication, Autorization, Accounting
+=head2 Authentication, Authorization, Accounting
 
 =head3 B<Authentication>
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_OpenIDConnect.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_OpenIDConnect.pm
index e3289a281..d9e908613 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_OpenIDConnect.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_OpenIDConnect.pm
@@ -389,7 +389,7 @@ sub buildHybridAuthnResponse {
 }
 
 ## @method String getAuthorizationCodeAccessToken(String op, String code, String auth_method)
-# Get Token response with autorization code
+# Get Token response with authorization code
 # @param op OpenIP Provider configuration key
 # @param code Code
 # @param auth_method Authentication Method
@@ -1591,7 +1591,7 @@ Build Authentication Response URI for Hybrid Flow
 
 =head2 getAuthorizationCodeAccessToken
 
-Get Token response with autorization code
+Get Token response with authorization code
 
 =head2 checkTokenResponseValidity