Fix some differences with Debian official

debian/NEWS

@@ -5,7 +5,7 @@ lemonldap-ng (2.0.0-1) unstable; urgency=medium
 
  -- Xavier Guimard <x.guimard@free.fr>  Mon, 11 Dec 2017 22:48:25 +0100
 
-lemonldap-ng (1.9.3-1) unstable; urgency=medium
+lemonldap-ng (1.9.2-1) unstable; urgency=medium
 
   liblemonldap-ng-handler-perl package has been split into:
   - lemonldap-ng-handler that provides web server configuration

debian/control

 Source: lemonldap-ng
 Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
-Uploaders: Xavier Guimard <x.guimard@free.fr>
+Uploaders: Xavier Guimard <yadd@debian.org>
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 10),
@@ -88,107 +88,12 @@ Description: Lemonldap::NG Web-SSO system documentation
  also be used as proxy between those federation systems.
  .
  It manages both authentication and authorization and provides headers for
- accounting. So you can have a full AAA protection. Authorization are built by
+ accounting. So you can have a full AAA protection. Authorizations are built by
  associating a regular expression and a rule. Regular expression is applied on
  the requested URL and the rule calculates if the user is authorized.
  .
  This package contains html documentation.
 
-Package: lemonldap-ng-handler
-Architecture: all
-Depends: ${misc:Depends},
-         liblemonldap-ng-handler-perl (= ${binary:Version})
-Recommends: lemonldap-ng-fastcgi-server (= ${binary:Version}) | lemonldap-ng-uwsgi-app (= ${binary:Version}) | libapache2-mod-perl2
-Suggests: libcache-memcached-perl,
-          libdigest-hmac-perl,
-          libsoap-lite-perl
-Breaks: liblemonldap-ng-handler-perl (<< 1.9.1-2~)
-Replaces: liblemonldap-ng-handler-perl (<< 1.9.1-2~)
-Description: Lemonldap::NG handler part
- Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
- or directly on application webservers. It can be used in conjunction with
- OpenID-Connect, CAS and SAML systems as identity or service provider. It can
- also be used as proxy between those federation systems.
- .
- It manages both authentication and authorization and provides headers for
- accounting. So you can have a full AAA protection. Authorization are built by
- associating a regular expression and a rule. Regular expression is applied on
- the requested URL and the rule calculates if the user is authorized.
- .
- This package provides configuration files for Apache and Nginx used to protect
- web areas.
-
-Package: liblemonldap-ng-manager-perl
-Architecture: all
-Depends: ${misc:Depends},
-         ${perl:Depends},
-         libconvert-pem-perl,
-         libcrypt-openssl-rsa-perl,
-         liblemonldap-ng-handler-perl (= ${binary:Version}),
-         lemonldap-ng-fastcgi-server (= ${binary:Version}) | lemonldap-ng-uwsgi-app (= ${binary:Version}) | apache2 | httpd-cgi
-Recommends: lemonldap-ng-doc (= ${binary:Version}),
-            libxml-libxml-perl,
-            libxml-libxslt-perl,
-            libxml-simple-perl
-Suggests: libclone-perl,
-          libregexp-assemble-perl
-Pre-Depends: debconf
-Description: Lemonldap::NG manager part
- Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
- or directly on application webservers. It can be used in conjunction with
- OpenID-Connect, CAS and SAML systems as identity or service provider. It can
- also be used as proxy between those federation systems.
- .
- It manages both authentication and authorization and provides headers for
- accounting. So you can have a full AAA protection. Authorization are built by
- associating a regular expression and a rule. Regular expression is applied on
- the requested URL and the rule calculates if the user is authorized.
- .
- Lemonldap::NG::Manager provides the administration interface.
-
-Package: liblemonldap-ng-portal-perl
-Architecture: all
-Depends: ${misc:Depends},
-         ${perl:Depends},
-         lemonldap-ng-fastcgi-server (= ${binary:Version}) | lemonldap-ng-uwsgi-app (= ${binary:Version}) | apache2 | httpd-cgi,
-         libclone-perl,
-         liblemonldap-ng-handler-perl (= ${binary:Version}),
-         libregexp-assemble-perl
-Recommends: libcrypt-openssl-bignum-perl,
-            libconvert-base32-perl,
-            libemail-sender-perl (>=1.300027) | libemail-sender-transport-smtps-perl,
-            libgd-securityimage-perl,
-            libmime-tools-perl,
-            libnet-ldap-perl,
-            libstring-random-perl,
-            libunicode-string-perl
-Suggests: libauthcas-perl,
-          libcrypt-u2f-server-perl,
-          libdbi-perl,
-          libglib-perl,
-          libimage-magick-perl,
-          liblasso-perl,
-          libnet-facebook-oauth2-perl (>= 0.10-1),
-          libnet-openid-consumer-perl,
-          libnet-openid-server-perl,
-          libnet-oauth-perl,
-          libsoap-lite-perl,
-          libweb-id-perl,
-          slapd
-Pre-Depends: debconf
-Description: Lemonldap::NG authentication portal part
- Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
- or directly on application webservers. It can be used in conjunction with
- OpenID-Connect, CAS and SAML systems as identity or service provider. It can
- also be used as proxy between those federation systems.
- .
- It manages both authentication and authorization and provides headers for
- accounting. So you can have a full AAA protection. Authorization are built by
- associating a regular expression and a rule. Regular expression is applied on
- the requested URL and the rule calculates if the user is authorized.
- .
- Lemonldap::NG::Portal provides the authentication portal.
-
 Package: lemonldap-ng-fastcgi-server
 Architecture: all
 Section: web
@@ -207,7 +112,7 @@ Description: Lemonldap::NG FastCGI server
  also be used as proxy between those federation systems.
  .
  It manages both authentication and authorization and provides headers for
- accounting. So you can have a full AAA protection. Authorization are built by
+ accounting. So you can have a full AAA protection. Authorizations are built by
  associating a regular expression and a rule. Regular expression is applied on
  the requested URL and the rule calculates if the user is authorized.
  .
@@ -237,6 +142,30 @@ Description: Lemonldap::NG uWSGI server
  Lemonldap::NG uWSGI server provides a replacement to Lemonldap::NG FastCGI
  server, using uWSGI instead of Plack FCGI.
 
+Package: lemonldap-ng-handler
+Architecture: all
+Depends: ${misc:Depends},
+         liblemonldap-ng-handler-perl (= ${binary:Version})
+Recommends: lemonldap-ng-fastcgi-server (= ${binary:Version}) | lemonldap-ng-uwsgi-app (= ${binary:Version}) | libapache2-mod-perl2
+Suggests: libcache-memcached-perl,
+          libdigest-hmac-perl,
+          libsoap-lite-perl
+Breaks: liblemonldap-ng-handler-perl (<< 1.9.1-2~)
+Replaces: liblemonldap-ng-handler-perl (<< 1.9.1-2~)
+Description: Lemonldap::NG handler part
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application webservers. It can be used in conjunction with
+ OpenID-Connect, CAS and SAML systems as identity or service provider. It can
+ also be used as proxy between those federation systems.
+ .
+ It manages both authentication and authorization and provides headers for
+ accounting. So you can have a full AAA protection. Authorizations are built by
+ associating a regular expression and a rule. Regular expression is applied on
+ the requested URL and the rule calculates if the user is authorized.
+ .
+ This package provides configuration files for Apache and Nginx used to protect
+ web areas.
+
 Package: liblemonldap-ng-handler-perl
 Architecture: all
 Depends: ${misc:Depends},
@@ -249,7 +178,7 @@ Description: Lemonldap::NG handler common libraries
  also be used as proxy between those federation systems.
  .
  It manages both authentication and authorization and provides headers for
- accounting. So you can have a full AAA protection. Authorization are built by
+ accounting. So you can have a full AAA protection. Authorizations are built by
  associating a regular expression and a rule. Regular expression is applied on
  the requested URL and the rule calculates if the user is authorized.
  .
@@ -291,9 +220,80 @@ Description: Lemonldap::NG common files
  also be used as proxy between those federation systems.
  .
  It manages both authentication and authorization and provides headers for
- accounting. So you can have a full AAA protection. Authorization are built by
+ accounting. So you can have a full AAA protection. Authorizations are built by
  associating a regular expression and a rule. Regular expression is applied on
  the requested URL and the rule calculates if the user is authorized.
  .
  Lemonldap::NG::Common contains common files used by other Lemonldap::NG
  modules.
+
+Package: liblemonldap-ng-manager-perl
+Architecture: all
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         libconvert-pem-perl,
+         libcrypt-openssl-rsa-perl,
+         liblemonldap-ng-handler-perl (= ${binary:Version}),
+         lemonldap-ng-fastcgi-server (= ${binary:Version}) | lemonldap-ng-uwsgi-app (= ${binary:Version}) | apache2 | httpd-cgi
+Recommends: lemonldap-ng-doc (= ${binary:Version}),
+            libxml-libxml-perl,
+            libxml-libxslt-perl,
+            libxml-simple-perl
+Suggests: libclone-perl,
+          libregexp-assemble-perl
+Pre-Depends: debconf
+Description: Lemonldap::NG manager part
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application webservers. It can be used in conjunction with
+ OpenID-Connect, CAS and SAML systems as identity or service provider. It can
+ also be used as proxy between those federation systems.
+ .
+ It manages both authentication and authorization and provides headers for
+ accounting. So you can have a full AAA protection. Authorizations are built by
+ associating a regular expression and a rule. Regular expression is applied on
+ the requested URL and the rule calculates if the user is authorized.
+ .
+ Lemonldap::NG::Manager provides the administration interface.
+
+Package: liblemonldap-ng-portal-perl
+Architecture: all
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         lemonldap-ng-fastcgi-server (= ${binary:Version}) | lemonldap-ng-uwsgi-app (= ${binary:Version}) | apache2 | httpd-cgi,
+         libclone-perl,
+         liblemonldap-ng-handler-perl (= ${binary:Version}),
+         libregexp-assemble-perl
+Recommends: libcrypt-openssl-bignum-perl,
+            libconvert-base32-perl,
+            libemail-sender-perl (>=1.300027) | libemail-sender-transport-smtps-perl,
+            libgd-securityimage-perl,
+            libmime-tools-perl,
+            libnet-ldap-perl,
+            libstring-random-perl,
+            libunicode-string-perl
+Suggests: libauthcas-perl,
+          libcrypt-u2f-server-perl,
+          libdbi-perl,
+          libglib-perl,
+          libimage-magick-perl,
+          liblasso-perl,
+          libnet-facebook-oauth2-perl (>= 0.10-1),
+          libnet-openid-consumer-perl,
+          libnet-openid-server-perl,
+          libnet-oauth-perl,
+          libsoap-lite-perl,
+          libweb-id-perl,
+          slapd
+Pre-Depends: debconf
+Description: Lemonldap::NG authentication portal part
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application webservers. It can be used in conjunction with
+ OpenID-Connect, CAS and SAML systems as identity or service provider. It can
+ also be used as proxy between those federation systems.
+ .
+ It manages both authentication and authorization and provides headers for
+ accounting. So you can have a full AAA protection. Authorizations are built by
+ associating a regular expression and a rule. Regular expression is applied on
+ the requested URL and the rule calculates if the user is authorized.
+ .
+ Lemonldap::NG::Portal provides the authentication portal.

debian/lemonldap-ng-doc.maintscript

-symlink_to_dir /usr/share/doc/lemonldap-ng-doc/pages/documentation/current 1.3 1.9.8-1~
+symlink_to_dir /usr/share/doc/lemonldap-ng-doc/pages/documentation/current 1.3 1.9.7-3~

debian/lemonldap-ng.links

-/usr/share/doc/liblemonldap-ng-handler-perl/examples /usr/share/doc/lemonldap-ng/examples/handler
+/usr/share/doc/lemonldap-ng-handler/examples /usr/share/doc/lemonldap-ng/examples/handler
 /usr/share/doc/liblemonldap-ng-portal-perl/examples /usr/share/doc/lemonldap-ng/examples/portal
 /usr/share/doc/liblemonldap-ng-manager-perl/examples /usr/share/doc/lemonldap-ng/examples/manager

debian/tests/README.md

+# lemonldap-ng autopkgtest
+
+This autopkgtest configuration overrides pkg-perl-autopkgtest/runner to launch
+`smoke` and `use.t` for each lemonldap-ng component. `syntax.t` is launched as
+usual.
+
+This `runner` uses `debian/tests/pkg-perl/lemonldap-ng-_<component>.<filename>`
+instead of classic `smoke.files`,… So it is possible to define `smoke.*` or
+`SKIP` files separately for each component _(but of course not syntax.skip)_.

debian/tests/pkg-perl/lemonldap-ng-manager.smoke-skip

 t/03-HTML-forms.t
+t/20-test-coverage.t
 t/80-attributes.t
 t/90-translations.t
 t/99-pod.t

debian/watch

-version=3
-opts=filenamemangle=s/.*\/v(\d\S+)\/archive\.tar\.gz/lemonldap-ng-$1\.tar\.gz/g \
-  https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng/tags?sort=updated_desc .*v(\d\S+)/archive\.tar\.gz
+version=4
+opts="dversionmangle=s/[\+~](debian|dfsg|ds|deb)(\.)?(\d+)?$//,repacksuffix=+ds,repack" \
+ https://releases.ow2.org/lemonldap/ lemonldap-ng-(\d[\d\.]+(?:~beta\d*)?)\.tar\.gz