also move functions to common package and some minor stuff

This commit is contained in:
Jan Wagner 2012-05-15 21:36:20 +00:00
parent 8eecf37295
commit d6df906405
2 changed files with 4 additions and 3 deletions

3
debian/control vendored
View file

@ -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

4
debian/rules vendored
View file

@ -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