bump version to 5.0.7

[pve-firewall.git] / Makefile

diff --git a/Makefile b/Makefile
index 4640c016335fff8d3ba52da1190e617da57d8ee7..e5d16341605cd32a0b9aa9ece3310db32fceedb1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,19 @@ include /usr/share/dpkg/architecture.mk
 
 PACKAGE=pve-firewall
 
-BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION)
 GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
-DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
-DEB2=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
+DSC=$(PACKAGE)_$(DEB_VERSION).dsc
+DEB2=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
 DEBS=$(DEB) $(DEB2)
 
 all: $(DEBS)
 
 .PHONY: dinstall
-dinstall: deb
-       dpkg -i $(DEBS)
+dinstall: $(DEB)
+       dpkg -i $<
 
 $(BUILDDIR):
        rm -rf $(BUILDDIR)
@@ -25,17 +25,22 @@ $(BUILDDIR):
 .PHONY: deb
 deb: $(DEBS)
 $(DEB2): $(DEB)
-$(DEB): $(BUILDDIR) check
+$(DEB): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
        lintian $(DEBS)
 
 .PHONY: dsc
-dsc: $(DSC)
+dsc:
+       rm -rf $(DSC) $(BUILDDIR)
+       $(MAKE) $(DSC)
+       lintian $(DSC)
+
 $(DSC): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
-       lintian $(DSC)
 
-.PHONY: check
+sbuild: $(DSC)
+       sbuild $(DSC)
+
 check:
        make -C test check
 
@@ -47,5 +52,6 @@ clean:
        rm -rf *.deb *.dsc *.changes *.build *.buildinfo $(PACKAGE)-[0-9]*/ $(PACKAGE)*.tar*
 
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEBS)
-       tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(DEB_BUILD_ARCH)
+       tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)