From 0aefa5f6e2cac51cc346608319283374559da1f8 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Wed, 20 Apr 2011 07:42:24 -0500 Subject: [PATCH] Upstream merge; git-dch; 0.6.0.8 unofficial. --- debian/changelog | 14 ++++++++++++++ debian/patches/volatile-version.patch | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c55b2b8..f525b61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +spl-linux (0.6.0.8-0ubuntu1) unstable; urgency=low + + [ Brian Behlendorf ] + * Fix rebuildable RPMs for el6/ch5 + * Linux 2.6.39 compat, invalidate_inodes() + * Fix gcc configure warnings + * Fix unused variable + + [ Darik Horn ] + * Merge upstream and use 0.6.0.8 as the unofficial version number. + * Use git-dch to update the debian/changelog. + + -- Darik Horn Wed, 20 Apr 2011 07:40:03 -0500 + spl-linux (0.6.0.7-0ubuntu1) unstable; urgency=low [ Brian Behlendorf ] diff --git a/debian/patches/volatile-version.patch b/debian/patches/volatile-version.patch index 65f957c..ee16434 100644 --- a/debian/patches/volatile-version.patch +++ b/debian/patches/volatile-version.patch @@ -7,6 +7,6 @@ Index: b/META Name: spl Branch: 1.0 -Version: 0.6.0 -+Version: 0.6.0.7 ++Version: 0.6.0.8 Release: rc3 Release-Tags: relext -- 2.39.5