revert novnc.tar.gz to 8f3c0f6b9b5e5c23a7dc7e90bd22901017ab4fc7

[novnc-pve.git] / Makefile

diff --git a/Makefile b/Makefile
index a59660bc431a9c46a8e63aa5e6e843b36e4f84ef..ed93a664c0172d1cca99b65c61c111101ce2dc68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
-RELEASE=3.2
+RELEASE=4.0
 
 PACKAGE=novnc-pve
-PKGREL=1
+PKGREL=3
 
 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)
 
 DEB=${PACKAGE}_${NOVNCVER}-${PKGREL}_${ARCH}.deb
 
@@ -21,8 +22,11 @@ dinstall: deb
 deb ${DEB}: ${TARSRC}
        rm -rf ${NOVNCDIR}
        tar xf ${NOVNCSRC}
-       mv ${NOVNCDIR}/debian ${NOVNCDIR}/debian.org
-       cp -a debian ${NOVNCDIR}/debian 
+       cp -a debian ${NOVNCDIR}/debian
+       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
        cd ${NOVNCDIR}; dpkg-buildpackage -b -uc -us
        lintian ${DEB}
 
@@ -30,8 +34,22 @@ deb ${DEB}: ${TARSRC}
 download:
        rm -rf ${NOVNCDIR}
        git clone git://github.com/kanaka/noVNC ${NOVNCDIR}
+       cd ${NOVNCDIR}; git checkout -b local 8f3c0f6b9b5e5c23a7dc7e90bd22901017ab4fc7
        tar czf ${NOVNCSRC} ${NOVNCDIR}
 
+.PHONY: upload
+upload: ${DEB}
+       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
+       mkdir -p /pve/${RELEASE}/extra
+       rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
+       rm -f /pve/${RELEASE}/extra/Packages*
+       cp ${DEB} /pve/${RELEASE}/extra
+       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
+       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+
+.PHONY: distclean
+distclean: clean
+
 .PHONY: clean
 clean:
        rm -rf *~ debian/*~ *_${ARCH}.deb *_all.deb *.changes *.dsc novnc