From d1583e7635f3116845c3410cd1eb6b42023e3925 Mon Sep 17 00:00:00 2001 From: Sven Velt Date: Fri, 21 Jan 2011 11:41:04 +0100 Subject: [PATCH] Use php-fpdf, php-fpdf-tpl and php-fpdi packages instead of bundled copies. Signed-off-by: Sven Velt --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 25 +++++++++++++++++++++---- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b73d37..fe18ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pnp4nagios (0.6.11-2) unstable; urgency=low + + * Use "php-fpdf", "php-fpdf-tpl" and "php-fpdi" packages instead of bundled + copies + + -- Sven Velt Fri, 21 Jan 2011 11:37:32 +0100 + pnp4nagios (0.6.11-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 941bac4..437d898 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Homepage: http://pnp4nagios.org Package: pnp4nagios Architecture: any -Depends: rrdtool, librrds-perl, libapache2-mod-php5 | php5, php5-gd, libkohana-php, adduser, ${shlibs:Depends}, ${misc:Depends} +Depends: rrdtool, librrds-perl, libapache2-mod-php5 | php5, php5-gd, php-fpdi, libkohana-php, adduser, ${shlibs:Depends}, ${misc:Depends} Suggests: Description: Nagios Addon to create graphs out of performance data PNP is a tool that produces graphs from performance data from Nagios diff --git a/debian/rules b/debian/rules index cfc2090..f0087dd 100644 --- a/debian/rules +++ b/debian/rules @@ -75,13 +75,17 @@ install: build touch $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/install.ignore # Move template config dir to /etc/pnp4nagios/templates - mv $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/templates $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/ -# ln -s ../../../../etc/pnp4nagios/templates $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/templates - dh_link /etc/pnp4nagios/templates /usr/share/pnp4nagios/html/templates + rmdir $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/templates + mkdir $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/templates + mv $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/templates.special \ + $(CURDIR)/debian/pnp4nagios/usr/share/doc/pnp4nagios/examples/ + mkdir $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/templates.special # Copy, rename and fix sample configs and examples sed -i -e 's#/nagios/cgi-bin#/cgi-bin/nagios3#' $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/config.php + mv $(CURDIR)/debian/pnp4nagios/usr/bin/npcd \ + $(CURDIR)/debian/pnp4nagios/usr/sbin/ mv $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/npcd.cfg-sample \ $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/npcd.cfg sed -i -e 's#/var/spool/pnp4nagios/#&npcd/#' \ @@ -112,8 +116,21 @@ install: build cp -av $(CURDIR)/contrib/ssi $(CURDIR)/debian/pnp4nagios/usr/share/doc/pnp4nagios/examples/ + # Remove external PHP classes/libraries: FPDF, FPDF-TPL, FPDI + rm -r $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/application/vendor/fpdf + # Link them into ".../vendor/" + dh_link /usr/share/php/fpdf /usr/share/pnp4nagios/html/application/vendor/fpdf + dh_link /usr/share/php/fpdf_tpl /usr/share/pnp4nagios/html/application/vendor/fpdf-tpl + dh_link /usr/share/php/fpdi /usr/share/pnp4nagios/html/application/vendor/fpdi + + # Clean up some files + rmdir $(CURDIR)/debian/pnp4nagios/usr/bin + mv $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/check_commands/check_all_local_disks.cfg-sample \ + $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/check_commands/check_all_local_disks.cfg + rm $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/check_commands/check_nrpe.cfg-sample + # Add Debian specific config and placeholder files - touch $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/pages/.placeholder + #touch $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/pages/.placeholder cp -av $(CURDIR)/debian/nagios.cfg $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/ cp -av $(CURDIR)/debian/check_commands/* $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/check_commands/ -- 2.30.2