From 04bbb4383e54d431a3513045dad4be62b91c64af Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Wed, 6 Jan 2010 19:17:28 -0800 Subject: [PATCH] Doing final commit before release. RPM updated, version incremented. --- ChangeLog | 2 +- configure.ac | 2 +- docs/Makefile.am | 155 +++++++++++++++++++---------------- support/libmemcached.spec.in | 11 +-- 4 files changed, 93 insertions(+), 77 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03459c3c..bd2c0c65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -0.36 +0.36 Wed Jan 6 18:23:50 PST 2010 * Merged in new memslap utility. * All of constants.h has been updated to match style (all old identifiers continue to work). diff --git a/configure.ac b/configure.ac index 3199aa8a..6bb4f284 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # the COPYING file in this directory for full text. AC_PREREQ(2.59) -AC_INIT([libmemcached],[0.35],[http://tangent.org/552/libmemcached.html]) +AC_INIT([libmemcached],[0.36],[http://tangent.org/552/libmemcached.html]) AC_CONFIG_SRCDIR([libmemcached/memcached.c]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER([config.h]) diff --git a/docs/Makefile.am b/docs/Makefile.am index 93452aca..33073dca 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -325,76 +325,91 @@ POD_FILES= \ EXTRA_DIST+= $(POD_FILES) man_MANS = \ - libmemcached.3 \ - libmemcached_examples.3 \ - memcached_add.3 \ - memcached_add_by_key.3 \ - memcached_analyze.3 \ - memcached_append.3 \ - memcached_append_by_key.3 \ - memcached_behavior_get.3 \ - memcached_behavior_set.3 \ - memcached_callback_get.3 \ - memcached_callback_set.3 \ - memcached_cas.3 \ - memcached_cas_by_key.3 \ - memcached_clone.3 \ - memcached_create.3 \ - memcached_decrement.3 \ - memcached_decrement_with_initial.3 \ - memcached_delete.3 \ - memcached_delete_by_key.3 \ - memcached_dump.3 \ - memcached_fetch.3 \ - memcached_fetch_execute.3 \ - memcached_fetch_result.3 \ - memcached_flush_buffers.3 \ - memcached_free.3 \ - memcached_generate_hash_value.3 \ - memcached_get.3 \ - memcached_get_by_key.3 \ - memcached_get_memory_allocators.3 \ - memcached_get_user_data.3 \ - memcached_increment.3 \ - memcached_increment_with_initial.3 \ - memcached_lib_version.3 \ - memcached_mget.3 \ - memcached_mget_by_key.3 \ - memcached_mget_execute.3 \ - memcached_mget_execute_by_key.3 \ - memcached_prepend.3 \ - memcached_prepend_by_key.3 \ - memcached_quit.3 \ - memcached_replace.3 \ - memcached_replace_by_key.3 \ - memcached_server_add.3 \ - memcached_server_count.3 \ - memcached_server_list.3 \ - memcached_server_list_append.3 \ - memcached_server_list_count.3 \ - memcached_server_list_free.3 \ - memcached_server_push.3 \ - memcached_servers_parse.3 \ - memcached_set.3 \ - memcached_set_by_key.3 \ - memcached_set_memory_allocators.3 \ - memcached_set_user_data.3 \ - memcached_stat.3 \ - memcached_stat_get_keys.3 \ - memcached_stat_get_value.3 \ - memcached_stat_servername.3 \ - memcached_strerror.3 \ - memcached_verbosity.3 \ - memcached_version.3 \ - memcapable.1 \ - memcat.1 \ - memcp.1 \ - memdump.1 \ - memerror.1 \ - memflush.1 \ - memrm.1 \ - memslap.1 \ - memstat.1 + hashkit_clone.3 \ + hashkit_crc32.3 \ + hashkit_create.3 \ + hashkit_fnv1_32.3 \ + hashkit_fnv1_64.3 \ + hashkit_fnv1a_32.3 \ + hashkit_fnv1a_64.3 \ + hashkit_free.3 \ + hashkit_functions.3 \ + hashkit_hsieh.3 \ + hashkit_is_allocated.3 \ + hashkit_jenkins.3 \ + hashkit_md5.3 \ + hashkit_murmur.3 \ + hashkit_value.3 \ + libmemcached.3 \ + libmemcached_examples.3 \ + memcached_add.3 \ + memcached_add_by_key.3 \ + memcached_analyze.3 \ + memcached_append.3 \ + memcached_append_by_key.3 \ + memcached_behavior_get.3 \ + memcached_behavior_set.3 \ + memcached_callback_get.3 \ + memcached_callback_set.3 \ + memcached_cas.3 \ + memcached_cas_by_key.3 \ + memcached_clone.3 \ + memcached_create.3 \ + memcached_decrement.3 \ + memcached_decrement_with_initial.3 \ + memcached_delete.3 \ + memcached_delete_by_key.3 \ + memcached_dump.3 \ + memcached_fetch.3 \ + memcached_fetch_execute.3 \ + memcached_fetch_result.3 \ + memcached_flush_buffers.3 \ + memcached_free.3 \ + memcached_generate_hash_value.3 \ + memcached_get.3 \ + memcached_get_by_key.3 \ + memcached_get_memory_allocators.3 \ + memcached_get_user_data.3 \ + memcached_increment.3 \ + memcached_increment_with_initial.3 \ + memcached_lib_version.3 \ + memcached_mget.3 \ + memcached_mget_by_key.3 \ + memcached_mget_execute.3 \ + memcached_mget_execute_by_key.3 \ + memcached_prepend.3 \ + memcached_prepend_by_key.3 \ + memcached_quit.3 \ + memcached_replace.3 \ + memcached_replace_by_key.3 \ + memcached_server_add.3 \ + memcached_server_count.3 \ + memcached_server_list.3 \ + memcached_server_list_append.3 \ + memcached_server_list_count.3 \ + memcached_server_list_free.3 \ + memcached_server_push.3 \ + memcached_servers_parse.3 \ + memcached_set.3 \ + memcached_set_by_key.3 \ + memcached_set_memory_allocators.3 \ + memcached_set_user_data.3 \ + memcached_stat.3 \ + memcached_stat_get_keys.3 \ + memcached_stat_get_value.3 \ + memcached_stat_servername.3 \ + memcached_strerror.3 \ + memcached_verbosity.3 \ + memcached_version.3 \ + memcapable.1 \ + memcat.1 \ + memcp.1 \ + memdump.1 \ + memerror.1 \ + memflush.1 \ + memrm.1 \ + memslap.1 \ + memstat.1 if BUILD_LIBMEMCACHEDUTIL man_MANS+= \ diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in index ceeb36fb..8df3aebf 100644 --- a/support/libmemcached.spec.in +++ b/support/libmemcached.spec.in @@ -4,7 +4,7 @@ Version: @VERSION@ Release: 1 License: BSD Group: System Environment/Libraries -URL: http://tangent.org/552/libmemcached.html +URL: http://launchpad.net/libmemcached Source0: http://download.tangent.org/libmemcached-%{version}.tar.gz # For test suite @@ -78,29 +78,30 @@ you will need to install %{name}-devel. %defattr (-,root,root,-) %doc AUTHORS COPYING NEWS README THANKS TODO %{_bindir}/mem* -%exclude %{_libdir}/libmemcached.a %exclude %{_libdir}/libmemcached.la -%exclude %{_libdir}/libmemcachedutil.a -%exclude %{_libdir}/libmemcachedprotocol.a +%exclude %{_libdir}/libhashkit.la %exclude %{_libdir}/libmemcachedutil.la %exclude %{_libdir}/libmemcachedprotocol.la +%{_libdir}/libhashkit.so.* %{_libdir}/libmemcached.so.* %{_libdir}/libmemcachedutil.so.* %{_libdir}/libmemcachedprotocol.so.* %{_mandir}/man1/mem* -%exclude libhashkit/* %files devel %defattr (-,root,root,-) %doc examples %{_includedir}/libmemcached +%{_includedir}/libhashkit +%{_libdir}/libhashkit.so %{_libdir}/libmemcached.so %{_libdir}/libmemcachedutil.so %{_libdir}/libmemcachedprotocol.so %{_libdir}/pkgconfig/libmemcached.pc %{_mandir}/man3/libmemcached*.3.gz %{_mandir}/man3/memcached_*.3.gz +%{_mandir}/man3/hashkit*.3.gz %changelog -- 2.30.2