X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=dc67e4c4433a9fb31ecf77fd8a72531de33c4f51;hb=5486a34abfe3476889f2250328c411562dfac1ef;hp=5f43a6d0053e07bb0fefc743851731a1a06febff;hpb=efe3113a40043d9ec8cf25dbfe74e5500e102c46;p=pve-common.git

diff --git a/Makefile b/Makefile
index 5f43a6d..dc67e4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,13 @@
-VERSION=5.0
-PKGREL=45
+include /usr/share/dpkg/pkg-info.mk
 
 PACKAGE=libpve-common-perl
 
 ARCH=all
 
-BUILDDIR ?= ${PACKAGE}-${VERSION}
+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
 
 all:
 	${MAKE} -C src
@@ -18,10 +16,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 $(shell git rev-parse HEAD)" > ${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}
@@ -30,15 +29,18 @@ ${DEB}: ${BUILDDIR}
 	lintian ${DEB}
 
 .PHONY: dsc
-dsc ${TARGZ}: ${DSC}
+dsc: ${DSC}
 ${DSC}: ${BUILDDIR}
-	cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d -nc
+	cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
 	lintian ${DSC}
 
+sbuild: $(DSC)
+	sbuild $(DSC)
+
 .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:
@@ -50,5 +52,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