remove unnecessary 6px addition

[novnc-pve.git] / Makefile

diff --git a/Makefile b/Makefile
index aeb7d7184fe5a82d5488964148fa2fe122ff9de6..02b48b57da4ef8fc348ea50fe22710128444fd25 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-RELEASE=4.0
+RELEASE=4.1
 
 PACKAGE=novnc-pve
-PKGREL=7
+PKGREL=6
 
 NOVNCDIR=novnc
 NOVNCSRC=${NOVNCDIR}.tgz
-NOVNCVER=0.4
+NOVNCVER=0.5
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
@@ -22,9 +22,8 @@ dinstall: deb
 deb ${DEB}: ${TARSRC}
        rm -rf ${NOVNCDIR}
        tar xf ${NOVNCSRC}
-       mv ${NOVNCDIR}/debian ${NOVNCDIR}/debian.org
        cp -a debian ${NOVNCDIR}/debian
-       cp pveui.js ${NOVNCDIR}
+       cp ${NOVNCDIR}/include/ui.js ${NOVNCDIR}/pveui.js
        # 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
@@ -35,6 +34,7 @@ deb ${DEB}: ${TARSRC}
 download:
        rm -rf ${NOVNCDIR}
        git clone git://github.com/kanaka/noVNC ${NOVNCDIR}
+       cd ${NOVNCDIR}; git checkout -b local a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a
        tar czf ${NOVNCSRC} ${NOVNCDIR}
 
 .PHONY: upload