[SCM] Debian branch, master, updated. debian/1.2.2-2-15-g7313963

[Xavier Guimard]

The following commit has been merged in the master branch:
commit be749c99e6bcb0e3a5d4f4b8aec2bdb8040d06f6
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Tue Dec 11 21:52:03 2012 +0100

    Remove duplicate #DEBHELPER#s

diff --git a/debian/liblemonldap-ng-conf-perl.postinst b/debian/liblemonldap-ng-conf-perl.postinst
index e5868a4..5ebec3f 100755
--- a/debian/liblemonldap-ng-conf-perl.postinst
+++ b/debian/liblemonldap-ng-conf-perl.postinst
@@ -1,5 +1,4 @@
 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -27,8 +26,8 @@ then
         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
+    # 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
@@ -38,5 +37,5 @@ then
     fi
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0
diff --git a/debian/liblemonldap-ng-handler-perl.postrm b/debian/liblemonldap-ng-handler-perl.postrm
index f907c24..cbeac2f 100644
--- a/debian/liblemonldap-ng-handler-perl.postrm
+++ b/debian/liblemonldap-ng-handler-perl.postrm
@@ -1,5 +1,4 @@
 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -15,5 +14,5 @@ then
 	rm -f /var/lib/lemonldap-ng/handler/MyHandler.pm
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0
diff --git a/debian/liblemonldap-ng-manager-perl.postrm b/debian/liblemonldap-ng-manager-perl.postrm
index 94d728b..addeda4 100644
--- a/debian/liblemonldap-ng-manager-perl.postrm
+++ b/debian/liblemonldap-ng-manager-perl.postrm
@@ -1,5 +1,4 @@
 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -10,5 +9,5 @@ then
 	db_purge
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0
diff --git a/debian/liblemonldap-ng-manager-perl.preinst b/debian/liblemonldap-ng-manager-perl.preinst
index 2aba2f9..89a9bae 100644
--- a/debian/liblemonldap-ng-manager-perl.preinst
+++ b/debian/liblemonldap-ng-manager-perl.preinst
@@ -1,5 +1,4 @@
 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -14,5 +13,5 @@ then
 	fi
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0
diff --git a/debian/liblemonldap-ng-portal-perl.postinst b/debian/liblemonldap-ng-portal-perl.postinst
index 68a29da..c70d08f 100644
--- a/debian/liblemonldap-ng-portal-perl.postinst
+++ b/debian/liblemonldap-ng-portal-perl.postinst
@@ -1,5 +1,4 @@
 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -16,5 +15,5 @@ then
 	chown www-data:www-data $CAPTCHA_DIR
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0
diff --git a/debian/liblemonldap-ng-portal-perl.postrm b/debian/liblemonldap-ng-portal-perl.postrm
index ab3a20b..53ca0e3 100644
--- a/debian/liblemonldap-ng-portal-perl.postrm
+++ b/debian/liblemonldap-ng-portal-perl.postrm
@@ -1,5 +1,4 @@
 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -15,5 +14,5 @@ then
 	rm -f /var/lib/lemonldap-ng/portal/portal.wsdl
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0
diff --git a/debian/liblemonldap-ng-portal-perl.preinst b/debian/liblemonldap-ng-portal-perl.preinst
index bee1408..3bd429f 100644
--- a/debian/liblemonldap-ng-portal-perl.preinst
+++ b/debian/liblemonldap-ng-portal-perl.preinst
@@ -1,5 +1,4 @@
 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -14,5 +13,5 @@ then
 	fi
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0

-- 
Debian