Import r5062 and r5063

COPYING

@@ -757,6 +757,15 @@ License: GPL-2+
  The complete text of version 2 of the GNU General
  Public License can be found in http://opensource.org/licenses/GPL-2.0
 
+License: GPL-3+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+ .
+ The complete text of version 3 of the GNU General
+ Public License can be found in http://opensource.org/licenses/GPL-2.0
+
 License: LGPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as

debian/NEWS

@@ -1,3 +1,11 @@
+lemonldap-ng (1.9.3-1) unstable; urgency=medium
+
+  liblemonldap-ng-handler-perl package has been split into:
+  - lemonldap-ng-handler that provides web server configuration
+  - liblemonldap-ng-handler-perl that provides Perl libraries only
+
+ -- Xavier Guimard <x.guimard@free.fr>  Sat, 17 May 2016 22:25:43 +0200
+
 lemonldap-ng (1.9.0-1) unstable; urgency=low
 
   1) Configuration and sessions storage

debian/control

@@ -45,7 +45,7 @@ Build-Depends-Indep: libapache-session-perl,
                      libxml-libxslt-perl,
                      libxml-simple-perl,
                      perl
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/lemonldap-ng.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/lemonldap-ng.git
 Homepage: http://lemonldap-ng.org/
@@ -53,7 +53,7 @@ Homepage: http://lemonldap-ng.org/
 Package: lemonldap-ng
 Architecture: all
 Depends: ${misc:Depends},
-         liblemonldap-ng-handler-perl (= ${binary:Version}),
+         lemonldap-ng-handler (= ${binary:Version}),
          liblemonldap-ng-manager-perl (= ${binary:Version}),
          liblemonldap-ng-portal-perl (= ${binary:Version})
 Provides: openid-connect-provider,
@@ -112,9 +112,9 @@ Package: lemonldap-ng-fastcgi-server
 Architecture: all
 Depends: ${misc:Depends},
          ${perl:Depends},
-         nginx-extras | nginx,
          liblemonldap-ng-handler-perl,
-         libplack-perl
+         libplack-perl,
+         nginx-extras | nginx
 Recommends: libhttp-parser-xs-perl,
 Suggests: nginx-extras
 Section: web
@@ -131,11 +131,31 @@ Description: Lemonldap::NG FastCGI server
  .
  Lemonldap::NG FastCGI server provides a Nginx auth_request server.
 
+Package: lemonldap-ng-handler
+Architecture: all
+Depends: ${misc:Depends},
+         libapache2-mod-perl2 | lemonldap-ng-fastcgi-server (= ${binary:Version}),
+         liblemonldap-ng-handler-perl (= ${binary:Version})
+Breaks: liblemonldap-ng-handler-perl (<< 1.9.1-2~)
+Replaces: liblemonldap-ng-handler-perl (<< 1.9.1-2~)
+Description: Lemonldap::NG Apache handler part
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application Apache servers. 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-handler-perl
 Architecture: all
 Depends: ${misc:Depends},
          ${perl:Depends},
-         libapache2-mod-perl2 | lemonldap-ng-fastcgi-server,
          liblemonldap-ng-common-perl (= ${binary:Version}),
          libmouse-perl,
          liburi-perl,
@@ -157,8 +177,7 @@ Description: Lemonldap::NG Apache handler part
  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 is the Apache module part (handler) used to protect web
- areas.
+ Lemonldap::NG::Handler provides Perl libraries used by web server handlers.
 
 Package: liblemonldap-ng-conf-perl
 Depends: ${misc:Depends},

debian/copyright

@@ -757,6 +757,15 @@ License: GPL-2+
  On Debian systems, the complete text of version 2 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'
 
+License: GPL-3+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 3 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3'
+
 License: LGPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as

debian/lemonldap-ng-handler.install

@@ -0,0 +1,4 @@
+/etc/lemonldap-ng/handler-apache2.X.conf
+/etc/lemonldap-ng/handler-nginx.conf
+/etc/lemonldap-ng/test-nginx.conf
+/var/lib/lemonldap-ng/test

debian/liblemonldap-ng-handler-perl.install

@@ -1,9 +1,4 @@
-/etc/lemonldap-ng/handler-apache2.conf
-/etc/lemonldap-ng/handler-nginx.conf
-/etc/lemonldap-ng/test-apache2.conf
-/etc/lemonldap-ng/test-nginx.conf
 /usr/share/perl5/Lemonldap/NG/Handler*
 /usr/share/perl5/auto/Lemonldap/NG/Handler*
 /usr/share/man/man3/Lemonldap::NG::Handler*
 /usr/share/lemonldap-ng/bin/purgeLocalCache
-/var/lib/lemonldap-ng/test

debian/liblemonldap-ng-handler-perl.maintscript

@@ -0,0 +1,3 @@
+# Conf files have moved to lemonldap-ng-handler package
+rm_conffile /etc/lemonldap-ng/handler-nginx.conf 1.9.1-2~
+rm_conffile /etc/lemonldap-ng/handler-apache2.X.conf 1.9.1-2~

debian/liblemonldap-ng-handler-perl.postrm

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ "$1" == "configure" ]
-then
-	db_purge
-fi
-
-if [ "$1" == "purge" ]
-then
-	rm -f /var/lib/lemonldap-ng/handler/MyHandler.pm
-fi
-
-#DEBHELPER#
-exit 0