[Pkg-nagios-changes] [pkg-nagios-plugins] 49/413: okay, this one does it, really

[Jan Wagner]

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

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit c2bfddce96cb1aac690d978f8a306ba5827c4552
Author: Sean Finney <seanius at debian.org>
Date:   Wed Dec 6 18:13:07 2006 +0000

    okay, this one does it, really
---
 debian/functions | 3 +++
 debian/rules     | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/functions b/debian/functions
index df2ca59..a309064 100644
--- a/debian/functions
+++ b/debian/functions
@@ -1,5 +1,7 @@
 # functions for use by nagios plugins maintainer scripts
 
+set -x
+
 npconfdir=/etc/nagios-plugins/config
 npdpkgdir=/usr/share/nagios-plugins/dpkg
 
@@ -29,3 +31,4 @@ register_cfgs(){
 		);
 	fi
 }
+
diff --git a/debian/rules b/debian/rules
index 0af910d..2a163a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,10 +151,10 @@ install: build
 	sed -e 's/@STD_PLUGINS@/${std_plugin_cfgs}/' \
 		< $(DEBIANDIR)/nagios-plugins-standard.postrm.in \
 		> $(DEBIANDIR)/nagios-plugins-standard.postrm
-	# copy our dpkg-sourced functions into place
-	install -m 644 -D $(DEBIANDIR)/functions $(DEBIANDIR)/sarge.md5sums \
-		${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg/functions
-
+	# copy our dpkg-sourced functions etc into place
+	mkdir -p ${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg
+	install -t ${NP_BASIC_DIR}/usr/share/nagios-plugins/dpkg \
+		$(DEBIANDIR)/functions $(DEBIANDIR)/sarge.md5sums
 
 # Build architecture-independent files here.
 binary-indep: build install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git