update to 0.6.4.1

diff --git a/Makefile b/Makefile
index 4504edf885b471f57155f996a3a5e2a1e73f759f..98dc0ff0e4413a3e0019d540be7fe5ab4d9184f9 100644 (file)
--- 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 4473085f395ced7cdb83c86b1cc4c053e062359c..4ee581e85b20124c79b80b97a7d940b0d69a922e 100644 (file)
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 01f3a947bc55e557007594d0242b6ba21aa07f23..284e4e6c14120938a55e71aba3620cd348af63d0 100644 (file)
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 8cf44cfedd0f470e50ab054c1712ce6c99350503..b64a18fb459e0cb1df87f56a88b3251d5a8e7b77 100644 (file)
--- 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 26fca904a5aeedd6b7eb9b3ca9e536cdbf650847..929729c34962d5a417567bd5cf7c2eea8841e3f5 100644 (file)
--- 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