[SCM] Debian branch, master, updated. debian/1.2.2-2-8-gbbfa182

[Xavier Guimard]

The following commit has been merged in the master branch:
commit ec5fb45a71ac74cedd3be493bfc9b4a9fbed103f
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Wed Dec 5 06:14:27 2012 +0100

    Remove pre-defined MyHandler file. Now available from examples only

diff --git a/debian/README.Debian b/debian/README.Debian
index b22add1..89aa1ec 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -14,10 +14,18 @@ with a quick sed command. For example, we change it to ow2.org:
 
 Enable the components you've installed:
 
-  a2ensite handler-apache2.conf
+  # Portal
   a2ensite portal-apache2.conf
+
+  # Manager
   a2ensite manager-apache2.conf
 
+  # For the handler, take a look at
+  # /usr/share/doc/liblemonldap-ng-handler-perl/examples/MyHandler.pm
+  # and
+  # /usr/share/doc/liblemonldap-ng-handler-perl/examples/handler-apache2.conf
+  # to build your handler and load it in Apache
+
 and enable mod_perl if not already loaded:
 
   a2enmod perl
@@ -37,12 +45,10 @@ Be sure that your browser can join (adapt it with your domain):
 4 - Connect to the manager
 --------------------------
 
-Go to http://manager.example.com/, you'll be redirected to the portal. Then
-enjoy!
-
-5 - Default accounts
---------------------
+Go to http://manager.example.com/, you'll be redirected to the portal.
 
+* Default accounts
+  ----------------
 By default, LemonLDAP::NG use "Demo" authentication backend, so you can use the
 following accounts:
 
@@ -51,6 +57,15 @@ following accounts:
   msmith  msmith     user
    dwho    dwho  administrator
 
+5 - Base configuration file
+---------------------------
+
+The configuration is managed by the manager with the exception of some basic
+parameters such as the storage type configuration. These parameters are defined
+in the file /etc/lemonldap-ng/lemonldap-ng.ini.
+
+This file can also be used to override the global configuration locally
+
 6 - See more
 ------------
 
diff --git a/debian/changelog b/debian/changelog
index 215bac7..08c2502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 lemonldap-ng (1.2.2-3) UNRELEASED; urgency=low
 
   * Remove recursive changes in debian/*.postinst (chown and chmod)
-  * Restore /var/lib/lemonldap-ng/handler for dh_installdirs (Closes: #694890)
+  * Remove /var/lib/lemonldap-ng/handler from dh_installdirs list
+    (Closes: #694890)
+  * Remove pre-defined MyHandler file. Now available from examples only
+  * Update README.Debian file
 
  -- Xavier Guimard <x.guimard at free.fr>  Sun, 02 Dec 2012 07:42:24 +0100
 
diff --git a/debian/liblemonldap-ng-handler-perl.dirs b/debian/liblemonldap-ng-handler-perl.dirs
index 74a797f..072aca8 100644
--- a/debian/liblemonldap-ng-handler-perl.dirs
+++ b/debian/liblemonldap-ng-handler-perl.dirs
@@ -1,2 +1 @@
-/var/lib/lemonldap-ng/handler
 /var/lib/lemonldap-ng/sessions/lock
diff --git a/debian/liblemonldap-ng-handler-perl.install b/debian/liblemonldap-ng-handler-perl.install
index fe2af4e..df71554 100644
--- a/debian/liblemonldap-ng-handler-perl.install
+++ b/debian/liblemonldap-ng-handler-perl.install
@@ -3,4 +3,3 @@
 /usr/share/man/man3/Lemonldap::NG::Handler*
 /var/lib/lemonldap-ng/test
 /usr/share/lemonldap-ng/bin/purgeLocalCache
-/etc/lemonldap-ng/handler-apache2.conf
diff --git a/debian/liblemonldap-ng-handler-perl.links b/debian/liblemonldap-ng-handler-perl.links
deleted file mode 100644
index 1a82bc8..0000000
--- a/debian/liblemonldap-ng-handler-perl.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/lemonldap-ng/handler-apache2.conf /etc/apache2/sites-available/handler-apache2.conf
-
diff --git a/debian/liblemonldap-ng-handler-perl.postinst b/debian/liblemonldap-ng-handler-perl.postinst
deleted file mode 100755
index 64e8493..0000000
--- a/debian/liblemonldap-ng-handler-perl.postinst
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Maintainer: #DEBHELPER#
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-EXAMPLEHANDLERFILE=/usr/share/doc/liblemonldap-ng-handler-perl/examples/MyHandler.pm
-HANDLERFILE=/var/lib/lemonldap-ng/handler/MyHandler.pm
-SESSIONSDIR=/var/lib/lemonldap-ng/sessions
-
-if [ "$1" == "configure" ]
-then
-    [ -e $HANDLERFILE ] || cp $EXAMPLEHANDLERFILE $HANDLERFILE
-fi
-
-#DEBHELPER#
-exit 0

-- 
Debian