X-Git-Url: https://git.proxmox.com/?p=novnc-pve.git;a=blobdiff_plain;f=Makefile;h=49890a07ffa91b870bc60845104a763f765f7544;hp=5f732b84d5efbaa1937b4edaf7b80e94e174fbba;hb=HEAD;hpb=3e9e694e9735faa1d0fec3ded6ebd9fb9efc612b

diff --git a/Makefile b/Makefile
index 5f732b8..431dff9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,64 @@
+include /usr/share/dpkg/default.mk
+
 PACKAGE=novnc-pve
-VER=0.6
-PKGREL=3
 
 SRCDIR=novnc
+BUILDDIR=$(SRCDIR).tmp
+ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+
+GITVERSION:=$(shell git rev-parse HEAD)
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
+DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
-DEB=${PACKAGE}_${VER}-${PKGREL}_${ARCH}.deb
+all:
 
-all: ${DEB}
-	@echo ${DEB}
+$(SRCDIR)/vnc.html: submodule
+$(BUILDDIR): $(SRCDIR)/vnc.html
+	rm -rf $(BUILDDIR)
+	cp -rpa $(SRCDIR) $(BUILDDIR)
+	cp -a debian $(BUILDDIR)
+	echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
 
 .PHONY: deb
-deb: ${DEB}
-${DEB}: | submodule
-	rm -rf ${SRCDIR}.tmp
-	cp -rpa ${SRCDIR} ${SRCDIR}.tmp
-	cp -a debian ${SRCDIR}.tmp/
-	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}
-	@echo ${DEB}
+deb: $(DEB)
+$(DEB): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -b -uc -us
+	lintian $(DEB)
+	@echo $(DEB)
+
+$(ORIG_SRC_TAR): $(BUILDDIR)
+	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
+
+.PHONY: dsc
+dsc: $(DSC)
+$(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -S -uc -us -d
+	lintian $(DSC)
+
+sbuild: $(DSC)
+	sbuild $(DSC)
 
 .PHONY: submodule
 submodule:
-	test -f "${SRCDIR}/vnc.html" || git submodule update --init
+	test -f "$(SRCDIR)/package.json" || git submodule update --init
 
 .PHONY: download
-download ${SRCDIR}:
+download $(SRCDIR):
 	git submodule foreach 'git pull --ff-only origin master'
 
 .PHONY: upload
-upload: ${DEB}
-	tar cf - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist stretch
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEB)
+	tar cf - $(DEB)|ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist $(UPLOAD_DIST)
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ debian/*~ *_${ARCH}.deb ${SRCDIR}.tmp *_all.deb *.changes *.dsc *.buildinfo
+	rm -rf $(PACKAGE)-[0-9]*/ $() *.deb *.dsc $(PACKAGE)*.tar.[gx]z *.changes *.dsc *.buildinfo *.build
 
 .PHONY: dinstall
 dinstall: deb
-	dpkg -i ${DEB}
+	dpkg -i $(DEB)