update to 0.6.5.2

diff --git a/Makefile b/Makefile
index 411ab001316ef526509e9852cffa6cc09235d012..cc304db131b92000dc18b5ebf0860b86f4a6e807 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ RELEASE=3.4
 
 # also update version in 
 # zfs-changelog.Debian and spl-changelog.Debian
-ZFSVER=0.6.4
-ZFSPKGREL=4~wheezy
-SPLPKGREL=4~wheezy
+ZFSVER=0.6.5
+ZFSPKGREL=1~wheezy
+SPLPKGREL=1~wheezy
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
@@ -66,14 +66,14 @@ download:
        # list tags with:  git tag --list 'master/*'
        git clone https://github.com/zfsonlinux/pkg-spl.git
        #cd pkg-spl; git fetch --tags
-       cd pkg-spl; git checkout snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy
+       cd pkg-spl; git checkout master/debian/wheezy/0.6.5-1-wheezy
        ## 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-spl; git        merge upstream -m "merge upstream"
        git clone https://github.com/zfsonlinux/pkg-zfs.git
-       cd pkg-zfs; git checkout snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy 
+       cd pkg-zfs; git checkout master/debian/wheezy/0.6.5.2-2-wheezy 
        tar czf ${SPLSRC} pkg-spl
        tar czf ${ZFSSRC} pkg-zfs
 

diff --git a/pkg-spl.tar.gz b/pkg-spl.tar.gz
index 9984d3ecde27df244affab0f102da38470894257..75a3fa2dd13aba8a91f9072e0cd00cd6316d230f 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 21698de0775554bb00d152015bf03c784ab94b6d..e88a875071b05230c66c36099f0c90ee820c5106 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 790aec390c9a4759182922874f29c94d9d3cdd07..d0b184f74111fd4f74882d41289d1040dc0deb51 100644 (file)
--- a/spl-changelog.Debian
+++ b/spl-changelog.Debian
@@ -1,3 +1,9 @@
+spl-linux (0.6.5-1~wheezy) unstable; urgency=low
+
+  * update to master/debian/wheezy/0.6.5-1-wheezy
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:03:25 +0200
+
 spl-linux (0.6.4-4~wheezy) unstable; urgency=low
 
   * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-6-37d7cd-wheezy)

diff --git a/spl-patches/fix-control b/spl-patches/fix-control
index e68108d2096db0888736591a16790d3a369c1377..30f5d152f4437922a62a742132c162b9ae0d79e4 100644 (file)
--- a/spl-patches/fix-control
+++ b/spl-patches/fix-control
@@ -1,7 +1,7 @@
-Index: pkg-spl/debian/rules
+Index: new/debian/rules
 ===================================================================
---- pkg-spl.orig/debian/rules  2015-07-21 07:14:29.000000000 +0200
-+++ pkg-spl/debian/rules       2015-07-21 07:28:47.000000000 +0200
+--- new.orig/debian/rules      2015-10-09 10:02:21.000000000 +0200
++++ new/debian/rules   2015-10-09 10:12:04.000000000 +0200
 @@ -22,9 +22,7 @@
  KVERS=$(shell uname -r | sed 's/-$(DEB_HOST_ARCH)//')
  endif
@@ -82,11 +82,11 @@ Index: pkg-spl/debian/rules
  override_dh_dkms:
        dh_dkms -V $(VERSION)
  
-Index: pkg-spl/debian/control.in
+Index: new/debian/control.in
 ===================================================================
---- pkg-spl.orig/debian/control.in     2015-07-21 07:14:29.000000000 +0200
-+++ pkg-spl/debian/control.in  2015-07-21 07:19:42.000000000 +0200
-@@ -33,28 +33,6 @@
+--- new.orig/debian/control.in 2015-10-09 10:02:21.000000000 +0200
++++ new/debian/control.in      2015-10-09 10:12:44.000000000 +0200
+@@ -35,30 +35,6 @@
   This package provides the source to the SPL kernel module in a form
   suitable for use by module-assistant or kernel-package.
  
@@ -95,6 +95,8 @@ Index: pkg-spl/debian/control.in
 -Depends: linux-headers-amd64, libc6-dev, ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release, file
 -Recommends: spl (>= ${source:Upstream-Version})
 -Provides: spl-modules
+-Conflicts: spl-modules-source
+-Replaces: spl-modules-source
 -Description: Solaris Porting Layer kernel modules for Linux
 - The Solaris Porting Layer (SPL) is a Linux kernel module which provides
 - many of the Solaris kernel APIs. This shim layer makes it possible to

diff --git a/zfs-changelog.Debian b/zfs-changelog.Debian
index fe5eccf35359a5239d2578c402cbffc6514c54ec..25d568ee3ef79329c29925a477ba7fa3242d7895 100644 (file)
--- a/zfs-changelog.Debian
+++ b/zfs-changelog.Debian
@@ -1,3 +1,9 @@
+zfs-linux (0.6.5-1~wheezy) unstable; urgency=low
+
+  * update to master/debian/wheezy/0.6.5.2-2-wheezy 
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Oct 2015 10:04:04 +0200
+
 zfs-linux (0.6.4-4~wheezy) unstable; urgency=low
 
   * update to 0.6.4.2 (snapshot/debian/wheezy/0.6.4-21-53b1d9-wheezy)

diff --git a/zfs-patches/fix-control.patch b/zfs-patches/fix-control.patch
index 3cdeb19ecec96c56fa8e16c9af5994eab2db6df0..a2ebbfcdd4c01325b57479839907aa21b232b04f 100644 (file)
--- a/zfs-patches/fix-control.patch
+++ b/zfs-patches/fix-control.patch
@@ -1,8 +1,8 @@
-Index: pkg-zfs/debian/control.in
+Index: new/debian/control.in
 ===================================================================
---- pkg-zfs.orig/debian/control.in     2015-07-21 07:14:46.000000000 +0200
-+++ pkg-zfs/debian/control.in  2015-07-21 07:48:21.000000000 +0200
-@@ -102,39 +102,9 @@
+--- new.orig/debian/control.in 2015-10-09 10:02:40.000000000 +0200
++++ new/debian/control.in      2015-10-09 10:15:36.000000000 +0200
+@@ -104,39 +104,9 @@
   This package provides the source to the SPL kernel module in a form
   suitable for use by module-assistant or kernel-package.
  
@@ -11,9 +11,9 @@ Index: pkg-zfs/debian/control.in
 -Pre-Depends: spl-dkms
 -Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}, file
 -Recommends: zfsutils
--Replaces: lzfs, lzfs-dkms
+-Replaces: lzfs, lzfs-dkms, zfs-modules-source
 -Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules, zfs-modules-source
--Conflicts: lzfs, lzfs-dkms
+-Conflicts: lzfs, lzfs-dkms, zfs-modules-source
 -Description: Native ZFS filesystem kernel modules for Linux
 - The Z file system is a pooled filesystem designed for maximum data
 - integrity, supporting data snapshots, multiple copies, and data
@@ -42,7 +42,7 @@ Index: pkg-zfs/debian/control.in
   zfsutils, ${misc:Depends}
  Description: Native ZFS root filesystem capabilities for Linux
   The Z file system is a pooled filesystem designed for maximum data
-@@ -148,7 +118,6 @@
+@@ -150,7 +120,6 @@
  Section: admin
  Architecture: linux-any
  Depends: initscripts, lsb-base, python, ${misc:Depends}, ${shlibs:Depends}
@@ -50,10 +50,10 @@ Index: pkg-zfs/debian/control.in
  Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
  Conflicts: zfs, zfs-fuse
  Replaces: zfs
-Index: pkg-zfs/debian/rules
+Index: new/debian/rules
 ===================================================================
---- pkg-zfs.orig/debian/rules  2015-07-21 07:14:46.000000000 +0200
-+++ pkg-zfs/debian/rules       2015-07-21 07:50:13.000000000 +0200
+--- new.orig/debian/rules      2015-10-09 10:02:40.000000000 +0200
++++ new/debian/rules   2015-10-09 10:14:14.000000000 +0200
 @@ -25,12 +25,10 @@
  endif