summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2006-01-20 14:23:54 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2006-01-20 14:23:54 +0000
commit0e339a7642bee7644a7f83612146d8069100f185 (patch)
tree59824702a4367a6f01869d72ea8a77d9d26a87d6
parent6ecf16bef1f61a947d9996d345c60f17f9f16e4e (diff)
downloadfuse-0e339a7642bee7644a7f83612146d8069100f185.tar.gz
update API version to 2.6
-rw-r--r--configure.in2
-rw-r--r--include/fuse_common.h2
-rw-r--r--kernel/configure.ac2
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/fuse_versionscript8
5 files changed, 10 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index aa627ca..1cb45a9 100644
--- 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 0f35ea6..613a1e8 100644
--- 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 570f8ce..f90a57b 100644
--- 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 fb52a0b..e0fbfb0 100644
--- 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 40fc9ae..c09a905 100644
--- 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;