[Pkg-zfsonlinux-devel] [SCM] spl branch, upstream, updated. upstream/0.6.4.1-1-gd097b65

Aron Xu aron at debian.org
Thu Aug 13 12:12:25 UTC 2015 

The following commit has been merged in the upstream branch:
commit d097b651955771407861f4e832495398d3de7556
Author: Aron Xu <aron at debian.org>
Date:   Thu Aug 13 19:58:21 2015 +0800

    Imported Upstream version 0.6.4.2

diff --git a/META b/META
index db36bac..5c3fe29 100644
--- a/META
+++ b/META
@@ -1,7 +1,7 @@
 Meta:         1
 Name:         spl
 Branch:       1.0
-Version:      0.6.4.1
+Version:      0.6.4.2
 Release:      1
 Release-Tags: relext
 License:      GPL
diff --git a/configure b/configure
index ea30ce4..a6878b3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for spl 0.6.4.1.
+# Generated by GNU Autoconf 2.68 for spl 0.6.4.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='spl'
 PACKAGE_TARNAME='spl'
-PACKAGE_VERSION='0.6.4.1'
-PACKAGE_STRING='spl 0.6.4.1'
+PACKAGE_VERSION='0.6.4.2'
+PACKAGE_STRING='spl 0.6.4.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1357,7 +1357,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures spl 0.6.4.1 to adapt to many kinds of systems.
+\`configure' configures spl 0.6.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1428,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of spl 0.6.4.1:";;
+     short | recursive ) echo "Configuration of spl 0.6.4.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1545,7 +1545,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-spl configure 0.6.4.1
+spl configure 0.6.4.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1823,7 +1823,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by spl $as_me 0.6.4.1, which was
+It was created by spl $as_me 0.6.4.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2947,7 +2947,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='spl'
- VERSION='0.6.4.1'
+ VERSION='0.6.4.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17646,7 +17646,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by spl $as_me 0.6.4.1, which was
+This file was extended by spl $as_me 0.6.4.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17712,7 +17712,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-spl config.status 0.6.4.1
+spl config.status 0.6.4.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
index 8f1f232..d95e2df 100644
--- a/rpm/generic/spl-kmod.spec.in
+++ b/rpm/generic/spl-kmod.spec.in
@@ -160,6 +160,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jun  24 2015 Ned Bass <bass6 at llnl.gov> - 0.6.4.2-1
+- No changes from 0.6.4-1
+- Bump version to match ZFS release
 * Wed Apr  8 2015 Brian Behlendorf <behlendorf1 at llnl.gov> - 0.6.4-1
 - Released 0.6.4-1
 * Thu Jun 12 2014 Brian Behlendorf <behlendorf1 at llnl.gov> - 0.6.3-1
diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
index 81f30e0..1faeba9 100644
--- a/rpm/generic/spl.spec.in
+++ b/rpm/generic/spl.spec.in
@@ -38,6 +38,9 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jun  24 2015 Ned Bass <bass6 at llnl.gov> - 0.6.4.2-1
+- No changes from 0.6.4-1
+- Bump version to match ZFS release
 * Wed Apr  8 2015 Brian Behlendorf <behlendorf1 at llnl.gov> - 0.6.4-1
 - Released 0.6.4-1
 * Thu Jun 12 2014 Brian Behlendorf <behlendorf1 at llnl.gov> - 0.6.3-1
diff --git a/rpm/redhat/spl.spec.in b/rpm/redhat/spl.spec.in
index 81f30e0..1faeba9 100644
--- a/rpm/redhat/spl.spec.in
+++ b/rpm/redhat/spl.spec.in
@@ -38,6 +38,9 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jun  24 2015 Ned Bass <bass6 at llnl.gov> - 0.6.4.2-1
+- No changes from 0.6.4-1
+- Bump version to match ZFS release
 * Wed Apr  8 2015 Brian Behlendorf <behlendorf1 at llnl.gov> - 0.6.4-1
 - Released 0.6.4-1
 * Thu Jun 12 2014 Brian Behlendorf <behlendorf1 at llnl.gov> - 0.6.3-1

-- 
Solaris Porting Layer for Linux

More information about the Pkg-zfsonlinux-devel mailing list