X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=44a74e99cdd5f360ca0802fe79764c70382125ee;hb=d7cafe5124fbfd96a9fa5a01f5a1904c9ccc4850;hp=dec07908024e7190bcc5f9158a8b7dbb2af4a23e;hpb=b1766d78d3b6c22cbc6fe63c512fb2b04bbda375;p=pve-common.git

diff --git a/Makefile b/Makefile
index dec0790..44a74e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,14 @@
-VERSION=5.0
-PKGREL=40
+include /usr/share/dpkg/pkg-info.mk
 
 PACKAGE=libpve-common-perl
 
 ARCH=all
-GITVERSION:=$(shell git rev-parse HEAD)
 
-BUILDDIR ?= build
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
 
-DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
-DSC=${PACKAGE}_${VERSION}-${PKGREL}.dsc
-TARGZ=${PACKAGE}_${VERSION}-${PKGREL}.tar.gz
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${ARCH}.deb
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
+TARGZ=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.tar.gz
 
 all:
 	${MAKE} -C src
@@ -19,10 +17,11 @@ all:
 dinstall: deb
 	dpkg -i ${DEB}
 
-${BUILDDIR}: src debian
-	rm -rf ${BUILDDIR}
-	rsync -a * ${BUILDDIR}
-	echo "git clone git://git.proxmox.com/git/pve-common.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
+${BUILDDIR}: src debian test
+	rm -rf ${BUILDDIR} ${BUILDDIR}.tmp; mkdir ${BUILDDIR}.tmp
+	cp -a -t ${BUILDDIR}.tmp $^ Makefile
+	echo "git clone git://git.proxmox.com/git/pve-common.git\\ngit checkout $(shell git rev-parse HEAD)" > ${BUILDDIR}.tmp/debian/SOURCE
+	mv ${BUILDDIR}.tmp ${BUILDDIR}
 
 .PHONY: deb
 deb: ${DEB}
@@ -39,7 +38,7 @@ ${DSC}: ${BUILDDIR}
 .PHONY: clean distclean
 distclean: clean
 clean:
-	rm -rf *~ *.deb *.changes ${BUILDDIR} *.buildinfo *.dsc *.tar.gz
+	rm -rf *~ *.deb *.changes ${PACKAGE}-*/ *.buildinfo *.dsc *.tar.gz
 
 .PHONY: check
 check:
@@ -51,5 +50,4 @@ install:
 
 .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 bullseye