[Pkg-sympa-commits] [sympa] 11/28: Adjust debian/rules with new options added in configure

[Emmanuel Bouthenot]

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

kolter pushed a commit to branch master
in repository sympa.

commit 380f08e40b3736c1c89c92be967fcbe77e47407d
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Fri May 16 00:07:31 2014 +0200

    Adjust debian/rules with new options added in configure
---
 debian/rules          | 6 +++---
 debian/sympa.init     | 2 +-
 debian/sympa.postinst | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index cb3cb65..b1931aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,10 +47,10 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 	--mandir=/usr/share/man \
 	--with-initdir=/etc/init.d \
 	--with-docdir=/usr/share/doc/sympa \
+	--with-piddir=/run/sympa \
 	--with-perl=$(PERL) \
 	--with-user=sympa --with-group=sympa \
-	--with-sendmail_aliases=/etc/mail/sympa/aliases \
-	--with-virtual_aliases=/etc/mail/sympa/virtual
+	--with-aliases_file=/etc/mail/sympa/aliases
 
 DEB_MAKE_INSTALL_TARGET = install DESTDIR="$(DEB_DESTDIR)"
 
@@ -136,7 +136,7 @@ binary-post-install/sympa::
 	rm "$(DEB_DESTDIR)/usr/share/$(cdbs_curpkg)/bin/sympa_soap_client.pl"
 
 # Remove run directory as the init script deals with that
-	rmdir "$(DEB_DESTDIR)/var/run/$(cdbs_curpkg)" "$(DEB_DESTDIR)"/var/run
+	rmdir "$(DEB_DESTDIR)/run/$(cdbs_curpkg)" "$(DEB_DESTDIR)"/run
 
 # Remove configuration files shipped with sympa
 	rm "$(DEB_DESTDIR)/etc/$(cdbs_curpkg)/sympa.conf"
diff --git a/debian/sympa.init b/debian/sympa.init
index 8e887dd..c80416d 100644
--- a/debian/sympa.init
+++ b/debian/sympa.init
@@ -15,7 +15,7 @@ set -e
 ### END INIT INFO
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-RUNDIR=/var/run/sympa
+RUNDIR=/run/sympa
 EXECPATH=/usr/lib/sympa/bin
 USER=sympa
 GROUP=sympa
diff --git a/debian/sympa.postinst b/debian/sympa.postinst
index 690e7c9..d93d554 100644
--- a/debian/sympa.postinst
+++ b/debian/sympa.postinst
@@ -309,8 +309,7 @@ find /var/spool/sympa /var/lib/sympa \
 	-exec chown sympa:sympa {} \;
 
 # Fix permissions on MTA tools wrappers
-chmod u+s /usr/lib/sympa/bin/aliaswrapper
-chmod u+s /usr/lib/sympa/bin/virtualwrapper
+chmod u+s /usr/lib/sympa/lib/sympa/sympa_newaliases-wrapper
 
 # Fix permissions on CGI wrappers
 chown sympa:sympa /usr/lib/cgi-bin/sympa/wwsympa-wrapper.fcgi \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/sympa.git