Use libjs-jquery and libjs-jquery-ui instead of bundled ones

diff --git a/debian/control b/debian/control
index 04c2512aa59c83d0fd30462d54b3dd7809fa5d32..3b7bfceb59d7c635f9cf08a4d35878a917363340 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, 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 9ba49a94aad011187406d57a8d98e2ab2f7c46ed..8238ca7aa136dfe31b677b81eca64c6a24034253 100644 (file)
--- 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 \