[pve-devel] [PATCH novnc v2 4/7] upgrade novnc to commit b0061a3c49dc25a71f7b0a9a1f31a8befe787cb4

[Dominik Csapak]

novnc changed quiet a bit, so we have to update
the Makefile, add a line to the debian rules file, and
to adjust the install file

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 Makefile              |  8 ++------
 debian/changelog      |  6 ++++++
 debian/install        | 30 +++++++-----------------------
 debian/patches/series | 14 +++++++++-----
 debian/rules          |  4 ++++
 novnc                 |  2 +-
 6 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index 711e06f..4ac049f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE=novnc-pve
-VER=0.5
-PKGREL=9
+VER=0.6
+PKGREL=1
 
 SRCDIR=novnc
 
@@ -18,10 +18,6 @@ ${DEB}: | submodule
 	rm -rf ${SRCDIR}.tmp
 	cp -rpa ${SRCDIR} ${SRCDIR}.tmp
 	cp -a debian ${SRCDIR}.tmp/debian
-	cp ${SRCDIR}.tmp/include/ui.js ${SRCDIR}.tmp/pveui.js
-	cp ${SRCDIR}.tmp/vnc.html ${SRCDIR}.tmp/index.html.tpl
-	# fix file permissions
-	chmod 0644 ${SRCDIR}.tmp/include/jsunzip.js
 	echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout ${GITVERSION}" > ${SRCDIR}.tmp/debian/SOURCE
 	cd ${SRCDIR}.tmp; dpkg-buildpackage -rfakeroot -b -uc -us
 	lintian ${DEB}
diff --git a/debian/changelog b/debian/changelog
index c5ad353..ff3ba81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+novnc-pve (0.6-1) unstable; urgency=medium
+
+  * update novnc to commit b0061a3c49dc25a71f7b0a9a1f31a8befe787cb4
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 15 May 2017 15:42:15 +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..37f355f 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..169ef3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,5 +5,9 @@
 
 export DEB_BUILD_HARDENING=1
 
+override_dh_install:
+	cp vnc.html index.html.tpl
+	dh_install
+
 %:
 	dh ${@} --with quilt
diff --git a/novnc b/novnc
index a0e7ab4..b0061a3 160000
--- a/novnc
+++ b/novnc
@@ -1 +1 @@
-Subproject commit a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a
+Subproject commit b0061a3c49dc25a71f7b0a9a1f31a8befe787cb4
-- 
2.11.0