[SCM] Debian branch, master, updated. debian/1.2.2-2-4-g5ffb72e

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 05a0bd27d972f79bfc0b010e7502a74da4f2347a
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Dec 2 07:41:15 2012 +0100

    Add #DEBHELPER# in post scripts and remove recursive changes (chown or chmod)

diff --git a/debian/liblemonldap-ng-conf-perl.postinst b/debian/liblemonldap-ng-conf-perl.postinst
index a9e8d57..e5868a4 100755
--- a/debian/liblemonldap-ng-conf-perl.postinst
+++ b/debian/liblemonldap-ng-conf-perl.postinst
@@ -5,37 +5,38 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-FIRSTCONFFILE=/var/lib/lemonldap-ng/conf/lmConf-1
 CONFDIR=/etc/lemonldap-ng
 SESSIONSDIR=/var/lib/lemonldap-ng/sessions
 CONFSTORAGEDIR=/var/lib/lemonldap-ng/conf
+FIRSTCONFFILE=$CONFSTORAGEDIR/lmConf-1
 LMINIFILE=/etc/lemonldap-ng/lemonldap-ng.ini
 MIGRATION=/usr/share/lemonldap-ng/bin/lmMigrateConfFiles2ini
 
 if [ "$1" == "configure" ]
 then
-	chmod 770 $SESSIONSDIR
-	chmod 770 $SESSIONSDIR/lock
-	chown -R www-data:www-data $SESSIONSDIR
-	chown -R www-data:www-data $CONFSTORAGEDIR
-	chmod 750 $CONFSTORAGEDIR
-	chmod 640 $CONFSTORAGEDIR/*
-	chgrp www-data $LMINIFILE
-	chmod 640 $LMINIFILE
+    chown www-data:www-data $SESSIONSDIR $SESSIONSDIR/lock \
+                            $CONFSTORAGEDIR $FIRSTCONFFILE
+    chgrp www-data $LMINIFILE
+    chmod 770 $SESSIONSDIR $SESSIONSDIR/lock
+    chmod 750 $CONFSTORAGEDIR
+    chmod 640 $CONFSTORAGEDIR/*
+    chmod 640 $LMINIFILE
 
-	for i in domain ldapServer ldapPort ldapBase managerDn managerPassword portal; do
-		db_get liblemonldap-ng-conf-perl/$i || true
-		perl -000 -i -pe "s#^$i(\\n\\s+)('?)[^\\n]*?('?)\$#$i\${1}\${2}$RET\${3}#m" $FIRSTCONFFILE
-	done
-	testversion=`echo $2|sed -e 's/^0\.9.*$/X/'`
-	if [ "$testversion" = "X" ]; then
-		if [ -e $CONFDIR/storage.conf -o -e $CONFDIR/apply.conf -o -e $CONFDIR/apps-list.xml ] ; then
-			db_get liblemonldap-ng-conf-perl/migrate
-			if [ "$RET" ]; then
-				# Run migration script
-				$MIGRATION 2>&1 > /dev/null || :
-			fi
-		fi
-	fi
+    for i in domain ldapServer ldapPort ldapBase managerDn managerPassword portal; do
+        db_get liblemonldap-ng-conf-perl/$i || true
+        perl -000 -i -pe "s#^$i(\\n\\s+)('?)[^\\n]*?('?)\$#$i\${1}\${2}$RET\${3}#m" $FIRSTCONFFILE
+    done
+
+    # Run migration script to convert menu format if old version is 0.9
+    if dpkg --compare-versions "$2" lt "1.0"; then
+        if [ -e $CONFDIR/storage.conf -o -e $CONFDIR/apply.conf -o -e $CONFDIR/apps-list.xml ] ; then
+            db_get liblemonldap-ng-conf-perl/migrate
+            if [ "$RET" ]; then
+                $MIGRATION 2>&1 > /dev/null || :
+            fi
+        fi
+    fi
 fi
+
+#DEBHELPER#
 exit 0
diff --git a/debian/liblemonldap-ng-handler-perl.postinst b/debian/liblemonldap-ng-handler-perl.postinst
index 7df3fb5..64e8493 100755
--- a/debian/liblemonldap-ng-handler-perl.postinst
+++ b/debian/liblemonldap-ng-handler-perl.postinst
@@ -14,4 +14,5 @@ then
     [ -e $HANDLERFILE ] || cp $EXAMPLEHANDLERFILE $HANDLERFILE
 fi
 
-
+#DEBHELPER#
+exit 0
diff --git a/debian/liblemonldap-ng-handler-perl.postrm b/debian/liblemonldap-ng-handler-perl.postrm
index 00f351f..f907c24 100644
--- a/debian/liblemonldap-ng-handler-perl.postrm
+++ b/debian/liblemonldap-ng-handler-perl.postrm
@@ -15,3 +15,5 @@ then
 	rm -f /var/lib/lemonldap-ng/handler/MyHandler.pm
 fi
 
+#DEBHELPER#
+exit 0
diff --git a/debian/liblemonldap-ng-manager-perl.postrm b/debian/liblemonldap-ng-manager-perl.postrm
index 0ca4b55..94d728b 100644
--- a/debian/liblemonldap-ng-manager-perl.postrm
+++ b/debian/liblemonldap-ng-manager-perl.postrm
@@ -10,3 +10,5 @@ then
 	db_purge
 fi
 
+#DEBHELPER#
+exit 0
diff --git a/debian/liblemonldap-ng-manager-perl.preinst b/debian/liblemonldap-ng-manager-perl.preinst
index dc30fa6..2aba2f9 100644
--- a/debian/liblemonldap-ng-manager-perl.preinst
+++ b/debian/liblemonldap-ng-manager-perl.preinst
@@ -14,3 +14,5 @@ then
 	fi
 fi
 
+#DEBHELPER#
+exit 0
diff --git a/debian/liblemonldap-ng-portal-perl.postinst b/debian/liblemonldap-ng-portal-perl.postinst
index b91262f..68a29da 100644
--- a/debian/liblemonldap-ng-portal-perl.postinst
+++ b/debian/liblemonldap-ng-portal-perl.postinst
@@ -13,6 +13,8 @@ CAPTCHA_DIR=/var/lib/lemonldap-ng/portal/captcha_output
 if [ "$1" == "configure" ]
 then
 	$BUILDPORTALWSDL > $WSDLFILE || true
-	chown -R www-data:www-data $CAPTCHA_DIR
+	chown www-data:www-data $CAPTCHA_DIR
 fi
 
+#DEBHELPER#
+exit 0
diff --git a/debian/liblemonldap-ng-portal-perl.postrm b/debian/liblemonldap-ng-portal-perl.postrm
index 46da33e..ab3a20b 100644
--- a/debian/liblemonldap-ng-portal-perl.postrm
+++ b/debian/liblemonldap-ng-portal-perl.postrm
@@ -14,3 +14,6 @@ if [ "$1" == "purge" ]
 then
 	rm -f /var/lib/lemonldap-ng/portal/portal.wsdl
 fi
+
+#DEBHELPER#
+exit 0
diff --git a/debian/liblemonldap-ng-portal-perl.preinst b/debian/liblemonldap-ng-portal-perl.preinst
index 7e19a8e..bee1408 100644
--- a/debian/liblemonldap-ng-portal-perl.preinst
+++ b/debian/liblemonldap-ng-portal-perl.preinst
@@ -14,3 +14,5 @@ then
 	fi
 fi
 
+#DEBHELPER#
+exit 0

-- 
Debian