bump version to 1.5-1

[ksm-control-daemon.git] / Makefile

diff --git a/Makefile b/Makefile
index 7574e1c48222bce98860846fd6371b9648b8d81a..52a0fbf7c83d9b80b9a09394d87bc5867de61af3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,10 @@
-RELEASE=3.0
+include /usr/share/dpkg/default.mk
 
 PACKAGE=ksm-control-daemon
 
-# also update debian/changelog
-PKGVER=1.1
-PKGREL=1
+KSM_DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
-KSM_DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb
-
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 all: ${KSM_DEB}
 
@@ -17,7 +13,7 @@ ${KSM_DEB} ksm: ksm-control-scripts.org/ksm.init
        rsync -a --exclude .git ksm-control-scripts.org/ ksm-control-scripts
        cp -a debian ksm-control-scripts
        echo "git clone git://git.proxmox.com/git/ksm-control-daemon.git\\ngit checkout ${GITVERSION}" > ksm-control-scripts/debian/SOURCE
-       cd ksm-control-scripts; dpkg-buildpackage -b -rfakeroot -us -uc
+       cd ksm-control-scripts; dpkg-buildpackage -b -us -uc
        lintian ${KSM_DEB} || true
 
 .PHONY: download
@@ -31,14 +27,9 @@ ksm-control-scripts.org/ksm.init: ksm-control-scripts.org.tar.gz
        touch $@
 
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: ${KSM_DEB}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -rf /pve/${RELEASE}/extra/Packages*
-       rm -rf /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       cp ${KSM_DEB} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+       tar cf - ${KSM_DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist ${UPLOAD_DIST}
 
 .PHONY: distclean
 distclean: clean
@@ -48,6 +39,9 @@ distclean: clean
 clean:
        rm -rf *~ ksm-control-scripts ${PACKAGE}_*
 
+.PHONY: deb
+deb: ${KSM_DEB}
+
 .PHONY: dinstall
 dinstall: ${KSM_DEB}
        dpkg -i ${KSM_DEB}