[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.0_beta-1-3-g1edf848

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 1edf8480a791fee096a21407138b1fd7fb6fd6e7
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Nov 27 10:44:02 2011 +0100

    Cleanup javascript

diff --git a/debian/control b/debian/control
index e87e1a6..186cf99 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Description: host and network monitoring system - support files
 
 Package: icinga-cgi
 Architecture: any
-Depends: icinga-common (= ${source:Version}), coreutils (>= 4.5.3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, adduser, libjs-scriptaculous, libjs-prototype
+Depends: icinga-common (= ${source:Version}), coreutils (>= 4.5.3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, adduser, libjs-jquery
 Recommends: apache2 | httpd, nagios-images (>> 0.1)
 Description: host and network monitoring system - CGI scripts
  Icinga is a modular monitoring framework for hosts, services, and
diff --git a/debian/icinga-cgi.links b/debian/icinga-cgi.links
index ba8bbf5..7ba2495 100644
--- a/debian/icinga-cgi.links
+++ b/debian/icinga-cgi.links
@@ -1,7 +1 @@
-usr/share/javascript/mootools/mootools.js usr/share/icinga/htdocs/js/mootools.js
-usr/share/javascript/mootools/mootools-more.js usr/share/icinga/htdocs/js/mootools-more.js
-usr/share/javascript/prototype/prototype.js usr/share/icinga/htdocs/js/prototype.js
-usr/share/javascript/scriptaculous/scriptaculous.js usr/share/icinga/htdocs/js/scriptaculous.js
-usr/share/javascript/scriptaculous/builder.js usr/share/icinga/htdocs/js/builder.js
-usr/share/javascript/scriptaculous/slider.js usr/share/icinga/htdocs/js/slider.js
-usr/share/javascript/scriptaculous/dragdrop.js usr/share/icinga/htdocs/js/dragdrop.js
+usr/share/javascript/jquery/jquery.min.js usr/share/icinga/htdocs/js/jquery-1.6.2.min.js
diff --git a/debian/rules b/debian/rules
index 0ee4a2a..7417b64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,6 +149,7 @@ install-stamp: build-stamp fix-configs-stamp
 	chown root:www-data ${b}/icinga-common/var/lib/icinga/rw
 	chmod 700 ${b}/icinga-common/var/lib/icinga/rw
 	dh_install           -i
+	rm ${b}/tmp/usr/share/icinga/htdocs/js/jquery-1.6.2.min.js
 	rm ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/*.in
 	chmod +x ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/* ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/distributed-monitoring/* ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/redundancy-scenario1/*
 	# we use the versions in debian

-- 
debian packaging of icinga(-core)