Use php-fpdf, php-fpdf-tpl and php-fpdi packages instead of bundled

copies.

Signed-off-by: Sven Velt <sven@velt.de>

diff --git a/debian/changelog b/debian/changelog
index 2b73d37607b1a10c95752896bd1c4c98da066118..fe18ccf980f94d471af765b47bd426d4d8d96d71 100644 (file)
--- 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 <sven@velt.de>  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 941bac46aa701fc313bb1a4abe172057584dd855..437d898ac9bc0175f8b1d95da437922a0dd013cf 100644 (file)
--- 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 cfc2090a37bb78c506277fd8f5ab8cd782bb30c4..f0087dd77618fe6aeab81046d721c8e134c6b3ef 100644 (file)
--- 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/