[SCM] Debian branch, master, updated. debian/1.2.2-1-20-gbdee2cf

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 73c22f6c296acd0733cc75a43518f2e7ff1364e0
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Fri Nov 30 06:16:41 2012 +0100

    Clean d/*.dirs

diff --git a/debian/changelog b/debian/changelog
index fe742e7..ef9e3fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,18 +2,6 @@ lemonldap-ng (1.2.2-2) UNRELEASED; urgency=low
 
   TODO:
   - some tests are skipped --> add build-deps?
-  - from a quick look, most lines in the *.dirs files are probably useless,
-    since dh_install creates directories (for files mentioned in *.install)
-    itself
-  - d/rules: I don't understand "links are created by *.postinst scripts"
-    => lemonldap-ng uses perl scripts installed in /var, but for Debian, I've
-    installed them to /use/share and created links. It can perhaps be done by
-    dh_links ?
-
-    maybe I'm blind :) but
-    the only place I see links created is in
-    debian/lemonldap-ng-doc.links
-    (so all is fine, just the comment in d/rules is misleading)
 
   * Change maintainer to Debian Perl Group
   * Add Brazilian template translation (Closes: #693366)
diff --git a/debian/liblemonldap-ng-conf-perl.dirs b/debian/liblemonldap-ng-conf-perl.dirs
index 4ad10e8..ba4ac69 100644
--- a/debian/liblemonldap-ng-conf-perl.dirs
+++ b/debian/liblemonldap-ng-conf-perl.dirs
@@ -1,5 +1,2 @@
-/etc/lemonldap-ng
-/usr/share/lemonldap-ng/bin
 /var/lib/lemonldap-ng/conf
-/var/lib/lemonldap-ng/sessions
 /var/lib/lemonldap-ng/sessions/lock
diff --git a/debian/liblemonldap-ng-handler-perl.dirs b/debian/liblemonldap-ng-handler-perl.dirs
index 110f66e..072aca8 100644
--- a/debian/liblemonldap-ng-handler-perl.dirs
+++ b/debian/liblemonldap-ng-handler-perl.dirs
@@ -1,4 +1 @@
-/usr/share
-/var/lib/lemonldap-ng/handler
-/var/lib/lemonldap-ng/sessions
 /var/lib/lemonldap-ng/sessions/lock
diff --git a/debian/liblemonldap-ng-manager-perl.dirs b/debian/liblemonldap-ng-manager-perl.dirs
deleted file mode 100644
index 506ade3..0000000
--- a/debian/liblemonldap-ng-manager-perl.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-/etc/lemonldap-ng
-/usr/share/lemonldap-ng/bin
-/usr/share/lemonldap-ng/manager
-/usr/share/lemonldap-ng/manager-skins
-/var/lib/lemonldap-ng/manager
diff --git a/debian/liblemonldap-ng-portal-perl.dirs b/debian/liblemonldap-ng-portal-perl.dirs
index eb44c8a..305b422 100644
--- a/debian/liblemonldap-ng-portal-perl.dirs
+++ b/debian/liblemonldap-ng-portal-perl.dirs
@@ -1,9 +1,3 @@
-/etc/lemonldap-ng
-/usr/share/lemonldap-ng/bin
-/usr/share/lemonldap-ng/portal
-/usr/share/lemonldap-ng/portal-skins
-/var/lib/lemonldap-ng/portal
 /var/lib/lemonldap-ng/portal/captcha_output
-/var/lib/lemonldap-ng/sessions
 /var/lib/lemonldap-ng/sessions/lock
 /var/lib/lemonldap-ng/notifications
diff --git a/debian/rules b/debian/rules
index 8ab3d8b..26ffe37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,6 @@ override_dh_auto_install:
 	test -n "$$LOCALBUILD" || ./scripts/minifierjs $$(find debian/tmp/ -name '*.js')
 	test -n "$$LOCALBUILD" || ./scripts/minifiercss $$(find debian/tmp/ -name '*.css')
 
-	# Move perl scripts in /usr/share, links are created by *.postinst scripts
 	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/

-- 
Debian