* double declaration in Common/Conf/*.pm

* Debian compat upgrade

build/lemonldap-ng/debian/compat

@@ -1 +1 @@
-5
+7

build/lemonldap-ng/debian/control

@@ -3,14 +3,21 @@ Section: perl
 Priority: extra
 Maintainer: Xavier Guimard <x.guimard@free.fr>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), po-debconf
-Build-Depends-Indep:libapache-session-perl, libnet-ldap-perl, libdbi-perl, libwww-perl, libcache-cache-perl, libxml-simple-perl, libcgi-session-perl, libcrypt-rijndael-perl, libxml-libxslt-perl, libio-string-perl, libregexp-assemble-perl, liburi-perl, libstring-random-perl, libmime-lite-perl, libsoap-lite-perl
+Build-Depends: debhelper (>= 7), po-debconf
+Build-Depends-Indep:libapache-session-perl, libnet-ldap-perl, libdbi-perl,
+ libwww-perl, libcache-cache-perl, libxml-simple-perl, libcgi-session-perl,
+ libcrypt-rijndael-perl, libxml-libxslt-perl, libio-string-perl,
+ libregexp-assemble-perl, liburi-perl, libstring-random-perl, libmime-lite-perl,
+ libsoap-lite-perl
 Standards-Version: 3.8.3
+Homepage: http://lemonldap.ow2.org/
 
 Package: lemonldap-ng
 Section: perl
 Architecture: all
-Depends: ${misc:Depends}, liblemonldap-ng-handler-perl (= ${binary:Version}), liblemonldap-ng-manager-perl (= ${binary:Version}), liblemonldap-ng-portal-perl (= ${binary:Version})
+Depends: ${misc:Depends}, liblemonldap-ng-handler-perl (= ${binary:Version}),
+ liblemonldap-ng-manager-perl (= ${binary:Version}),
+ liblemonldap-ng-portal-perl (= ${binary:Version})
 Description: Lemonldap::NG Web-SSO system
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
  or directly on application Apache servers.
@@ -29,7 +36,9 @@ Description: Lemonldap::NG Web-SSO system documentation
 
 Package: liblemonldap-ng-handler-perl
 Architecture: all
-Depends: ${misc:Depends}, libapache-session-perl, libwww-perl, libcache-cache-perl, liblemonldap-ng-conf-perl (= ${binary:Version}), libapache2-mod-perl2, liburi-perl
+Depends: ${misc:Depends}, libapache-session-perl, libwww-perl,
+ libcache-cache-perl, liblemonldap-ng-conf-perl (= ${binary:Version}),
+ libapache2-mod-perl2, liburi-perl
 Suggests: liblemonldap-ng-portal-perl
 Description: Lemonldap::NG Apache module part
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
@@ -40,7 +49,8 @@ Description: Lemonldap::NG Apache module part
 
 Package: liblemonldap-ng-conf-perl
 Architecture: all
-Depends: ${misc:Depends}, libdbi-perl, debconf, libcache-cache-perl, libregexp-assemble-perl, libcrypt-rijndael-perl
+Depends: ${misc:Depends}, libdbi-perl, debconf, libcache-cache-perl,
+ libregexp-assemble-perl, libcrypt-rijndael-perl
 Recommends: libsoap-lite-perl
 Description: Lemonldap::NG common files
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
@@ -50,7 +60,9 @@ Description: Lemonldap::NG common files
 
 Package: liblemonldap-ng-manager-perl
 Architecture: all
-Depends: ${misc:Depends}, libxml-simple-perl, liblemonldap-ng-conf-perl (= ${binary:Version}), libjs-jquery, liblemonldap-ng-handler-perl (= ${binary:Version})
+Depends: ${misc:Depends}, libxml-simple-perl, libjs-jquery,
+ liblemonldap-ng-conf-perl (= ${binary:Version}),
+ liblemonldap-ng-handler-perl (= ${binary:Version})
 Recommends: libcache-cache-perl, libapache-session-perl, libsoap-lite-perl
 Description: Lemonldap::NG manager part
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
@@ -60,7 +72,11 @@ Description: Lemonldap::NG manager part
 
 Package: liblemonldap-ng-portal-perl
 Architecture: all
-Depends: ${misc:Depends}, libapache-session-perl, libnet-ldap-perl, liblemonldap-ng-conf-perl (= ${binary:Version}), libhtml-template-perl, libjs-jquery, liblemonldap-ng-handler-perl (= ${binary:Version}), libxml-libxml-perl, libxml-libxslt-perl, libstring-random-perl, libsoap-lite-perl
+Depends: ${misc:Depends}, libapache-session-perl, libnet-ldap-perl,
+ liblemonldap-ng-conf-perl (= ${binary:Version}), libhtml-template-perl,
+ libjs-jquery, liblemonldap-ng-handler-perl (= ${binary:Version}),
+ libxml-libxml-perl, libxml-libxslt-perl, libstring-random-perl,
+ libsoap-lite-perl
 Recommends: libmime-lite-perl, libemail-date-format-perl
 Suggests: liblasso-perl, libcgi-session-perl, slapd
 Description: Lemonldap::NG authentication portal part

build/lemonldap-ng/debian/copyright

@@ -1,19 +1,26 @@
-This package was debianized by Xavier Guimard <x.guimard@free.fr> on
-Sun, 17 Dec 2006 17:46:47 +0100.
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Xavier Guimard <x.guimard@free.fr>
+Upstream-Source: http://forge.objectweb.org/project/showfiles.php?group_id=274
+Upstream-Name: lemonldap-ng
 
-It was downloaded from: http://forge.objectweb.org/project/showfiles.php?group_id=274
+Files: *
+Copyright: 2004, 2005, 2006, 2007, 2008, 2009, Xavier Guimard <x.guimard@free.fr>
+License: Artistic | GPL-2
 
-Copyright:
+Files: *.js
+Licence: GPL-2
 
-Copyright 2004, 2005, 2006, 2007 by Xavier Guimard
-
-Licence:
-Lemonldap::NG is distributed under your choice under the GNU General Public
-License or the Artistic License.
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License version 2 can be found in `/usr/share/common-licenses/GPL-2' and the
-Artistic Licence in `/usr/share/common-licenses/Artistic'.
-
-File lemonldap-ng-manager/example/lemonldap-ng-manager.js is distributed under
-GNU General Public License version 2.
+License: Artistic
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Artistic License, which comes with Perl.
+    On Debian GNU/Linux systems, the complete text of the Artistic License
+    can be found in `/usr/share/common-licenses/Artistic'
 
+License: GPL-1+
+    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 1, or (at your option)
+    any later version.
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'

build/lemonldap-ng/debian/rules

@@ -49,7 +49,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/lemonldap-ng.

build/lemonldap-ng/debian/watch

@@ -1,3 +1,2 @@
 version=3
-
-http://download.forge.objectweb.org/lemonldap/lemonldap-ng-([\d\.]+)\.tar\.gz
+http://download.forge.objectweb.org/lemonldap/ lemonldap-ng-(\d[\d\.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$

modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DBI.pm

@@ -79,7 +79,7 @@ sub unlock {
 
 sub store {
     my ( $self, $fields ) = @_;
-    my $fields = $self->serialize($fields);
+    $fields = $self->serialize($fields);
     my $tmp =
       $self->dbh->do( "insert into "
           . $self->{dbiTable} . " ("

modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/File.pm

@@ -64,7 +64,7 @@ sub unlock {
 
 sub store {
     my ( $self, $fields ) = @_;
-    my $fields = $self->serialize($fields);
+    $fields = $self->serialize($fields);
     my $mask = umask;
     umask( oct('0027') );
     unless ( open FILE,