bump version to 0.9.4-2

[proxmox-backup.git] / Makefile

diff --git a/Makefile b/Makefile
index f8fade8ac08ab956b56070f54980275e86422710..949bd11180567031214ef895477cd40831eebae9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ $(SUBDIRS):
 test:
        #cargo test test_broadcast_future
        #cargo test $(CARGO_BUILD_ARGS)
-       #$(CARGO) test $(tests) $(CARGO_BUILD_ARGS)
+       $(CARGO) test $(tests) $(CARGO_BUILD_ARGS)
 
 doc:
        $(CARGO) doc --no-deps $(CARGO_BUILD_ARGS)
@@ -69,10 +69,12 @@ doc:
 .PHONY: build
 build:
        rm -rf build
+       rm -f debian/control
        debcargo package --config debian/debcargo.toml --changelog-ready --no-overlay-write-back --directory build proxmox-backup $(shell dpkg-parsechangelog -l debian/changelog -SVersion | sed -e 's/-.*//')
        sed -e '1,/^$$/ ! d' build/debian/control > build/debian/control.src
        cat build/debian/control.src build/debian/control.in > build/debian/control
        rm build/debian/control.in build/debian/control.src
+       cp build/debian/control debian/control
        rm build/Cargo.lock
        find build/debian -name "*.hint" -delete
        $(foreach i,$(SUBDIRS), \
@@ -80,18 +82,21 @@ build:
 
 
 .PHONY: proxmox-backup-docs
-proxmox-backup-docs: $(DOC_DEB)
-$(DOC_DEB): build
+$(DOC_DEB) $(DEBS): proxmox-backup-docs
+proxmox-backup-docs: build
        cd build; dpkg-buildpackage -b -us -uc --no-pre-clean
        lintian $(DOC_DEB)
 
 # copy the local target/ dir as a build-cache
 .PHONY: deb
-deb: $(DEBS)
-$(DEBS): build
+$(DEBS): deb
+deb: build
        cd build; dpkg-buildpackage -b -us -uc --no-pre-clean --build-profiles=nodoc
        lintian $(DEBS)
 
+.PHONY: deb-all
+deb-all: $(DOC_DEB) $(DEBS)
+
 .PHONY: dsc
 dsc: $(DSC)
 $(DSC): build
@@ -145,4 +150,4 @@ upload: ${SERVER_DEB} ${CLIENT_DEB} ${DOC_DEB}
        # check if working directory is clean
        git diff --exit-code --stat && git diff --exit-code --stat --staged
        tar cf - ${SERVER_DEB} ${SERVER_DBG_DEB} ${DOC_DEB} | ssh -X repoman@repo.proxmox.com upload --product pbs --dist buster
-       tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pbs,pve" --dist buster
+       tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pbs,pve,pmg" --dist buster