[pve-devel] [PATCH] bump to 0.6.2

[Alexandre Derumier]

(a 0.7 branch exist, but according to sheepdog devs, they will follow qemu releases each 3 month)

sheepdog 0.7 - qemu 1.6
sheepdog 0.8 - qemu 1.7
....

So it's safer to keep 0.6 branch for now

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 Makefile         |   10 +++++-----
 debian/changelog |    6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 25172fb..64f09ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 RELEASE=3.0
 
 PACKAGE=pve-sheepdog
-PKGREL=3
-SDVER=0.6.0
-BRANCH=stable-0.6
+PKGREL=1
+SDVER=0.6.2
 
 DEB=${PACKAGE}_${SDVER}-${PKGREL}_amd64.deb
 
@@ -15,7 +14,7 @@ all: ${DEB}
 ${DEB} deb: ${SDSRC}
 	rm -rf ${SDDIR}
 	tar xf ${SDSRC}
-	mv ${SDDIR}/debian ${SDDIR}/debian.org
+	rm -rf ${SDDIR}/debian
 	cp -av debian ${SDDIR}/debian
 	cd ${SDDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
 	lintian -X copyright-file ${DEB}
@@ -23,7 +22,8 @@ ${DEB} deb: ${SDSRC}
 .PHONY: download
 ${SDSRC} download:
 	rm -rf ${SDDIR} sheepdog.git
-	git clone git://github.com/collie/sheepdog.git sheepdog.git -b ${BRANCH}
+	git clone git://github.com/sheepdog/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}
diff --git a/debian/changelog b/debian/changelog
index d27da12..6c9abba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-sheepdog (0.6.2-1) unstable; urgency=low
+
+  * Bump to sheepdog 0.6.2
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 4 Sep 2013 11:20:17 +0200
+
 pve-sheepdog (0.6.0-3) unstable; urgency=low
 
   * Include updates from stable branch
-- 
1.7.10.4