From d6df90640525a2ecace9af09e8d8772b5358bfcb Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 15 May 2012 21:36:20 +0000 Subject: [PATCH] also move functions to common package and some minor stuff --- debian/control | 3 ++- debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 19fe8ca..c086ff2 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,8 @@ Description: Common files for plugins for nagios compatible monitoring 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 diff --git a/debian/rules b/debian/rules index a71678e..90e8c29 100755 --- a/debian/rules +++ b/debian/rules @@ -178,8 +178,8 @@ install: build < $(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