[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. f89fb2c00b1a2606035e5cd0e35b4ebe99f049ac

[Javier Fernandez-Sanguino]

The following commit has been merged in the master branch:
commit dc5bf75a8178cf185e728d717e9fc8bf5be970f6
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Wed Aug 29 00:34:40 2012 +0200

    Simplify the rules file using a binary-common target

diff --git a/debian/rules b/debian/rules
index 68d9777..a9f0bed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,7 +92,6 @@ install-prep:
 	dh_installdirs -a
 
 install-local:
-	dh_installinit -a -pssec-hids-local
 	install -m 755 local-bin/ossec* debian/ossec-hids-local/usr/lib/ossec
 	for file in manage_agents syscheck_update verify-agent-conf  \
 		clear_stats list_agents agent_control syscheck_control \
@@ -137,7 +136,6 @@ install-local:
 	install -m 750 active-response/firewalls/*.sh debian/ossec-hids-local/var/ossec/active-response/bin/
 
 install-server:
-	dh_installinit -a -possec-hids-server
 	install -m 755 server-bin/ossec* debian/ossec-hids-server/usr/lib/ossec
 	for file in manage_agents syscheck_update verify-agent-conf  \
 		clear_stats list_agents agent_control syscheck_control \
@@ -182,7 +180,6 @@ install-server:
 	install -m 750 active-response/firewalls/*.sh debian/ossec-hids-server/var/ossec/active-response/bin/
 
 install-agent:
-	dh_installinit -a -possec-hids-agent
 	install -m 755 agent-bin/ossec-agentd debian/ossec-hids-agent/usr/lib/ossec/
 	for file in agent-auth ossec-logcollector ossec-syscheckd ossec-execd ; do \
 		install -m 755 agent-bin/$$file debian/ossec-hids-agent/usr/lib/ossec/ ; \
@@ -223,48 +220,35 @@ install: install-arch install-indep
 
 binary: binary-arch binary-indep
 
+# We build architecture dependant packages using the common target.
 binary-arch: build install-arch
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a 
-	dh_installexamples -a
-	dh_installdebconf -a
-	dh_installlogrotate -a
-	dh_installman -a 
-	dh_installchangelogs -a 
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_perl -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
+# We build architecture-independent files here using the commont target.
 binary-indep: build-indep install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installdebconf -i
-	dh_installlogrotate -i
-	dh_installman -i 
-	dh_installchangelogs -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_makeshlibs -i
-	dh_installdeb -i
-	dh_perl -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_installdebconf
+	dh_installlogrotate
+	dh_installinit
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 get-orig-source:
 

-- 
Git repository for pkg-ossec