update git to stable branch

diff --git a/Makefile b/Makefile
index ffeacc13e2894ffb9164ab4553537114e6839cce..a8a8c73b0b3569fc47e75e1fb6c32ddffd8c5067 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 RELEASE=3.0
 
 PACKAGE=pve-sheepdog
-PKGREL=1
+PKGREL=2
 SDVER=0.6.0
+BRANCH=stable-0.6
 
 DEB=${PACKAGE}_${SDVER}-${PKGREL}_amd64.deb
 
@@ -21,8 +22,7 @@ ${DEB} deb: ${SDSRC}
 .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}
+       git clone git://github.com/collie/sheepdog.git sheepdog.git -b ${BRANCH}
        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 23092b524a89212eff7ed72937c91caa2c53029c..2f8fa1a8e4dbe084ee816e28091e005f1a5af0ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-sheepdog (0.6.0-2) unstable; urgency=low
+
+  * Update git to stable branch
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 15 Jul 2013 07:46:17 +0200
+
 pve-sheepdog (0.6.0-1) unstable; urgency=low
 
   * Bump to sheepdog 0.6.0

diff --git a/sheepdog-0.6.0.tar.gz b/sheepdog-0.6.0.tar.gz
index 51f5bfbd717d8851eadf40c83c156a8450842d91..e3f7ff079978213121c470c320a727edcef45720 100644 (file)
Binary files a/sheepdog-0.6.0.tar.gz and b/sheepdog-0.6.0.tar.gz differ