[lemonldap-ng] 01/01: Update debian/rules to clean double symlinks

[Xavier Guimard]

This is an automated email from the git hooks/post-receive script.

xguimard-guest pushed a commit to branch master
in repository lemonldap-ng.

commit 4735c19547d1cae30cf4a2bbbefd674624c84b78
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Tue Dec 22 14:10:17 2015 +0100

    Update debian/rules to clean double symlinks
    
    Perl-5.22.1 doesn't support them
---
 debian/changelog | 19 ++-----------------
 debian/rules     |  5 +++++
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed235dc..3cbaf96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,9 @@
 lemonldap-ng (1.4.6-2) UNRELEASED; urgency=medium
 
-  PROBLEM: FTBFS
-
-  Generating a Unix-style Makefile
-  Writing Makefile for Lemonldap::NG::Handler
-  Writing MYMETA.yml and MYMETA.json
-  /build/lemonldap-ng-1.4.6/lemonldap-ng-portal/example/skins/pastel/redirect.tpl is encountered a second time at /usr/share/perl/5.22/File/Find.pm line 79.
-  Checking if your kit is complete...
-  Makefile:166: recipe for target 'portal_conf' failed
-  make[2]: *** [portal_conf] Error 255
-  make[2]: Leaving directory '/build/lemonldap-ng-1.4.6'
-  debian/rules:25: recipe for target 'override_dh_auto_configure' failed
-  make[1]: *** [override_dh_auto_configure] Error 2
-  make[1]: Leaving directory '/build/lemonldap-ng-1.4.6'
-  debian/rules:22: recipe for target 'build' failed
-  make: *** [build] Error 2
-  dpkg-buildpackage: error: debian/rules build gave error exit status 2
-
   * Update documentation path (Closes: #808473)
   * Add patch for a broken inheritance since upgrade (Closes: #808474)
+  * Update debian/rules to clean double symlinks (not supported by Perl-5.22).
+    Bug reported to upstream authors
 
  -- Xavier Guimard <x.guimard at free.fr>  Mon, 21 Dec 2015 07:53:37 +0100
 
diff --git a/debian/rules b/debian/rules
index 991da2d..42a9047 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,14 @@ CAPTCHAOUTPUTDIR=$(LMVARDIR)/portal/captcha_output
 	dh $@
 
 override_dh_auto_configure:
+	cd lemonldap-ng-portal/example/skins/dark/ && rm -f redirect.tpl && ln -s ../common/redirect.tpl
 	$(MAKE) configure STORAGECONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
 		PERLOPTIONS="INSTALLDIRS=vendor"
 
+override_dh_auto_clean:
+	cd lemonldap-ng-portal/example/skins/dark/ && rm -f redirect.tpl && ln -s ../pastel/redirect.tpl
+	$(MAKE) clean
+
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
 			PREFIX=/usr/ \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git