[pkg-nagios-changes] [Git][nagios-team/pkg-icingaweb2][experimental] 2 commits: Use uglifyjs instead of node-uglify.

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian Nagios Maintainer Group / pkg-icingaweb2


Commits:
7424c525 by Bas Couwenberg at 2020-04-18T21:13:39+02:00
Use uglifyjs instead of node-uglify.

- - - - -
956a8694 by Bas Couwenberg at 2020-04-18T21:13:40+02:00
Set distribution to experimental.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/uglify/Makefile


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,10 @@
-icingaweb2 (2.8.0~rc1-1~exp2) UNRELEASED; urgency=medium
+icingaweb2 (2.8.0~rc1-1~exp2) experimental; urgency=medium
 
+  * Team upload.
   * Recommend nagios-images for icon images.
+  * Use uglifyjs instead of node-uglify.
 
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 20 Mar 2020 07:58:09 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 18 Apr 2020 20:11:31 +0200
 
 icingaweb2 (2.8.0~rc1-1~exp1) experimental; urgency=medium
 


=====================================
debian/control
=====================================
@@ -6,8 +6,8 @@ Priority: optional
 Build-Depends: bash-completion,
                debhelper-compat (= 12),
                php-cli,
-               node-uglify (>= 2) | yui-compressor,
-               node-source-map | yui-compressor
+               node-source-map | yui-compressor,
+               uglifyjs | yui-compressor
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-icingaweb2
 Vcs-Git: https://salsa.debian.org/nagios-team/pkg-icingaweb2.git -b experimental


=====================================
debian/uglify/Makefile
=====================================
@@ -26,11 +26,13 @@ ifdef CAN_UGLIFYJS
 	uglifyjs \
 	  $(UGLIFY_OPTS) \
 	  -o $@ \
-	  --source-map $(map) \
-	  --source-map-url $(map) -- $<
+	  --source-map \
+	  -- $<
 	#  --preamble "$$(cat $<.head)" \
 	# Add explicit newline (https://github.com/Icinga/icingaweb2/issues/2156)
 	echo >> $@
+	mv $@.map $(map)
+	echo "//# sourceMappingURL=$(map)" >> $@
 else
 	yui-compressor $< -o $@
 endif



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/-/compare/feaf788692ff29f52ca7f289f65027ea78d033df...956a869444fdb57df78227faa3005c8b410cf5b6

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/-/compare/feaf788692ff29f52ca7f289f65027ea78d033df...956a869444fdb57df78227faa3005c8b410cf5b6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20200418/2c812edb/attachment-0001.html>