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

[Jan Wagner]

Author: waja
Date: 2012-12-15 20:45:45 +0000 (Sat, 15 Dec 2012)
New Revision: 2080

Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/control
   nagios-plugins/trunk/debian/rules
Log:
fixing LP: #1086151 (rpcinfo)

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2012-07-11 08:30:26 UTC (rev 2079)
+++ nagios-plugins/trunk/debian/changelog	2012-12-15 20:45:45 UTC (rev 2080)
@@ -3,6 +3,8 @@
   * Add versioned dependency to inetutils-ping (Closes: #680416), thanks to
     Robert Millan
   * Move nagios-plugins-contrib from Recommends to Suggests
+  * Define the path for rpcinfo on ubuntu to /usr/sbin and depended on rpcbind
+    - LP: #1086151
 
  -- Jan Wagner <waja at cyconet.org>  Wed, 27 Jun 2012 23:14:40 +0200
 

Modified: nagios-plugins/trunk/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control	2012-07-11 08:30:26 UTC (rev 2079)
+++ nagios-plugins/trunk/debian/control	2012-12-15 20:45:45 UTC (rev 2080)
@@ -65,7 +65,7 @@
 Architecture: any
 Conflicts: nagios-plugins (<= 1.4.2-3)
 Replaces: nagios-plugins
-Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, nagios-plugins-basic (>= 1.4.5-2)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends}, ucf, nagios-plugins-basic (>= 1.4.5-2)
 Recommends: ${shlibs:Recommends}, fping, snmp, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient, whois, qstat
 Suggests: nagios3 | icinga, postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light
 Description: Plugins for nagios compatible monitoring systems

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2012-07-11 08:30:26 UTC (rev 2079)
+++ nagios-plugins/trunk/debian/rules	2012-12-15 20:45:45 UTC (rev 2080)
@@ -29,6 +29,14 @@
 NP_STD_DIR:=$(DEBIANDIR)/nagios-plugins-standard
 NP_STD_TEMPLATES:=$(NP_STD_DIR)/usr/share/nagios-plugins/templates-standard
 
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+	DEPSUBSTVARS = -Vdist:Depends="rpcbind"
+	RPCINFO_CONFIGURE_ARGS = /usr/sbin/rpcinfo
+else
+	DEPSUBSTVARS = -Vdist:Depends=""
+	RPCINFO_CONFIGURE_ARGS = /usr/bin/rpcinfo
+endif
+
 std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
 	check_rpc check_snmp check_wave check_fping check_game \
 	check_radius check_mysql check_mysql_query check_pgsql \
@@ -101,7 +109,7 @@
 		$(PING_CONFIGURE_ARGS) \
 		--with-nslookup-command="/usr/bin/nslookup -sil" \
 		--with-uptime-command="/usr/bin/uptime" \
-		--with-rpcinfo-command="/usr/bin/rpcinfo" \
+		--with-rpcinfo-command=${RPCINFO_CONFIGURE_ARGS} \
 		--with-smbclient-command="/usr/bin/smbclient" \
 		--with-snmpget-command="/usr/bin/snmpget" \
 		--with-snmpgetnext-command="/usr/bin/snmpgetnext" \
@@ -224,7 +232,7 @@
 	grep shlibs:Suggests debian/nagios-plugins-standard.substvars.in \
 		| sed -e 's/shlibs:Suggests/shlibs:Recommends/' \
 		>> debian/nagios-plugins-standard.substvars
-	dh_gencontrol -s
+	dh_gencontrol -s -- $(DEPSUBSTVARS)
 	dh_md5sums -s
 	dh_builddeb -s