From 2f2b265609a6846c6bccc43292c9436e894edcde Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 14 Apr 2015 07:55:45 +0200 Subject: [PATCH] fix changelogs --- Makefile | 10 ++++++++-- spl-changelog.Debian | 17 +++++++++++++++++ spl-patches/fix-changelog-patch | 14 -------------- spl-patches/series | 1 - zfs-changelog.Debian | 33 +++++++++++++++++++++++++++++++++ zfs-patches/fix-changelog.patch | 14 -------------- zfs-patches/series | 1 - 7 files changed, 58 insertions(+), 32 deletions(-) create mode 100644 spl-changelog.Debian delete mode 100644 spl-patches/fix-changelog-patch create mode 100644 zfs-changelog.Debian delete mode 100644 zfs-patches/fix-changelog.patch diff --git a/Makefile b/Makefile index ecac598..4504edf 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,11 @@ RELEASE=3.4 # source form https://github.com/zfsonlinux/ +# also update version in +# zfs-changelog.Debian and spl-changelog.Debian ZFSVER=0.6.4 -ZFSPKGREL=1~wheezy -SPLPKGREL=1~wheezy +ZFSPKGREL=2~wheezy +SPLPKGREL=2~wheezy ZFSPKGVER=${ZFSVER}-${ZFSPKGREL} SPLPKGVER=${ZFSVER}-${SPLPKGREL} @@ -38,6 +40,8 @@ dinstall: ${DEBS} spl ${SPL_DEBS}: ${SPLSRC} rm -rf ${SPLDIR} tar xf ${SPLSRC} + mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org + cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog cd ${SPLDIR}; ln -s ../spl-patches patches cd ${SPLDIR}; quilt push -a cd ${SPLDIR}; rm -rf .pc ./patches @@ -48,6 +52,8 @@ spl ${SPL_DEBS}: ${SPLSRC} zfs ${ZFS_DEBS}: ${ZFSSRC} rm -rf ${ZFSDIR} tar xf ${ZFSSRC} + mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org + cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog cd ${ZFSDIR}; ln -s ../zfs-patches patches cd ${ZFSDIR}; quilt push -a cd ${ZFSDIR}; rm -rf .pc ./patches diff --git a/spl-changelog.Debian b/spl-changelog.Debian new file mode 100644 index 0000000..8cf44cf --- /dev/null +++ b/spl-changelog.Debian @@ -0,0 +1,17 @@ +spl-linux (0.6.4-2~wheezy) unstable; urgency=low + + * include original zol changelog files + + -- Proxmox Support Team Tue, 14 Apr 2015 07:38:02 +0200 + +spl-linux (0.6.4-1~wheezy) unstable; urgency=low + + * update to 0.6.4 (keep Proxmox VE versioning schema) + + -- Proxmox Support Team Sun, 12 Apr 2015 09:32:24 +0200 + +spl-linux (0.6.3-1~wheezy) unstable; urgency=low + + * first version for Proxmox VE + + -- Proxmox Support Team Sat, 10 Jan 2015 14:06:34 +0100 diff --git a/spl-patches/fix-changelog-patch b/spl-patches/fix-changelog-patch deleted file mode 100644 index 83ea2f8..0000000 --- a/spl-patches/fix-changelog-patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: new-spl/debian/changelog -=================================================================== ---- new-spl.orig/debian/changelog 2015-04-12 14:06:48.000000000 +0200 -+++ new-spl/debian/changelog 2015-04-12 17:09:48.000000000 +0200 -@@ -1,3 +1,9 @@ -+spl-linux (0.6.4-1~wheezy) unstable; urgency=low -+ -+ * recompile for Proxmox VE, keep Proxmox VE versioning schema -+ -+ -- Proxmox Support Team Sun, 12 Apr 2015 17:09:48 +0200 -+ - spl-linux (0.6.4-1-wheezy) wheezy; urgency=low - - * New upstream release. diff --git a/spl-patches/series b/spl-patches/series index cc3e949..ca02f1a 100644 --- a/spl-patches/series +++ b/spl-patches/series @@ -1,2 +1 @@ fix-control -fix-changelog-patch diff --git a/zfs-changelog.Debian b/zfs-changelog.Debian new file mode 100644 index 0000000..26fca90 --- /dev/null +++ b/zfs-changelog.Debian @@ -0,0 +1,33 @@ +zfs-linux (0.6.4-2~wheezy) unstable; urgency=low + + * cleanup /etc/default/zfs + + * include orignial zol changelog files + + -- Proxmox Support Team Tue, 14 Apr 2015 07:30:59 +0200 + +zfs-linux (0.6.4-1~wheezy) unstable; urgency=low + + * update to 0.6.4 + + -- Proxmox Support Team Sun, 12 Apr 2015 09:33:13 +0200 + +zfs-linux (0.6.3-3~wheezy) unstable; urgency=low + + * install init.d file for zed daemon + + -- Proxmox Support Team Sun, 15 Mar 2015 14:57:30 +0100 + +zfs-linux (0.6.3-2~wheezy) unstable; urgency=low + + * use /sbin/modprobe to avoid warning inside initrd + + * fix warning about undefined values inside initrd + + -- Proxmox Support Team Wed, 14 Jan 2015 19:03:04 +0100 + +zfs-linux (0.6.3-1~wheezy) unstable; urgency=low + + * first version for Proxmox VE + + -- Proxmox Support Team Sat, 10 Jan 2015 14:06:34 +0100 diff --git a/zfs-patches/fix-changelog.patch b/zfs-patches/fix-changelog.patch deleted file mode 100644 index 06a0c4f..0000000 --- a/zfs-patches/fix-changelog.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: new-zfs/debian/changelog -=================================================================== ---- new-zfs.orig/debian/changelog 2015-04-12 14:06:48.000000000 +0200 -+++ new-zfs/debian/changelog 2015-04-12 17:07:09.000000000 +0200 -@@ -1,3 +1,9 @@ -+zfs-linux (0.6.4-1~wheezy) unstable; urgency=low -+ -+ * recompile for Proxmox VE, keep Proxmox VE versioning schema -+ -+ -- Proxmox Support Team Sun, 12 Apr 2015 17:06:15 +0200 -+ - zfs-linux (0.6.4-1-2-wheezy) wheezy; urgency=low - - * Replace apparently broken nfs.c with one that works on my Primary. diff --git a/zfs-patches/series b/zfs-patches/series index 323cac1..debb41d 100644 --- a/zfs-patches/series +++ b/zfs-patches/series @@ -1,2 +1 @@ fix-control.patch -fix-changelog.patch