diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-08 18:44:37 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-08 18:44:37 -0700 |
| commit | d9d1da95c6a4b95339b23ab22ddbe0611b5fccad (patch) | |
| tree | 8ed2615c59d191fdd85c6116cdf1ca90215455ed | |
| parent | 3b8dadf5814157a656d60dccadd7cb820a429050 (diff) | |
| download | protobuf-d9d1da95c6a4b95339b23ab22ddbe0611b5fccad.tar.gz protobuf-d9d1da95c6a4b95339b23ab22ddbe0611b5fccad.tar.bz2 protobuf-d9d1da95c6a4b95339b23ab22ddbe0611b5fccad.zip | |
Update version number to 2.6.1rc1
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | java/pom.xml | 4 | ||||
| -rwxr-xr-x | python/setup.py | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index d8a8ee7a..3b5cb60b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[2.6.0],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[2.6.1rc1],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/java/pom.xml b/java/pom.xml index 8bf242dd..0d9779ff 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.6.0</version> + <version>2.6.1rc1</version> <packaging>bundle</packaging> <name>Protocol Buffer Java API</name> <description> @@ -148,7 +148,7 @@ <instructions> <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName> - <Export-Package>com.google.protobuf;version=2.6.0</Export-Package> + <Export-Package>com.google.protobuf;version=2.6.1rc1</Export-Package> </instructions> </configuration> </plugin> diff --git a/python/setup.py b/python/setup.py index 17beac06..91565c18 100755 --- a/python/setup.py +++ b/python/setup.py @@ -156,7 +156,7 @@ if __name__ == '__main__': )) setup(name = 'protobuf', - version = '2.6.0', + version = '2.6.1rc1', packages = [ 'google' ], namespace_packages = [ 'google' ], test_suite = 'setup.MakeTestSuite', diff --git a/src/Makefile.am b/src/Makefile.am index b32635da..45ba4d3b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,7 +95,7 @@ nobase_include_HEADERS = \ lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_lite_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined +libprotobuf_lite_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined libprotobuf_lite_la_SOURCES = \ google/protobuf/stubs/atomicops_internals_x86_gcc.cc \ google/protobuf/stubs/atomicops_internals_x86_msvc.cc \ @@ -117,7 +117,7 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl_lite.cc libprotobuf_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined +libprotobuf_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined libprotobuf_la_SOURCES = \ $(libprotobuf_lite_la_SOURCES) \ google/protobuf/stubs/strutil.cc \ @@ -146,7 +146,7 @@ libprotobuf_la_SOURCES = \ google/protobuf/compiler/parser.cc libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la -libprotoc_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined +libprotoc_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined libprotoc_la_SOURCES = \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 79ced81f..f096fa99 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -113,7 +113,7 @@ namespace internal { // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 2006000 +#define GOOGLE_PROTOBUF_VERSION 2006001 // The minimum library version which works with the current version of the // headers. |