[Pkg-nagios-changes] [pkg-nagios3] 03/04: Remove minified jquery versions and use packaged jquery

Alexander Wirt formorer at debian.org
Sun Oct 5 07:10:24 UTC 2014


This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-nagios3.

commit 848ee55dc0c1411bf16e982e29911fcae6903ddf
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Aug 30 11:24:10 2014 -0700

    Remove minified jquery versions and use packaged jquery
    
    Closes: #759189
---
 debian/control                   |  1 +
 debian/nagios3-cgi.links         |  2 ++
 debian/patches/remove_javascript | 19 +++++++++++++++++++
 debian/patches/series            |  1 +
 4 files changed, 23 insertions(+)

diff --git a/debian/control b/debian/control
index 67bb193..6c9aebd 100644
--- a/debian/control
+++ b/debian/control
@@ -63,6 +63,7 @@ Depends: adduser,
          apache2-utils,
          coreutils (>= 4.5.3),
          libapache2-mod-php5 | php5 | php5-cgi,
+         libjs-jquery,
          nagios3-common (= ${source:Version}),
          ucf (>= 0.28),
          ${misc:Depends},
diff --git a/debian/nagios3-cgi.links b/debian/nagios3-cgi.links
index 9f7a836..26707f5 100644
--- a/debian/nagios3-cgi.links
+++ b/debian/nagios3-cgi.links
@@ -1,2 +1,4 @@
 usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/js/jquery-1.7.1.min.js
 etc/nagios3/apache2.conf etc/apache2/conf-available/nagios3.conf
+usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/includes/jquery-1.7.1.min.js
+usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/js/jquery-1.7.1.min.js
diff --git a/debian/patches/remove_javascript b/debian/patches/remove_javascript
new file mode 100644
index 0000000..8808584
--- /dev/null
+++ b/debian/patches/remove_javascript
@@ -0,0 +1,19 @@
+--- a/html/Makefile.in
++++ b/html/Makefile.in
+@@ -26,7 +26,6 @@
+ 	rm -f docs/*~
+ 	rm -f docs/images/*.jbf
+ 	rm -f stylesheets/*~
+-	rm -f js/*~
+ 
+ distclean: clean
+ 	rm -f Makefile config.inc.php
+@@ -61,8 +60,6 @@
+ 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ 	for file in contexthelp/*.html; \
+ 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+-	for file in js/*.js; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
+ #	for file in docs/*.html; \
+ #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ #	for file in docs/images/*.*; \
diff --git a/debian/patches/series b/debian/patches/series
index c450238..4f4fe8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+remove_javascript
 10_p1_pl_shebang.patch
 40_fix_spurious_dollar_signs_added_to_command_lines.patch
 50_cgi.cfg-debianize.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios3.git



More information about the Pkg-nagios-changes mailing list