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

[Jan Wagner]

Author: waja
Date: 2012-05-15 21:36:20 +0000 (Tue, 15 May 2012)
New Revision: 2025

Modified:
   nagios-plugins/trunk/debian/control
   nagios-plugins/trunk/debian/rules
Log:
also move functions to common package and some minor stuff

Modified: nagios-plugins/trunk/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control	2012-05-15 12:31:44 UTC (rev 2024)
+++ nagios-plugins/trunk/debian/control	2012-05-15 21:36:20 UTC (rev 2025)
@@ -35,7 +35,8 @@
 
 Package: nagios-plugins-basic
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nagios-plugins-common, procps, iputils-ping [linux-any], inetutils-ping [kfreebsd-any hurd-any], ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping [linux-any], inetutils-ping [kfreebsd-any hurd-any], ucf
+Pre-Depends: nagios-plugins-common
 Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins, nagios-plugins-standard
 Suggests: nagios3 | icinga

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2012-05-15 12:31:44 UTC (rev 2024)
+++ nagios-plugins/trunk/debian/rules	2012-05-15 21:36:20 UTC (rev 2025)
@@ -178,8 +178,8 @@
 		< $(DEBIANDIR)/nagios-plugins-standard.postrm.in \
 		> $(DEBIANDIR)/nagios-plugins-standard.postrm
 	# 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 \
+	mkdir -p ${NP_COMMON_DIR}/usr/share/nagios-plugins/dpkg
+	install -t ${NP_COMMON_DIR}/usr/share/nagios-plugins/dpkg \
 		$(DEBIANDIR)/functions
 	# remove /usr/include from nagios-plugins-nasic (in case its empty)
 	rmdir ${NP_BASIC_DIR}/usr/include