Skip to content

P
protobuf
Commit d9d1da95 authored by Feng Xiao's avatar Feng Xiao
Browse files
Options

Update version number to 2.6.1rc1

parent 3b8dadf5
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
configure.ac
View file @ d9d1da95
...@@ -12,7 +12,7 @@ AC_PREREQ(2.59) ...@@ -12,7 +12,7 @@ AC_PREREQ(2.59)
# In the SVN trunk, the version should always be the next anticipated release # 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 # 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.) # 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]) AM_MAINTAINER_MODE([enable])
......
java/pom.xml
View file @ d9d1da95
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</parent> </parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>2.6.0</version> <version>2.6.1rc1</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Protocol Buffer Java API</name> <name>Protocol Buffer Java API</name>
<description> <description>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<instructions> <instructions>
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
<Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName> <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> </instructions>
</configuration> </configuration>
</plugin> </plugin>
......
python/setup.py
View file @ d9d1da95
...@@ -156,7 +156,7 @@ if __name__ == '__main__': ...@@ -156,7 +156,7 @@ if __name__ == '__main__':
)) ))
setup(name = 'protobuf', setup(name = 'protobuf',
version = '2.6.0', version = '2.6.1rc1',
packages = [ 'google' ], packages = [ 'google' ],
namespace_packages = [ 'google' ], namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite', test_suite = 'setup.MakeTestSuite',
......
src/Makefile.am
View file @ d9d1da95
...@@ -95,7 +95,7 @@ nobase_include_HEADERS = \ ...@@ -95,7 +95,7 @@ nobase_include_HEADERS = \
lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) 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 = \ libprotobuf_lite_la_SOURCES = \
google/protobuf/stubs/atomicops_internals_x86_gcc.cc \ google/protobuf/stubs/atomicops_internals_x86_gcc.cc \
google/protobuf/stubs/atomicops_internals_x86_msvc.cc \ google/protobuf/stubs/atomicops_internals_x86_msvc.cc \
...@@ -117,7 +117,7 @@ libprotobuf_lite_la_SOURCES = \ ...@@ -117,7 +117,7 @@ libprotobuf_lite_la_SOURCES = \
google/protobuf/io/zero_copy_stream_impl_lite.cc google/protobuf/io/zero_copy_stream_impl_lite.cc
libprotobuf_la_LIBADD = $(PTHREAD_LIBS) 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_la_SOURCES = \
$(libprotobuf_lite_la_SOURCES) \ $(libprotobuf_lite_la_SOURCES) \
google/protobuf/stubs/strutil.cc \ google/protobuf/stubs/strutil.cc \
...@@ -146,7 +146,7 @@ libprotobuf_la_SOURCES = \ ...@@ -146,7 +146,7 @@ libprotobuf_la_SOURCES = \
google/protobuf/compiler/parser.cc google/protobuf/compiler/parser.cc
libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la 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 = \ libprotoc_la_SOURCES = \
google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/code_generator.cc \
google/protobuf/compiler/command_line_interface.cc \ google/protobuf/compiler/command_line_interface.cc \
......
src/google/protobuf/stubs/common.h
View file @ d9d1da95
...@@ -113,7 +113,7 @@ namespace internal { ...@@ -113,7 +113,7 @@ namespace internal {
// The current version, represented as a single integer to make comparison // The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro // 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 // The minimum library version which works with the current version of the
// headers. // headers.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment