update API version to 2.6

diff --git a/configure.in b/configure.in
index aa627ca68f7f461ff15240f76b726bc77f9d1637..1cb45a969c24b436371774609244cfc163812844 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.5.1)
+AC_INIT(fuse, 2.6.0)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/config.h)

diff --git a/include/fuse_common.h b/include/fuse_common.h
index 0f35ea62bd53b08ffec4f34b11ab89c82eb62fa9..613a1e8e1e30b0c3dbcfd7506dffffe3eeda36d9 100644 (file)
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -20,7 +20,7 @@
 #define FUSE_MAJOR_VERSION 2
 
 /** Minor version of FUSE library interface */
-#define FUSE_MINOR_VERSION 5
+#define FUSE_MINOR_VERSION 6
 
 #define FUSE_MAKE_VERSION(maj, min)  ((maj) * 10 + (min))
 #define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)

diff --git a/kernel/configure.ac b/kernel/configure.ac
index 570f8ce601f07fdbe70c56db481e2ad266224b3c..f90a57ba8a9a958466153c48c395e6bdd3273859 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.5.1)
+AC_INIT(fuse-kernel, 2.6.0)
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_INSTALL

diff --git a/lib/Makefile.am b/lib/Makefile.am
index fb52a0b409de668b16f55c684727b25a3356b99a..e0fbfb05ca1c47978167940e25297121defac82f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,7 +22,7 @@ libfuse_la_SOURCES =          \
        helper.c                \
        $(mount_source)
 
-libfuse_la_LDFLAGS = -lpthread -version-number 2:5:1 \
+libfuse_la_LDFLAGS = -lpthread -version-number 2:6:0 \
        -Wl,--version-script,fuse_versionscript
 
 EXTRA_DIST = fuse_versionscript

diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 40fc9ae5fdd747a88ae94037f75f54b609c7f5b5..c09a905361e4e4a11b5519fd7d7f2592debd90be 100644 (file)
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -73,7 +73,6 @@ FUSE_2.5 {
                fuse_opt_add_opt;
                fuse_opt_add_arg;
                fuse_opt_free_args;
-               fuse_opt_insert_arg;
                fuse_opt_match;
                fuse_parse_cmdline;
                fuse_remove_signal_handlers;
@@ -85,7 +84,12 @@ FUSE_2.5 {
                fuse_setup;
                fuse_setup_compat22;
                fuse_set_signal_handlers;
+} FUSE_2.4;
+
+FUSE_2.6 {
+       global:
+               fuse_opt_insert_arg;
 
        local:
                 *;
-} FUSE_2.4;
+} FUSE_2.5;