[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.4_dfsg-1-16-g192cb04

[Emmanuel Bouthenot]

The following commit has been merged in the master branch:
commit 4eae868f69a57d4cd1e44db27ac86f49de386873
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Sun Aug 21 08:39:00 2011 +0000

    Some debian/rules clean up

diff --git a/debian/rules b/debian/rules
index 2218ffe..e12e6a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,6 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-# TODO: verify that gencat path is static on Debian, and simplify
-GENCAT := $(shell which gencat || echo '/usr/bin/gencat')
 PERL = /usr/bin/perl
 
 SCRIPTS = p12topem.pl testldap.pl load_subscribers.pl orphan_killer.pl \
@@ -52,8 +50,6 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 	--with-initdir=/etc/init.d \
 	--with-docdir=/usr/share/doc/sympa \
 	--with-perl=$(PERL) \
-	--with-openssl=/usr/bin/openssl \
-	--with-gencat=$(GENCAT) \
 	--with-user=root --with-group=root \
 	--with-sendmail_aliases=/etc/mail/sympa/aliases \
 	--with-virtual_aliases=/etc/mail/sympa/virtual
@@ -100,8 +96,8 @@ clean::
 pre-build::
 	touch src/etc/ca-bundle.crt
 binary-post-install/sympa::
-	rm -f $(DEB_DESTDIR)/usr/share/sympa/default/ca-bundle.crt
-	ln -s -T /etc/ssl/certs/ca-certificates.crt $(DEB_DESTDIR)/usr/share/sympa/default/ca-bundle.crt
+	rm -f $(DEB_DESTDIR)/usr/share/$(cdbs_curpkg)/default/ca-bundle.crt
+	ln -s -T /etc/ssl/certs/ca-certificates.crt $(DEB_DESTDIR)/usr/share/$(cdbs_curpkg)/default/ca-bundle.crt
 clean::
 	rm -f src/etc/ca-bundle.crt
 
@@ -139,24 +135,23 @@ clean::
 
 # Remove unnecessary files
 binary-post-install/sympa::
-	rm -f "$(DEB_DESTDIR)"/usr/share/doc/sympa/examples/sample/*.conf \
-		"$(DEB_DESTDIR)"/usr/lib/cgi-bin/sympa/mime.types
+	rm -f "$(DEB_DESTDIR)"/usr/share/doc/$(cdbs_curpkg)/examples/sample/*.conf \
+		"$(DEB_DESTDIR)"/usr/lib/cgi-bin/$(cdbs_curpkg)/mime.types
 
 # SOAP client script not necessary for operation (#496515)
-	rm "$(DEB_DESTDIR)"/usr/share/sympa/bin/sympa_soap_client.pl
+	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/sympa "$(DEB_DESTDIR)"/var/run
+	rmdir "$(DEB_DESTDIR)/var/run/$(cdbs_curpkg)" "$(DEB_DESTDIR)"/var/run
 
 # Remove configuration files shipped with sympa
-	rm "$(DEB_DESTDIR)"/etc/sympa/sympa.conf
-	rm "$(DEB_DESTDIR)"/etc/sympa/wwsympa.conf
+	rm "$(DEB_DESTDIR)/etc/$(cdbs_curpkg)/sympa.conf"
+	rm "$(DEB_DESTDIR)/etc/$(cdbs_curpkg)/wwsympa.conf"
 
 # Move upstream sample dir below Debian example dir
 	cd "$(DEB_DESTDIR)/usr/share/doc/$(cdbs_curpkg)" && mv sample/ examples/
 
 # Rename example file topics.conf -> topics.us.conf
-binary-post-install/sympa::
 	mv "$(DEB_DESTDIR)"/usr/share/doc/$(cdbs_curpkg)/examples/config/topics.conf \
 		"$(DEB_DESTDIR)"/usr/share/doc/$(cdbs_curpkg)/examples/config/topics.us.conf
 

-- 
sympa Debian packaging