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

@@ -1,6 +1,6 @@
 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,12 +88,60 @@ 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-fastcgi-server
+Architecture: all
+Section: web
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         lsb-base,
+         libfcgi-procmanager-perl,
+         liblemonldap-ng-handler-perl (= ${binary:Version}),
+         libplack-perl
+Recommends: libhttp-parser-xs-perl,
+            nginx-extras | nginx
+Description: Lemonldap::NG FastCGI server
+ 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 FastCGI server provides a Nginx auth_request server that handles
+ also LLNG Portal and Manager.
+
+Package: lemonldap-ng-uwsgi-app
+Architecture: all
+Section: web
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         liblemonldap-ng-handler-perl (= ${binary:Version}),
+         uwsgi-plugin-psgi
+Recommends: libhttp-parser-xs-perl,
+            nginx-extras | nginx
+Description: Lemonldap::NG uWSGI server
+ 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 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},
@@ -111,13 +159,74 @@ Description: Lemonldap::NG handler part
  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 provides configuration files for Apache and Nginx used to protect
  web areas.
 
+Package: liblemonldap-ng-handler-perl
+Architecture: all
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         liblemonldap-ng-common-perl (= ${binary:Version})
+Description: Lemonldap::NG handler common libraries
+ 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::Handler provides Perl libraries used by web server handlers.
+
+Package: liblemonldap-ng-common-perl
+Architecture: all
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         debconf,
+         libapache-session-perl,
+         libcache-cache-perl,
+         libconfig-inifiles-perl,
+         libcrypt-openssl-rsa-perl,
+         libcrypt-openssl-x509-perl,
+         libcrypt-rijndael-perl,
+         libhtml-template-perl,
+         libjson-perl,
+         libmouse-perl,
+         libplack-perl,
+         liburi-perl,
+         libwww-perl
+Recommends: libapache-session-browseable-perl,
+            libcookie-baker-xs-perl,
+            libdbi-perl,
+            libhttp-parser-xs-perl,
+            libjson-xs-perl,
+            liblwp-protocol-https-perl
+Suggests: libconvert-base32-perl,
+          libnet-ldap-perl,
+          libsoap-lite-perl,
+          libxml-libxml-perl,
+          libxml-simple-perl
+Conflicts: liblemonldap-ng-cli-perl
+Description: Lemonldap::NG common files
+ 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::Common contains common files used by other Lemonldap::NG
+ modules.
+
 Package: liblemonldap-ng-manager-perl
 Architecture: all
 Depends: ${misc:Depends},
@@ -140,7 +249,7 @@ Description: Lemonldap::NG manager part
  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.
  .
@@ -183,117 +292,8 @@ Description: Lemonldap::NG authentication portal part
  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::Portal provides the authentication portal.
-
-Package: lemonldap-ng-fastcgi-server
-Architecture: all
-Section: web
-Depends: ${misc:Depends},
-         ${perl:Depends},
-         lsb-base,
-         libfcgi-procmanager-perl,
-         liblemonldap-ng-handler-perl (= ${binary:Version}),
-         libplack-perl
-Recommends: libhttp-parser-xs-perl,
-            nginx-extras | nginx
-Description: Lemonldap::NG FastCGI server
- 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 FastCGI server provides a Nginx auth_request server that handles
- also LLNG Portal and Manager.
-
-Package: lemonldap-ng-uwsgi-app
-Architecture: all
-Section: web
-Depends: ${misc:Depends},
-         ${perl:Depends},
-         liblemonldap-ng-handler-perl (= ${binary:Version}),
-         uwsgi-plugin-psgi
-Recommends: libhttp-parser-xs-perl,
-            nginx-extras | nginx
-Description: Lemonldap::NG uWSGI server
- 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 uWSGI server provides a replacement to Lemonldap::NG FastCGI
- server, using uWSGI instead of Plack FCGI.
-
-Package: liblemonldap-ng-handler-perl
-Architecture: all
-Depends: ${misc:Depends},
-         ${perl:Depends},
-         liblemonldap-ng-common-perl (= ${binary:Version})
-Description: Lemonldap::NG handler common libraries
- 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::Handler provides Perl libraries used by web server handlers.
-
-Package: liblemonldap-ng-common-perl
-Architecture: all
-Depends: ${misc:Depends},
-         ${perl:Depends},
-         debconf,
-         libapache-session-perl,
-         libcache-cache-perl,
-         libconfig-inifiles-perl,
-         libcrypt-openssl-rsa-perl,
-         libcrypt-openssl-x509-perl,
-         libcrypt-rijndael-perl,
-         libhtml-template-perl,
-         libjson-perl,
-         libmouse-perl,
-         libplack-perl,
-         liburi-perl,
-         libwww-perl
-Recommends: libapache-session-browseable-perl,
-            libcookie-baker-xs-perl,
-            libdbi-perl,
-            libhttp-parser-xs-perl,
-            libjson-xs-perl,
-            liblwp-protocol-https-perl
-Suggests: libconvert-base32-perl,
-          libnet-ldap-perl,
-          libsoap-lite-perl,
-          libxml-libxml-perl,
-          libxml-simple-perl
-Conflicts: liblemonldap-ng-cli-perl
-Description: Lemonldap::NG common files
- 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::Common contains common files used by other Lemonldap::NG
- modules.

debian/lemonldap-ng-doc.maintscript

@@ -1 +1 @@
-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

@@ -1,3 +1,3 @@
-/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

@@ -0,0 +1,9 @@
+# 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

@@ -1,4 +1,5 @@
 t/03-HTML-forms.t
+t/20-test-coverage.t
 t/80-attributes.t
 t/90-translations.t
 t/99-pod.t

debian/watch

@@ -1,3 +1,3 @@
-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