[pve-devel] [PATCH novnc 2/3] upgrade novnc

[Dominik Csapak]

upgrade to novnc commit
901a425a4f6fa58dde00a9a24de01209dc3b8dbf

we need some changes to the Makefile and the debian/rules file
the latter just copies vnc.html to index.html.tpl
and changes the path in an autogenerated js file
(we do this because the tool for generating this file from source
is only available on npm, which has no package on stretch anymore)

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 Makefile              |  9 +++------
 debian/changelog      |  6 ++++++
 debian/install        | 30 +++++++-----------------------
 debian/patches/series | 14 +++++++++-----
 debian/rules          |  6 ++++++
 5 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/Makefile b/Makefile
index cbd7ccb..eb61f99 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 PACKAGE=novnc-pve
-PKGREL=9
+PKGREL=1
 
 NOVNCDIR=novnc
 NOVNCSRC=${NOVNCDIR}.tgz
-NOVNCVER=0.5
+NOVNCVER=0.6
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
@@ -22,10 +22,7 @@ ${DEB}: ${TARSRC}
 	rm -rf ${NOVNCDIR}
 	tar xf ${NOVNCSRC}
 	cp -a debian ${NOVNCDIR}/debian
-	cp ${NOVNCDIR}/include/ui.js ${NOVNCDIR}/pveui.js
 	cp ${NOVNCDIR}/vnc.html ${NOVNCDIR}/index.html.tpl
-	# fix file permissions
-	chmod 0644 ${NOVNCDIR}/include/jsunzip.js
 	echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout ${GITVERSION}" > ${NOVNCDIR}/debian/SOURCE
 	cd ${NOVNCDIR}; dpkg-buildpackage -b -uc -us
 	lintian ${DEB}
@@ -34,7 +31,7 @@ ${DEB}: ${TARSRC}
 download:
 	rm -rf ${NOVNCDIR}
 	git clone git://github.com/kanaka/noVNC ${NOVNCDIR}
-	cd ${NOVNCDIR}; git checkout -b local a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a
+	cd ${NOVNCDIR}; git checkout -b local 901a425a4f6fa58dde00a9a24de01209dc3b8dbf
 	tar czf ${NOVNCSRC} ${NOVNCDIR}
 
 .PHONY: upload
diff --git a/debian/changelog b/debian/changelog
index c5ad353..c17a953 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+novnc-pve (0.6-1) unstable; urgency=medium
+
+  * update to novnc commit 901a425a4f6fa58dde00a9a24de01209dc3b8dbf
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 11 May 2017 13:29:38 +0200
+
 novnc-pve (0.5-9) unstable; urgency=medium
 
   * version bump for debian stretch - to make room for jessie updates
diff --git a/debian/install b/debian/install
index e272398..04decda 100644
--- a/debian/install
+++ b/debian/install
@@ -1,23 +1,7 @@
-pveui.js		/usr/share/novnc-pve/include
-images  		/usr/share/novnc-pve
-include/base64.js   	/usr/share/novnc-pve/include
-include/des.js  	/usr/share/novnc-pve/include
-include/display.js  	/usr/share/novnc-pve/include
-include/keysymdef.js   	/usr/share/novnc-pve/include
-include/keyboard.js   	/usr/share/novnc-pve/include
-include/input.js   	/usr/share/novnc-pve/include
-include/logo.js   	/usr/share/novnc-pve/include
-include/base.css   	/usr/share/novnc-pve/include
-include/blue.css   	/usr/share/novnc-pve/include
-include/black.css   	/usr/share/novnc-pve/include
-include/playback.js   	/usr/share/novnc-pve/include
-include/rfb.js   	/usr/share/novnc-pve/include
-include/util.js   	/usr/share/novnc-pve/include
-include/websock.js   	/usr/share/novnc-pve/include
-include/webutil.js   	/usr/share/novnc-pve/include
-include/jsunzip.js   	/usr/share/novnc-pve/include
-include/Orbitron700.ttf	/usr/share/novnc-pve/include
-include/Orbitron700.woff /usr/share/novnc-pve/include
-include/keysym.js	/usr/share/novnc-pve/include
-include/inflator.js    /usr/share/novnc-pve/include
-index.html.tpl		/usr/share/novnc-pve
+app usr/share/novnc-pve
+core usr/share/novnc-pve
+docs usr/share/novnc-pve
+po usr/share/novnc-pve
+utils usr/share/novnc-pve
+vendor usr/share/novnc-pve
+index.html.tpl	usr/share/novnc-pve
diff --git a/debian/patches/series b/debian/patches/series
index ad0f372..f528c37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,9 @@
-customize-html-tpl.diff
-pveui.patch
-fix-base-css.patch
-fix-ie11-resize.patch
-fix-CtrlAltDel-button-mobile.patch
+0001-add-pve-specific-js-code.patch
+0002-change-scaling-when-toggling-fullscreen.patch
+0003-add-pve-style.patch
+0004-remove-vnc-logos.patch
+0005-change-src-directory-for-images-js-files.patch
+0006-add-pve-vnc-commands.patch
+0007-add-replaceable-snippets-in-vnc.html.patch
+0008-focus-canvas-after-load.patch
+0009-decrease-animation-time.patch
diff --git a/debian/rules b/debian/rules
index d01686c..a19002e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,11 @@
 
 export DEB_BUILD_HARDENING=1
 
+override_dh_install:
+	mv vnc.html index.html.tpl
+	# change the directory to /nonvnc/vendor
+	cd vendor/browser-es-module-loader/dist; sed -i "s|vendor/|/novnc/vendor/|" *
+	dh_install
+
 %:
 	dh ${@} --with quilt
-- 
2.11.0