[Pkg-nagios-changes] [icinga] 17/19: Add patch to not install minified JS, excluded from upstream source.

Bas Couwenberg sebastic at debian.org
Mon Jan 1 19:33:09 UTC 2018


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

sebastic pushed a commit to branch experimental
in repository icinga.

commit 065386034fbcbdd5da2babe873aba3729a4c935b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 1 20:15:13 2018 +0100

    Add patch to not install minified JS, excluded from upstream source.
---
 debian/changelog                                 |  1 +
 debian/patches/54_dont-install-minified-js.patch | 23 +++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4bc58b9..f0021ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ icinga (1.14.2+ds-1) UNRELEASED; urgency=medium
   * Update jquery file patterns in copyright file.
   * Update spelling-errors.patch to fix 'triggered' typo.
   * Exclude minified jquery-ui & jshint files from repacked upstream tarball.
+  * Add patch to not install minified JS, excluded from upstream source.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 01 Jan 2018 20:05:12 +0100
 
diff --git a/debian/patches/54_dont-install-minified-js.patch b/debian/patches/54_dont-install-minified-js.patch
new file mode 100644
index 0000000..15e642b
--- /dev/null
+++ b/debian/patches/54_dont-install-minified-js.patch
@@ -0,0 +1,23 @@
+Description: Don't installed minified JS, excluded from repacked upstream tarball.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/html/Makefile.in
++++ b/html/Makefile.in
+@@ -56,7 +56,6 @@ install:
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base/images
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(HTMLDIR)/jquery-ui/ui
+-	$(INSTALL) -m 775 -d $(DESTDIR)$(HTMLDIR)/jquery-ui/ui/minified
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(HTMLDIR)/jquery-ui-addon
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(HTMLDIR)/js
+ 	$(INSTALL) -m 775 -d $(DESTDIR)$(HTMLDIR)/ssi
+@@ -100,8 +99,6 @@ install:
+ 	do $(INSTALL) -m 664 $$file $(DESTDIR)$(HTMLDIR)/images/logos/other; done
+ 	for file in images/logos/vendors/*.*; \
+ 	do $(INSTALL) -m 664 $$file $(DESTDIR)$(HTMLDIR)/images/logos/vendors; done
+-	for file in jquery-ui/ui/minified/*.js; \
+-	do $(INSTALL) -m 664 $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/ui/minified; done
+ 	for file in jquery-ui/themes/base/*.css; \
+ 	do $(INSTALL) -m 664 $$file $(DESTDIR)$(HTMLDIR)/jquery-ui/themes/base; done
+ 	for file in jquery-ui/themes/base/images/*.png; \
diff --git a/debian/patches/series b/debian/patches/series
index 64aedaa..32c73ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 95_fix_db_upgrade.patch
 spelling-errors.patch
 53_jquery-ui.patch
+54_dont-install-minified-js.patch

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



More information about the Pkg-nagios-changes mailing list