X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=d12a4dacb69fcd9ac62ff8f608c7129612ecb15b;hb=61e428c29d0b551da06e286667f08c7b1a31befa;hp=647485ad1009ca8d8e94e6d5976ff02dd6d67aab;hpb=f2a630d4c6f7c8590ce491e5ab22988214fd5e11;p=proxmox-widget-toolkit.git

diff --git a/Makefile b/Makefile
index 647485a..d12a4da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
+include /usr/share/dpkg/pkg-info.mk
+
 PACKAGE=proxmox-widget-toolkit
-PKGVER=1.0
-PKGREL=24
 
-BUILDDIR ?= ${PACKAGE}-${PKGVER}
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
 GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
-DSC=${PACKAGE}_${PKGVER}-${PKGREL}.dsc
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
 DESTDIR=
 
@@ -34,12 +34,14 @@ JSSRC=					\
 	form/ComboGrid.js		\
 	form/RRDTypeSelector.js		\
 	form/BondModeSelector.js	\
+	form/NetworkSelector.js		\
 	button/Button.js		\
 	button/HelpButton.js		\
 	grid/ObjectGrid.js		\
 	grid/PendingObjectGrid.js	\
 	panel/InputPanel.js		\
 	panel/LogView.js		\
+	panel/JournalView.js		\
 	panel/RRDChart.js		\
 	panel/GaugeWidget.js		\
 	window/Edit.js			\
@@ -72,7 +74,7 @@ ${DEB}: ${BUILDDIR}
 .PHONY: dsc
 dsc: ${DSC}
 ${DSC}: ${BUILDDIR}
-	cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d -nc
+	cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
 	lintian ${DSC}
 
 .PHONY: lint
@@ -81,7 +83,7 @@ lint: ${JSSRC}
 
 proxmoxlib.js: ${JSSRC}
 	# add the version as comment in the file
-	echo "// ${PKGVER}-${PKGREL}" > $@.tmp
+	echo "// ${DEB_VERSION_UPSTREAM_REVISION}" > $@.tmp
 	cat ${JSSRC} >> $@.tmp
 	mv $@.tmp $@
 
@@ -91,10 +93,9 @@ install: proxmoxlib.js
 
 .PHONY: upload
 upload: ${DEB}
-	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch
+	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster
 
 distclean: clean
-
 clean:
 	rm -rf ${BUILDDIR} *.tar.gz *.dsc *.deb *.changes *.buildinfo proxmoxlib.js
 	find . -name '*~' -exec rm {} ';'