[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.7_dfsg-2-31-g348d434

[Emmanuel Bouthenot]

The following commit has been merged in the master branch:
commit b5a5c0f331b7876b112d02c9d5bb59d1a9fb6d91
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Sat May 19 12:41:33 2012 +0000

    Fix location of X509-user-certs directory which contains user certificates: It has to be in /var/lib/sympa/list_data/X509-user-certs (#516513)

diff --git a/debian/conf/sympa.conf-smime.in b/debian/conf/sympa.conf-smime.in
index 5ed1a64..872601c 100644
--- a/debian/conf/sympa.conf-smime.in
+++ b/debian/conf/sympa.conf-smime.in
@@ -16,6 +16,6 @@ cafile		/usr/share/sympa/ca-bundle.crt
 key_passwd	@KEY_PASSWORD@
 
 # SSL certificates directory
-ssl_cert_dir	/var/lib/sympa/x509-user-certs
+ssl_cert_dir	/var/lib/sympa/list_data/X509-user-certs
 
 #-- S/MIME configuration end
diff --git a/debian/rules b/debian/rules
index b4a58da..36cc4c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,10 +54,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 	--with-sendmail_aliases=/etc/mail/sympa/aliases \
 	--with-virtual_aliases=/etc/mail/sympa/virtual
 
-# We cannot configure --with-expldir: upstream use uppercase X in subdir
-DEB_MAKE_INSTALL_TARGET = install \
-	DESTDIR="$(DEB_DESTDIR)" \
-	SSLCERTDIR=/var/lib/sympa/x509-user-certs
+DEB_MAKE_INSTALL_TARGET = install DESTDIR="$(DEB_DESTDIR)"
 
 DEB_INSTALL_EXAMPLES_sympa = debian/examples/tulp2sympa
 
diff --git a/debian/sympa.dirs b/debian/sympa.dirs
index 48d37bd..1b260c3 100644
--- a/debian/sympa.dirs
+++ b/debian/sympa.dirs
@@ -1,8 +1,7 @@
 etc/mail
 etc/rsyslog.d
 usr/share/doc/sympa/examples/script
-var/lib/sympa/expl
-var/lib/sympa/x509-user-certs
+var/lib/sympa/list_data/X509-user-certs
 var/lib/sympa/static_content
 var/lib/sympa/wwsarchive
 var/spool/sympa/queue
diff --git a/debian/sympa.install b/debian/sympa.install
index 25b19d1..4d37d85 100644
--- a/debian/sympa.install
+++ b/debian/sympa.install
@@ -9,5 +9,5 @@ debian/conf/topics.conf             etc/sympa
 debian/conf/topics.conf             usr/share/doc/sympa/examples/config
 debian/conf/wwsympa.conf            usr/share/doc/sympa/examples/config
 src/etc/script/create_db.*          usr/share/doc/sympa/examples/db
-debian/dbconfig-common/*            /usr/share/dbconfig-common/data/sympa
+debian/dbconfig-common/*            usr/share/dbconfig-common/data/sympa
 soap/sympa_soap_client.pl           usr/share/doc/sympa/examples/script

-- 
sympa Debian packaging