[Pkg-nagios-changes] [pkg-nagios] r1071 - nagios-plugins/trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-12-06 19:13:07 +0100 (Wed, 06 Dec 2006)
New Revision: 1071

Modified:
   nagios-plugins/trunk/debian/functions
   nagios-plugins/trunk/debian/rules
Log:
okay, this one does it, really

Modified: nagios-plugins/trunk/debian/functions
===================================================================
--- nagios-plugins/trunk/debian/functions	2006-12-06 17:35:02 UTC (rev 1070)
+++ nagios-plugins/trunk/debian/functions	2006-12-06 18:13:07 UTC (rev 1071)
@@ -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 @@
 		);
 	fi
 }
+

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2006-12-06 17:35:02 UTC (rev 1070)
+++ nagios-plugins/trunk/debian/rules	2006-12-06 18:13:07 UTC (rev 1071)
@@ -151,11 +151,11 @@
 	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
 # We have nothing to do by default.