--- lemonldap-ng-0.9.4.1.orig/debian/watch
+++ lemonldap-ng-0.9.4.1/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)$
--- lemonldap-ng-0.9.4.1.orig/debian/lemonldap-ng.dirs
+++ lemonldap-ng-0.9.4.1/debian/lemonldap-ng.dirs
@@ -0,0 +1 @@
+/usr/share/doc/lemonldap-ng/examples
--- lemonldap-ng-0.9.4.1.orig/debian/liblemonldap-ng-manager-perl.examples
+++ lemonldap-ng-0.9.4.1/debian/liblemonldap-ng-manager-perl.examples
@@ -1 +1 @@
-debian/tmp/examples/manager/*
+debian/tmp/examples/manager/*.pl
--- lemonldap-ng-0.9.4.1.orig/debian/changelog
+++ lemonldap-ng-0.9.4.1/debian/changelog
@@ -1,5 +1,90 @@
-lemonldap-ng (0.9.5-0) unstable; urgency=low
+lemonldap-ng (0.9.4.1-3) unstable; urgency=low
 
-  * Local build
+  [ Xavier Guimard ]
+  * Japanese po-debconf template translation (Closes: #559396)
+  * Debian policy update
 
- -- Xavier Guimard <x.guimard@free.fr>  Wed, 12 Aug 2009 11:08:42 +0200
+ -- Xavier Guimard <x.guimard@free.fr>  Sat, 13 Feb 2010 14:36:40 +0100
+
+lemonldap-ng (0.9.4.1-2) unstable; urgency=low
+
+  * Lintian :
+    - lintian.override for liblemonldap-ng-conf
+    - registering doc
+  * change lemonldap-ng section to perl as claimed by archive-administrator
+
+ -- Xavier Guimard <x.guimard@free.fr>  Mon, 12 Oct 2009 16:26:26 +0200
+
+lemonldap-ng (0.9.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Russian translation (Closes: #550552)
+
+ -- Xavier Guimard <x.guimard@free.fr>  Mon, 12 Oct 2009 14:40:46 +0200
+
+lemonldap-ng (0.9.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Closes: #512009 (closed since 0.9.3.2)
+
+ -- Xavier Guimard <x.guimard@free.fr>  Sun, 05 Jul 2009 13:46:54 +0200
+
+lemonldap-ng (0.9.3.4-2) unstable; urgency=low
+
+  * Missing build-depends libregexp-assemble-perl (Closes: #521959)
+
+ -- Xavier Guimard <x.guimard@free.fr>  Sat, 11 Apr 2009 08:14:19 +0200
+
+lemonldap-ng (0.9.3.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Closes 3 bugs (see
+    http://forge.objectweb.org/tracker/?atid=350401&group_id=274&func=browse
+    bugs number 312418, 312625 and 312627)
+
+ -- Xavier Guimard <x.guimard@free.fr>  Thu, 05 Feb 2009 16:27:16 +0100
+
+lemonldap-ng (0.9.3.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Closes: #510562
+  * Closes: #510563
+
+ -- Xavier Guimard <x.guimard@free.fr>  Sat, 03 Jan 2009 09:51:55 +0100
+
+lemonldap-ng (0.9.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Xavier Guimard <x.guimard@free.fr>  Wed, 31 Dec 2008 12:11:50 +0100
+
+lemonldap-ng (0.9.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Czech translation for debconf (Closes: #483301)
+  * Swedish translation for debconf (Closes: #487713)
+
+ -- Xavier Guimard <x.guimard@free.fr>  Tue, 24 Jun 2008 15:12:09 +0200
+
+lemonldap-ng (0.9.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Xavier Guimard <x.guimard@free.fr>  Fri, 11 Apr 2008 16:48:59 +0200
+
+lemonldap-ng (0.9-1) unstable; urgency=low
+
+  New upstream release
+  * purgeCentralCache was not correctly installed (Closes: #461572)
+  * Portuguese debconf translation (Closes: #451820)
+  * German debconf translation (Closes: #462807)
+
+ -- Xavier Guimard <x.guimard@free.fr>  Mon, 25 Feb 2008 15:06:49 +0100
+
+lemonldap-ng (0.8.3.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #429441: ITP: lemonldap-ng -- lemonldap-ng
+    is a Perl web single-sign-on system usable as Apache module - Debian
+    Bug report logs)
+
+ -- Xavier Guimard <x.guimard@free.fr>  Wed, 07 Nov 2007 16:51:23 +0100
--- lemonldap-ng-0.9.4.1.orig/debian/liblemonldap-ng-conf-perl.dirs
+++ lemonldap-ng-0.9.4.1/debian/liblemonldap-ng-conf-perl.dirs
@@ -1,6 +1,5 @@
 /etc/lemonldap-ng
 /usr/share/lemonldap-ng/bin
-/usr/share/doc/lemonldap-ng/examples
 /var/lib/lemonldap-ng/conf
 /var/lib/lemonldap-ng/sessions
 /var/lib/lemonldap-ng/sessions/lock
--- lemonldap-ng-0.9.4.1.orig/debian/compat
+++ lemonldap-ng-0.9.4.1/debian/compat
@@ -1 +1 @@
-5
+7
--- lemonldap-ng-0.9.4.1.orig/debian/lemonldap-ng-doc.doc-base
+++ lemonldap-ng-0.9.4.1/debian/lemonldap-ng-doc.doc-base
@@ -0,0 +1,11 @@
+Document: lemonldap-ng-doc
+Title: Lemonldap::NG documentation
+Author: Xavier Guimard
+Abstract: Those HTML documents contains all Lemonldap::NG documentation
+ imported from lemonldap.ow2.org
+Section: Web Development
+
+Format: HTML
+Index: /usr/share/doc/lemonldap-ng-doc/index.html
+Files: /usr/share/doc/lemonldap-ng-doc/*.html
+
--- lemonldap-ng-0.9.4.1.orig/debian/control
+++ lemonldap-ng-0.9.4.1/debian/control
@@ -3,12 +3,11 @@
 Priority: extra
 Maintainer: Xavier Guimard <x.guimard@free.fr>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), po-debconf
+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
 
 Package: lemonldap-ng
-Section: web
 Architecture: all
 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-0.9.4.1.orig/debian/rules
+++ lemonldap-ng-0.9.4.1/debian/rules
@@ -49,7 +49,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/lemonldap-ng.
@@ -96,8 +96,7 @@
 		cd debian/lemonldap-ng/usr/share/doc/lemonldap-ng/examples && \
 		ln -s ../../liblemonldap-ng-handler-perl/examples handler && \
 		ln -s ../../liblemonldap-ng-manager-perl/examples manager && \
-		ln -s ../../liblemonldap-ng-portal-perl/examples portal && \
-		ln -s ../../liblemonldap-ng-conf-perl/examples/ conf
+		ln -s ../../liblemonldap-ng-portal-perl/examples portal
 	chmod +x debian/liblemonldap-ng-portal-perl$(LMSHAREDIR)bin/purgeCentralCache
 #	dh_installmenu
 	dh_installdebconf	
--- lemonldap-ng-0.9.4.1.orig/debian/copyright
+++ lemonldap-ng-0.9.4.1/debian/copyright
@@ -1,19 +1,49 @@
-This package was debianized by Xavier Guimard <x.guimard@free.fr> on
-Sun, 17 Dec 2006 17:46:47 +0100.
-
-It was downloaded from: http://forge.objectweb.org/project/showfiles.php?group_id=274
-
-Copyright:
-
-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.
+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
+
+Files: tree.js
+Copyright: 2008, Peter Panov <panov@elcat.kg>, IKEEN Group http://www.ikeen.com
+Licence: BSD
+
+Files: xlib.js
+Copyright: 2002-2007, Michael Foster (Cross-Browser.com)
+Licence: LGPL
+
+Files: *.js
+Licence: GPL-2
+
+Files: *
+Copyright: 2004, 2005, 2006, 2007, 2008, 2009, Xavier Guimard <x.guimard@free.fr>
+License: Artistic | GPL-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-2
+    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-2'
+
+Licence: BSD
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted under the terms of the BSD License.
+    On Debian GNU/Linux systems, the complete text of the BSD License can
+    be found in `/usr/share/common-licenses/BSD'.
+
+Licence: LGPL
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation.
+    On Debian GNU/Linux systems, the complete text of the GNU Lesser
+    General Public License can be found in
+    `/usr/share/common-licenses/LGPL'.
 
--- lemonldap-ng-0.9.4.1.orig/debian/po/ja.po
+++ lemonldap-ng-0.9.4.1/debian/po/ja.po
@@ -0,0 +1,131 @@
+# Copyright (C) 2009 Xavier Guimard <x.guimard@free.fr>
+# This file is distributed under the same license as lemonldap-ng package.
+# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: lemonldap-ng 0.9.4.1-2\n"
+"Report-Msgid-Bugs-To: x.guimard@free.fr\n"
+"POT-Creation-Date: 2007-09-22 13:08+0200\n"
+"PO-Revision-Date: 2009-11-24 14:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:1001
+msgid "LDAP server:"
+msgstr "LDAP サーバ:"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:1001
+msgid ""
+"Set here name or IP address of the LDAP server that has to be used by "
+"Lemonldap::NG. You can modify this value later using the Lemonldap::NG "
+"manager."
+msgstr ""
+"Lemonldap::NG が利用する LDAP サーバの名前、あるいは IP アドレスをここで設定"
+"してください。Lemonldap::NG マネージャを使えば、後ほどこの値を変更できます。"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:2001
+msgid "Lemonldap::NG DNS domain:"
+msgstr "Lemonldap::NG DNS ドメイン名:"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:2001
+msgid ""
+"Set here the main domain protected by Lemonldap::NG. You can modify this "
+"value later using the Lemonldap::NG manager."
+msgstr ""
+"ここで、Lemonldap::NG で保護するメインのドメイン名を設定してください。"
+"Lemonldap::NG マネージャを使えば、後ほどこの値を変更できます。"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:3001
+msgid "Lemonldap::NG portal:"
+msgstr "Lemonldap::NG ポータル::"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:3001
+msgid ""
+"Set here the Lemonldap::NG portal URL. You can modify this value later using "
+"the Lemonldap::NG manager."
+msgstr ""
+"ここで、Lemonldap::NG ポータルの URL を設定してください。Lemonldap::NG マネー"
+"ジャを使えば、後ほどこの値を変更できます。"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:4001
+msgid "LDAP server port:"
+msgstr "LDAP サーバのポート番号:"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:4001
+msgid ""
+"Set here the port used by the LDAP server. You can modify this value later "
+"using the Lemonldap::NG manager."
+msgstr ""
+"ここで、LDAP サーバが使うポート番号を設定してください。Lemonldap::NG マネー"
+"ジャを使えば、後ほどこの値を変更できます。"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:5001
+msgid "LDAP search base:"
+msgstr "LDAP 検索ベース:"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:5001
+msgid ""
+"Set here the search base to use in LDAP queries. You can modify this value "
+"later using the Lemonldap::NG manager."
+msgstr ""
+"ここで、LDAP クエリで利用する検索ベースを設定してください。Lemonldap::NG マ"
+"ネージャを使えば、後ほどこの値を変更できます。"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:6001
+msgid "LDAP account:"
+msgstr "LDAP アカウント:"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:6001
+msgid ""
+"Set here the account that Lemonldap::NG has to use for its LDAP requests. "
+"Leaving it blank causes Lemonldap::NG to use anonymous connections. You can "
+"modify this value later using the Lemonldap::NG manager."
+msgstr ""
+"ここで、LDAP のリクエストに対して Lemonldap::NG が使う必要があるアカウントを"
+"設定してください。この欄を空白のままにしておくと、Lemonldap::NG は匿名での接"
+"続を行うようになります。Lemonldap::NG マネージャを使えば、後ほどこの値を変更"
+"できます。"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:7001
+msgid "LDAP password:"
+msgstr "LDAP パスワード:"
+
+#. Type: string
+#. Description
+#: ../liblemonldap-ng-conf-perl.templates:7001
+msgid ""
+"Set here the password for the Lemonldap::NG LDAP account. You can modify "
+"this value later using the Lemonldap::NG manager."
+msgstr ""
+"Lemonldap::NG の LDAP アカウントのパスワードをここで設定してください。"
+"Lemonldap::NG マネージャを使えば、後ほどこの値を変更できます。"
