Debian changes

debian/NEWS

+lemonldap-ng (1.2.2-3) unstable; urgency=low
+
+  Examples files (Apache configuration and default handler files) are now not
+  installed in /var/lib/lemonldap-ng/handler but available as examples files
+
+ -- Xavier Guimard <x.guimard@free.fr>  Wed, 05 Dec 2012 06:27:45 +0100
+
 lemonldap-ng (1.2.2-2) unstable; urgency=low
 
   Since 1.2.2, LemonLDAP::NG uses 'Demo' authentication backend by default

debian/lemonldap-ng-doc.links

+/usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/amazon.gif /usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/amazon.de.gif
+/usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/amazon.gif /usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/amazon.uk.gif
+/usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wp.gif /usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wpde.gif
+/usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wp.gif /usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wpes.gif
+/usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wp.gif /usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wpfr.gif
+/usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wp.gif /usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wpjp.gif
+/usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wp.gif /usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wpmeta.gif
+/usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wp.gif /usr/share/doc/lemonldap-ng-doc/lib/images/interwiki/wppl.gif
+/usr/share/doc/lemonldap-ng-doc/media/screenshots/1.00/status_standard.png /usr/share/doc/lemonldap-ng-doc/media/documentation/status_standard.png
+/usr/share/doc/lemonldap-ng-doc/lib/images/smileys/icon_frown.gif /usr/share/doc/lemonldap-ng-doc/lib/images/smileys/icon_sad.gif
+

debian/liblemonldap-ng-conf-perl.postinst

 #!/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

debian/liblemonldap-ng-handler-perl.examples

 debian/tmp/examples/handler/*
 debian/tmp/etc/lemonldap-ng/handler-apache2.conf
+debian/tmp/var/lib/lemonldap-ng/test

debian/liblemonldap-ng-handler-perl.postinst

 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -14,5 +13,5 @@ then
     [ -e $HANDLERFILE ] || cp $EXAMPLEHANDLERFILE $HANDLERFILE
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0

debian/liblemonldap-ng-handler-perl.postrm

 #!/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

debian/liblemonldap-ng-manager-perl.preinst

 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -14,5 +13,5 @@ then
 	fi
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0

debian/liblemonldap-ng-portal-perl.links

@@ -3,4 +3,4 @@
 /usr/share/lemonldap-ng/portal/index.pl /var/lib/lemonldap-ng/portal/index.pl
 /usr/share/lemonldap-ng/portal/mail.pl /var/lib/lemonldap-ng/portal/mail.pl
 /usr/share/lemonldap-ng/portal/metadata.pl /var/lib/lemonldap-ng/portal/metadata.pl
-
+/usr/share/doc/liblemonldap-ng-portal-perl/examples/index_skin.pl /usr/share/doc/liblemonldap-ng-portal-perl/examples/index.pl

debian/liblemonldap-ng-portal-perl.postinst

 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -16,5 +15,5 @@ then
 	chown www-data:www-data $CAPTCHA_DIR
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0

debian/liblemonldap-ng-portal-perl.postrm

 #!/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

debian/liblemonldap-ng-portal-perl.preinst

 #!/bin/bash
-# Maintainer: #DEBHELPER#
 
 set -e
 
@@ -14,5 +13,5 @@ then
 	fi
 fi
 
-#DEBHELPER#
+# Maintainer: #DEBHELPER#
 exit 0

debian/rules

@@ -4,7 +4,15 @@
 #export DH_VERBOSE=1
 
 LMSHAREDIR=/usr/share/lemonldap-ng
-LMVARDIR=/var/lib/lemonldap-ng
+LMVARDIR  =/var/lib/lemonldap-ng
+TMP       = $(CURDIR)/debian/tmp
+
+CONFDIR=/etc/lemonldap-ng
+SESSIONSDIR=$(LMVARDIR)/sessions
+CONFSTORAGEDIR=$(LMVARDIR)/conf
+FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1
+LMINIFILE=$(CONFDIR)/lemonldap-ng.ini
+CAPTCHADIR=$(LMVARDIR)/portal/captcha_output
 
 %:
 	dh $@
@@ -36,7 +44,10 @@ override_dh_auto_install:
 	test -n "$$LOCALBUILD" || ./scripts/minifierjs $$(find debian/tmp/ -name '*.js')
 	test -n "$$LOCALBUILD" || ./scripts/minifiercss $$(find debian/tmp/ -name '*.css')
 
-	mkdir debian/tmp/usr/share/lemonldap-ng/manager debian/tmp/usr/share/lemonldap-ng/portal
-	mv debian/tmp/var/lib/lemonldap-ng/portal/*.pl debian/tmp/usr/share/lemonldap-ng/portal/
-	mv debian/tmp/var/lib/lemonldap-ng/manager/*pl debian/tmp/usr/share/lemonldap-ng/manager/
+	mkdir $(TMP)/$(LMSHAREDIR)/manager $(TMP)/$(LMSHAREDIR)/portal
+	mv $(TMP)/$(LMVARDIR)/portal/*.pl $(TMP)/$(LMSHAREDIR)/portal/
+	mv $(TMP)/$(LMVARDIR)/manager/*pl $(TMP)/$(LMSHAREDIR)/manager/
+
+override_dh_compress:
+	dh_compress -X favicon.ico