X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=a1068ae6b10c0ce4f81378c59f77e23bd7c6d899;hb=d8e99ec84385928c8502d14ce6e7fd41a386ce42;hp=bb551e2fdcdf56ca249d6b56ca509aa9bd3d9666;hpb=07e2d38ce8ffcea6f39fd1e51541f914d05138a5;p=pve-sheepdog.git

diff --git a/Makefile b/Makefile
index bb551e2..a1068ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
-RELEASE=2.1
+RELEASE=4.2
 
 PACKAGE=pve-sheepdog
-PKGREL=6
-SDVER=0.4.0
+PKGREL=1
+SDVER=1.0.0
 
-DEB=${PACKAGE}_${SDVER}-${PKGREL}_amd64.deb
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell cat .git/refs/heads/master)
+
+DEB=${PACKAGE}_${SDVER}-${PKGREL}_${ARCH}.deb
 
 SDDIR=sheepdog-${SDVER}
 SDSRC=${SDDIR}.tar.gz
@@ -14,29 +17,22 @@ all: ${DEB}
 ${DEB} deb: ${SDSRC}
 	rm -rf ${SDDIR}
 	tar xf ${SDSRC}
+	mv ${SDDIR}/debian ${SDDIR}/debian.org
 	cp -av debian ${SDDIR}/debian
+	echo "git clone git://git.proxmox.com/git/pve-sheepdog.git\\ngit checkout ${GITVERSION}" > ${SDDIR}/debian/SOURCE
 	cd ${SDDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
-	lintian ${DEB}
+	lintian -X copyright-file ${DEB}
 
 .PHONY: download
 ${SDSRC} download:
 	rm -rf ${SDDIR} sheepdog.git
-	git clone git://github.com/collie/sheepdog.git sheepdog.git
-	#cd sheepdog.git; git checkout -b local v${SDVER}
-	rsync -a --exclude .git --exclude .gitignore sheepdog.git/ ${SDDIR} 
-	tar czf ${SDSRC}.tmp  ${SDDIR}
-	rm -rf ${SDDIR}
+	git clone git://github.com/sheepdog/sheepdog.git -b v1.0 sheepdog.git
+	cd sheepdog.git; git archive --format=tar.gz -o ../${SDSRC}.tmp v1.0 --prefix=${SDDIR}/
 	mv ${SDSRC}.tmp ${SDSRC}
 
 .PHONY: upload
 upload: ${DEB}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/pve-sheepdog*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+	tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist jessie
 
 clean:
 distclean: clean