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

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 914bc33e9623dac87187bf2d08229c4dab2b2ffe
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue May 7 09:02:22 2013 +0200

    Use debians jquery-ui and fix timepicker locations

diff --git a/debian/control b/debian/control
index b62ec6f..abd95ac 100644
--- a/debian/control
+++ b/debian/control
@@ -53,6 +53,7 @@ Depends: adduser,
          coreutils (>= 4.5.3),
          icinga-common (= ${source:Version}),
          libjs-jquery (>= 1.4.2-2~),
+         libjs-jquery-ui,
          ucf (>= 0.28),
          ${misc:Depends},
          ${perl:Depends},
diff --git a/debian/icinga-cgi.install b/debian/icinga-cgi.install
index 294497c..b8658a8 100644
--- a/debian/icinga-cgi.install
+++ b/debian/icinga-cgi.install
@@ -2,7 +2,7 @@ debian-configs/cgi.cfg /etc/icinga
 debian/httpd.webapps-common /usr/share/icinga/debian
 usr/lib/cgi-bin/*
 usr/share/icinga/htdocs/*.html
-usr/share/icinga/htdocs/jquery-ui
+usr/share/icinga/htdocs/jquery-ui-addon
 usr/share/icinga/htdocs/images
 usr/share/icinga/htdocs/js/*
 usr/share/icinga/htdocs/media
diff --git a/debian/rules b/debian/rules
index e624318..97ef46e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -164,6 +164,7 @@ install-stamp: build-stamp fix-configs-stamp
 	chmod 700 ${b}/icinga-common/var/lib/icinga/rw
 	dh_install           -i
 	rm ${b}/tmp/usr/share/icinga/htdocs/js/jquery-1.8.0.min.js
+	rm -R ${b}/tmp/usr/share/icinga/htdocs/jquery-ui
 	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)