override Ext.Components 'validIdRe' to include '@'

[proxmox-widget-toolkit.git] / Makefile

diff --git a/Makefile b/Makefile
index effeca771c92e80735e85b7323de1ee3f8152511..d12a4dacb69fcd9ac62ff8f608c7129612ecb15b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
+include /usr/share/dpkg/pkg-info.mk
+
 PACKAGE=proxmox-widget-toolkit
-PKGVER=1.0
-PKGREL=28
 
-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,6 +34,7 @@ JSSRC=                                        \
        form/ComboGrid.js               \
        form/RRDTypeSelector.js         \
        form/BondModeSelector.js        \
+       form/NetworkSelector.js         \
        button/Button.js                \
        button/HelpButton.js            \
        grid/ObjectGrid.js              \
@@ -73,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
@@ -82,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 $@
 
@@ -92,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 {} ';'