From f109f52d0f562b0ccbd3d31fb0786c53b848eda7 Mon Sep 17 00:00:00 2001 From: Sven Velt Date: Wed, 26 Jan 2011 14:52:57 +0100 Subject: [PATCH] Use libjs-jquery and libjs-jquery-ui instead of bundled ones --- debian/control | 2 +- debian/rules | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 04c2512..3b7bfce 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, libfpdi-php, libkohana-php, adduser, ${shlibs:Depends}, ${misc:Depends} +Depends: rrdtool, librrds-perl, libapache2-mod-php5 | php5, php5-gd, libfpdi-php, libkohana-php, libjs-jquery, libjs-jquery-ui, 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 9ba49a9..8238ca7 100644 --- a/debian/rules +++ b/debian/rules @@ -125,6 +125,13 @@ install: build 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 + # Remove external JavaScript files: jQuery and jQuery-UI + rm $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/media/js/jquery-min.js + rm $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/media/js/jquery-ui.min.js + # Link them + dh_link /usr/share/javascript/jquery/jquery.min.js /usr/share/pnp4nagios/html/media/js/jquery-min.js + dh_link /usr/share/javascript/jquery-ui/jquery-ui.js /usr/share/pnp4nagios/html/media/js/jquery-ui.min.js + # Clean up some files rmdir $(CURDIR)/debian/pnp4nagios/usr/bin mv $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/check_commands/check_all_local_disks.cfg-sample \ -- 2.30.2