bump version to 3.3.0

[spiceterm.git] / Makefile

diff --git a/Makefile b/Makefile
index 249c5d27d2097667a38be0e7716d93e0a03b1c1d..b8b513fd4dadfc68ccf20dec6a048cd0e3dbe103 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ PACKAGE=spiceterm
 GITVERSION:=$(shell cat .git/refs/heads/master)
 BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
-DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
+DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
 DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
 $(BUILDDIR): src/ debian/
@@ -16,10 +16,15 @@ $(BUILDDIR): src/ debian/
        echo "git clone git://git.proxmox.com/git/spiceterm.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
 
 .PHONY: dsc
-dsc: $(DSC)
+dsc: clean
+       $(MAKE) $(DSC)
+       lintian $(DSC)
+
 $(DSC): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
-       lintian $(DSC)
+
+sbuild: $(DSC)
+       sbuild $<
 
 .PHONY: deb
 deb: $(DEB)
@@ -32,10 +37,12 @@ dinstall: $(DEB)
        dpkg -i $(DEB)
 
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEB)
-       tar cf - $(DEB) $(DBG_DEB) | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(ARCH)
+       tar cf - $(DEB) $(DBG_DEB) | ssh repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST) --arch $(DEB_HOST_ARCH)
 
 .PHONY: distclean clean
 distclean: clean
 clean:
-       rm -rf *~ $(PACKAGE)-*/ *.deb *.changes genfont *.buildinfo *.dsc *.tar.gz
+       $(MAKE) -C src $@
+       rm -rf *~ $(PACKAGE)-*/ $(PACKAGE)*.tar* *.deb *.dsc *.changes *.build *.buildinfo