From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 30 Apr 2015 05:32:22 +0000 (+0200)
Subject: update to 0.6.4.1
X-Git-Url: https://git.proxmox.com/?p=zfsonlinux.git;a=commitdiff_plain;h=0ca48f6b95ef4043fce5a4a8bc446deba01b38a7

update to 0.6.4.1
---

diff --git a/Makefile b/Makefile
index 4504edf..98dc0ff 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ RELEASE=3.4
 # also update version in 
 # zfs-changelog.Debian and spl-changelog.Debian
 ZFSVER=0.6.4
-ZFSPKGREL=2~wheezy
-SPLPKGREL=2~wheezy
+ZFSPKGREL=3~wheezy
+SPLPKGREL=3~wheezy
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
@@ -63,11 +63,15 @@ zfs ${ZFS_DEBS}: ${ZFSSRC}
 .PHONY: download
 download:
 	rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
-	git clone https://github.com/zfsonlinux/pkg-spl.git
-	git clone https://github.com/zfsonlinux/pkg-zfs.git
 	# list tags with:  git tag --list 'master/*'
+	git clone https://github.com/zfsonlinux/pkg-spl.git
+	# udate manually to 0.6.4.1 for now
+	cd pkg-spl; git checkout upstream
+	cd pkg-spl; git pull git://github.com/zfsonlinux/spl.git master
 	cd pkg-spl; git checkout master/debian/wheezy/0.6.4-1-wheezy
-	cd pkg-zfs; git checkout master/debian/wheezy/0.6.4-1-2-wheezy
+	cd pkg-spl; git	merge upstream -m "merge upstream"
+	git clone https://github.com/zfsonlinux/pkg-zfs.git
+	cd pkg-zfs; git checkout master/debian/wheezy/0.6.4-1.1-1-wheezy
 	tar czf ${SPLSRC} pkg-spl
 	tar czf ${ZFSSRC} pkg-zfs
 
diff --git a/pkg-spl.tar.gz b/pkg-spl.tar.gz
index 4473085..4ee581e 100644
Binary files a/pkg-spl.tar.gz and b/pkg-spl.tar.gz differ
diff --git a/pkg-zfs.tar.gz b/pkg-zfs.tar.gz
index 01f3a94..284e4e6 100644
Binary files a/pkg-zfs.tar.gz and b/pkg-zfs.tar.gz differ
diff --git a/spl-changelog.Debian b/spl-changelog.Debian
index 8cf44cf..b64a18f 100644
--- a/spl-changelog.Debian
+++ b/spl-changelog.Debian
@@ -1,3 +1,9 @@
+spl-linux (0.6.4-3~wheezy) unstable; urgency=low
+
+  * update to 0.6.4.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:14 +0200
+
 spl-linux (0.6.4-2~wheezy) unstable; urgency=low
 
   * include original zol changelog files
diff --git a/zfs-changelog.Debian b/zfs-changelog.Debian
index 26fca90..929729c 100644
--- a/zfs-changelog.Debian
+++ b/zfs-changelog.Debian
@@ -1,3 +1,9 @@
+zfs-linux (0.6.4-3~wheezy) unstable; urgency=low
+
+  * update to 0.6.4.1
+  
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 30 Apr 2015 07:31:44 +0200
+
 zfs-linux (0.6.4-2~wheezy) unstable; urgency=low
 
   * cleanup /etc/default/zfs