Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)

CHANGES.txt (+47/-1)
CONTRIBUTORS.txt (+2/-0)
Makefile.am (+18/-1)
Makefile.in (+66/-9)
README.txt (+38/-0)
autogen.sh (+9/-16)
configure (+490/-331)
configure.ac (+25/-25)
debian/changelog (+36/-0)
debian/control (+6/-6)
debian/java-build.xml (+1/-1)
debian/libprotobuf-dev.install (+1/-0)
debian/libprotobuf-java.links (+1/-1)
debian/libprotobuf4.install (+0/-1)
debian/libprotobuf5.install (+1/-0)
debian/libprotobuf5.shlibs (+3/-0)
debian/libprotoc-dev.dirs (+0/-1)
debian/libprotoc-dev.install (+0/-3)
debian/libprotoc4.install (+0/-1)
debian/libprotoc5.install (+1/-0)
debian/libprotoc5.shlibs (+1/-0)
debian/patches/series (+0/-3)
debian/rules (+7/-5)
editors/protobuf-mode.el (+0/-217)
examples/Makefile (+4/-2)
examples/add_person.cc (+3/-0)
examples/list_people.cc (+3/-0)
generate_descriptor_proto.sh (+5/-1)
gtest/CHANGES (+0/-57)
gtest/CONTRIBUTORS (+0/-33)
gtest/COPYING (+0/-28)
gtest/Makefile.am (+0/-390)
gtest/Makefile.in (+0/-1951)
gtest/README (+0/-274)
gtest/aclocal.m4 (+0/-8947)
gtest/build-aux/config.guess (+0/-1516)
gtest/build-aux/config.h.in (+0/-66)
gtest/build-aux/config.sub (+0/-1626)
gtest/build-aux/depcomp (+0/-589)
gtest/build-aux/install-sh (+0/-519)
gtest/build-aux/ltmain.sh (+0/-7874)
gtest/build-aux/missing (+0/-367)
gtest/codegear/gtest.cbproj (+0/-138)
gtest/codegear/gtest.groupproj (+0/-54)
gtest/codegear/gtest_all.cc (+0/-38)
gtest/codegear/gtest_link.cc (+0/-40)
gtest/codegear/gtest_main.cbproj (+0/-82)
gtest/codegear/gtest_unittest.cbproj (+0/-88)
gtest/configure (+0/-18268)
gtest/configure.ac (+0/-51)
gtest/include/gtest/gtest-death-test.h (+0/-262)
gtest/include/gtest/gtest-message.h (+0/-224)
gtest/include/gtest/gtest-param-test.h (+0/-1385)
gtest/include/gtest/gtest-param-test.h.pump (+0/-453)
gtest/include/gtest/gtest-spi.h (+0/-221)
gtest/include/gtest/gtest-test-part.h (+0/-179)
gtest/include/gtest/gtest-typed-test.h (+0/-253)
gtest/include/gtest/gtest.h (+0/-1420)
gtest/include/gtest/gtest_pred_impl.h (+0/-368)
gtest/include/gtest/gtest_prod.h (+0/-58)
gtest/include/gtest/internal/gtest-death-test-internal.h (+0/-227)
gtest/include/gtest/internal/gtest-filepath.h (+0/-201)
gtest/include/gtest/internal/gtest-internal.h (+0/-890)
gtest/include/gtest/internal/gtest-linked_ptr.h (+0/-242)
gtest/include/gtest/internal/gtest-param-util-generated.h (+0/-4572)
gtest/include/gtest/internal/gtest-param-util-generated.h.pump (+0/-269)
gtest/include/gtest/internal/gtest-param-util.h (+0/-629)
gtest/include/gtest/internal/gtest-port.h (+0/-1006)
gtest/include/gtest/internal/gtest-string.h (+0/-335)
gtest/include/gtest/internal/gtest-tuple.h (+966/-0)
gtest/include/gtest/internal/gtest-tuple.h.pump (+335/-0)
gtest/include/gtest/internal/gtest-type-util.h (+0/-3319)
gtest/include/gtest/internal/gtest-type-util.h.pump (+0/-287)
gtest/m4/acx_pthread.m4 (+0/-363)
gtest/m4/gtest.m4 (+0/-74)
gtest/make/Makefile (+0/-78)
gtest/msvc/gtest.sln (+0/-85)
gtest/msvc/gtest.vcproj (+0/-237)
gtest/msvc/gtest_color_test_.vcproj (+0/-144)
gtest/msvc/gtest_env_var_test_.vcproj (+0/-144)
gtest/msvc/gtest_environment_test.vcproj (+0/-144)
gtest/msvc/gtest_main.vcproj (+0/-165)
gtest/msvc/gtest_output_test_.vcproj (+0/-147)
gtest/msvc/gtest_prod_test.vcproj (+0/-164)
gtest/msvc/gtest_uninitialized_test_.vcproj (+0/-144)
gtest/msvc/gtest_unittest.vcproj (+0/-147)
gtest/samples/prime_tables.h (+0/-120)
gtest/samples/sample1.cc (+0/-68)
gtest/samples/sample1.h (+0/-43)
gtest/samples/sample1_unittest.cc (+0/-153)
gtest/samples/sample2.cc (+0/-56)
gtest/samples/sample2.h (+0/-86)
gtest/samples/sample2_unittest.cc (+0/-109)
gtest/samples/sample3-inl.h (+0/-173)
gtest/samples/sample3_unittest.cc (+0/-151)
gtest/samples/sample4.cc (+0/-46)
gtest/samples/sample4.h (+0/-53)
gtest/samples/sample4_unittest.cc (+0/-45)
gtest/samples/sample5_unittest.cc (+0/-199)
gtest/samples/sample6_unittest.cc (+0/-224)
gtest/samples/sample7_unittest.cc (+0/-132)
gtest/samples/sample8_unittest.cc (+0/-173)
gtest/scons/SConscript (+0/-285)
gtest/scripts/fuse_gtest_files.py (+0/-250)
gtest/scripts/gen_gtest_pred_impl.py (+0/-733)
gtest/scripts/gtest-config.in (+0/-274)
gtest/scripts/test/Makefile (+0/-57)
gtest/src/gtest-all.cc (+0/-41)
gtest/src/gtest-death-test.cc (+0/-1177)
gtest/src/gtest-filepath.cc (+0/-341)
gtest/src/gtest-internal-inl.h (+0/-1417)
gtest/src/gtest-port.cc (+0/-672)
gtest/src/gtest-test-part.cc (+0/-124)
gtest/src/gtest-typed-test.cc (+0/-98)
gtest/src/gtest.cc (+0/-4321)
gtest/src/gtest_main.cc (+0/-39)
gtest/test/gtest-death-test_test.cc (+0/-1133)
gtest/test/gtest-filepath_test.cc (+0/-588)
gtest/test/gtest-linked_ptr_test.cc (+0/-154)
gtest/test/gtest-message_test.cc (+0/-157)
gtest/test/gtest-options_test.cc (+0/-267)
gtest/test/gtest-param-test2_test.cc (+0/-65)
gtest/test/gtest-param-test_test.cc (+0/-792)
gtest/test/gtest-param-test_test.h (+0/-55)
gtest/test/gtest-port_test.cc (+0/-688)
gtest/test/gtest-test-part_test.cc (+0/-138)
gtest/test/gtest-tuple_test.cc (+288/-0)
gtest/test/gtest-typed-test2_test.cc (+0/-45)
gtest/test/gtest-typed-test_test.cc (+0/-362)
gtest/test/gtest-typed-test_test.h (+0/-66)
gtest/test/gtest-unittest-api_test.cc (+363/-0)
gtest/test/gtest_all_test.cc (+0/-47)
gtest/test/gtest_break_on_failure_unittest.py (+0/-216)
gtest/test/gtest_break_on_failure_unittest_.cc (+0/-66)
gtest/test/gtest_color_test.py (+0/-126)
gtest/test/gtest_color_test_.cc (+0/-68)
gtest/test/gtest_env_var_test.py (+0/-111)
gtest/test/gtest_env_var_test_.cc (+0/-126)
gtest/test/gtest_environment_test.cc (+0/-186)
gtest/test/gtest_filter_unittest.py (+0/-590)
gtest/test/gtest_filter_unittest_.cc (+0/-146)
gtest/test/gtest_help_test.py (+0/-125)
gtest/test/gtest_help_test_.cc (+0/-42)
gtest/test/gtest_list_tests_unittest.py (+0/-185)
gtest/test/gtest_list_tests_unittest_.cc (+0/-85)
gtest/test/gtest_main_unittest.cc (+0/-45)
gtest/test/gtest_nc.cc (+0/-234)
gtest/test/gtest_nc_test.py (+0/-101)
gtest/test/gtest_no_test_unittest.cc (+0/-54)
gtest/test/gtest_output_test.py (+0/-282)
gtest/test/gtest_output_test_.cc (+0/-1005)
gtest/test/gtest_output_test_golden_lin.txt (+0/-632)
gtest/test/gtest_output_test_golden_win.txt (+0/-575)
gtest/test/gtest_pred_impl_unittest.cc (+0/-2432)
gtest/test/gtest_prod_test.cc (+0/-57)
gtest/test/gtest_repeat_test.cc (+0/-255)
gtest/test/gtest_sole_header_test.cc (+0/-57)
gtest/test/gtest_stress_test.cc (+0/-152)
gtest/test/gtest_test_utils.py (+0/-226)
gtest/test/gtest_throw_on_failure_ex_test.cc (+0/-92)
gtest/test/gtest_throw_on_failure_test.py (+0/-172)
gtest/test/gtest_throw_on_failure_test_.cc (+0/-56)
gtest/test/gtest_uninitialized_test.py (+0/-72)
gtest/test/gtest_uninitialized_test_.cc (+0/-43)
gtest/test/gtest_unittest.cc (+0/-5665)
gtest/test/gtest_xml_outfile1_test_.cc (+0/-49)
gtest/test/gtest_xml_outfile2_test_.cc (+0/-49)
gtest/test/gtest_xml_outfiles_test.py (+0/-133)
gtest/test/gtest_xml_output_unittest.py (+0/-176)
gtest/test/gtest_xml_output_unittest_.cc (+0/-120)
gtest/test/gtest_xml_test_utils.py (+0/-159)
gtest/test/production.cc (+0/-36)
gtest/test/production.h (+0/-55)
gtest/xcode/Config/DebugProject.xcconfig (+0/-30)
gtest/xcode/Config/FrameworkTarget.xcconfig (+0/-17)
gtest/xcode/Config/General.xcconfig (+0/-41)
gtest/xcode/Config/InternalPythonTestTarget.xcconfig (+0/-8)
gtest/xcode/Config/InternalTestTarget.xcconfig (+0/-8)
gtest/xcode/Config/ReleaseProject.xcconfig (+0/-32)
gtest/xcode/Config/TestTarget.xcconfig (+0/-8)
gtest/xcode/Resources/Info.plist (+0/-30)
gtest/xcode/Samples/FrameworkSample/Info.plist (+0/-28)
gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj (+0/-335)
gtest/xcode/Samples/FrameworkSample/widget.cc (+0/-63)
gtest/xcode/Samples/FrameworkSample/widget.h (+0/-59)
gtest/xcode/Samples/FrameworkSample/widget_test.cc (+0/-68)
gtest/xcode/Scripts/runtests.sh (+0/-69)
gtest/xcode/Scripts/versiongenerate.py (+0/-71)
gtest/xcode/gtest.xcodeproj/project.pbxproj (+0/-4741)
java/README.txt (+23/-1)
java/pom.xml (+53/-18)
java/src/main/java/com/google/protobuf/AbstractMessage.java (+486/-253)
java/src/main/java/com/google/protobuf/AbstractMessageLite.java (+321/-0)
java/src/main/java/com/google/protobuf/BlockingRpcChannel.java (+0/-51)
java/src/main/java/com/google/protobuf/BlockingService.java (+0/-64)
java/src/main/java/com/google/protobuf/ByteString.java (+39/-37)
java/src/main/java/com/google/protobuf/CodedInputStream.java (+95/-129)
java/src/main/java/com/google/protobuf/CodedOutputStream.java (+179/-246)
java/src/main/java/com/google/protobuf/Descriptors.java (+331/-252)
java/src/main/java/com/google/protobuf/DynamicMessage.java (+52/-29)
java/src/main/java/com/google/protobuf/ExtensionRegistry.java (+45/-35)
java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java (+169/-0)
java/src/main/java/com/google/protobuf/FieldSet.java (+512/-524)
java/src/main/java/com/google/protobuf/GeneratedMessage.java (+284/-248)
java/src/main/java/com/google/protobuf/GeneratedMessageLite.java (+539/-0)
java/src/main/java/com/google/protobuf/Internal.java (+121/-0)
java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java (+3/-1)
java/src/main/java/com/google/protobuf/Message.java (+32/-217)
java/src/main/java/com/google/protobuf/MessageLite.java (+331/-0)
java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java (+0/-58)
java/src/main/java/com/google/protobuf/RpcUtil.java (+8/-5)
java/src/main/java/com/google/protobuf/ServiceException.java (+0/-42)
java/src/main/java/com/google/protobuf/TextFormat.java (+165/-133)
java/src/main/java/com/google/protobuf/UninitializedMessageException.java (+12/-73)
java/src/main/java/com/google/protobuf/UnknownFieldSet.java (+257/-115)
java/src/main/java/com/google/protobuf/WireFormat.java (+64/-34)
java/src/test/java/com/google/protobuf/DescriptorsTest.java (+38/-0)
java/src/test/java/com/google/protobuf/DynamicMessageTest.java (+12/-0)
java/src/test/java/com/google/protobuf/GeneratedMessageTest.java (+89/-0)
java/src/test/java/com/google/protobuf/LiteTest.java (+114/-0)
java/src/test/java/com/google/protobuf/TestUtil.java (+945/-86)
java/src/test/java/com/google/protobuf/TextFormatTest.java (+22/-3)
java/src/test/java/com/google/protobuf/WireFormatTest.java (+65/-0)
m4/acx_check_suncc.m4 (+0/-33)
protobuf-lite.pc.in (+13/-0)
protobuf.pc.in (+13/-0)
python/google/protobuf/internal/containers.py (+6/-2)
python/google/protobuf/internal/decoder.py (+2/-2)
python/google/protobuf/internal/decoder_test.py (+11/-7)
python/google/protobuf/internal/encoder.py (+4/-2)
python/google/protobuf/internal/encoder_test.py (+8/-4)
python/google/protobuf/internal/message_test.py (+53/-0)
python/google/protobuf/internal/reflection_test.py (+84/-4)
python/google/protobuf/internal/test_util.py (+197/-1)
python/google/protobuf/internal/text_format_test.py (+278/-3)
python/google/protobuf/internal/type_checkers.py (+4/-2)
python/google/protobuf/internal/wire_format.py (+2/-0)
python/google/protobuf/message.py (+1/-2)
python/google/protobuf/reflection.py (+56/-10)
python/google/protobuf/service.py (+3/-2)
python/google/protobuf/text_format.py (+526/-1)
python/setup.py (+1/-1)
src/Makefile.am (+52/-17)
src/Makefile.in (+407/-139)
src/google/protobuf/compiler/code_generator.cc (+22/-0)
src/google/protobuf/compiler/code_generator.h (+11/-0)
src/google/protobuf/compiler/cpp/cpp_enum.cc (+51/-28)
src/google/protobuf/compiler/cpp/cpp_enum.h (+4/-0)
src/google/protobuf/compiler/cpp/cpp_enum_field.cc (+52/-55)
src/google/protobuf/compiler/cpp/cpp_extension.cc (+1/-0)
src/google/protobuf/compiler/cpp/cpp_field.cc (+19/-0)
src/google/protobuf/compiler/cpp/cpp_field.h (+10/-0)
src/google/protobuf/compiler/cpp/cpp_file.cc (+196/-145)
src/google/protobuf/compiler/cpp/cpp_generator.cc (+1/-28)
src/google/protobuf/compiler/cpp/cpp_helpers.cc (+21/-2)
src/google/protobuf/compiler/cpp/cpp_helpers.h (+29/-0)
src/google/protobuf/compiler/cpp/cpp_message.cc (+361/-209)
src/google/protobuf/compiler/cpp/cpp_message.h (+4/-5)
src/google/protobuf/compiler/cpp/cpp_message_field.cc (+29/-38)
src/google/protobuf/compiler/cpp/cpp_primitive_field.cc (+49/-60)
src/google/protobuf/compiler/cpp/cpp_service.cc (+1/-1)
src/google/protobuf/compiler/cpp/cpp_string_field.cc (+84/-45)
src/google/protobuf/compiler/cpp/cpp_unittest.cc (+54/-6)
src/google/protobuf/compiler/java/java_enum.cc (+88/-68)
src/google/protobuf/compiler/java/java_enum_field.cc (+26/-17)
src/google/protobuf/compiler/java/java_extension.cc (+85/-14)
src/google/protobuf/compiler/java/java_file.cc (+50/-9)
src/google/protobuf/compiler/java/java_file.h (+2/-0)
src/google/protobuf/compiler/java/java_generator.cc (+1/-27)
src/google/protobuf/compiler/java/java_helpers.cc (+67/-0)
src/google/protobuf/compiler/java/java_helpers.h (+30/-0)
src/google/protobuf/compiler/java/java_message.cc (+290/-191)
src/google/protobuf/compiler/java/java_primitive_field.cc (+21/-80)
src/google/protobuf/compiler/parser.cc (+1/-1)
src/google/protobuf/descriptor.cc (+65/-13)
src/google/protobuf/descriptor.pb.cc (+1224/-843)
src/google/protobuf/descriptor.pb.h (+127/-74)
src/google/protobuf/descriptor.proto (+9/-2)
src/google/protobuf/descriptor_unittest.cc (+145/-0)
src/google/protobuf/dynamic_message.cc (+43/-41)
src/google/protobuf/extension_set.cc (+509/-281)
src/google/protobuf/extension_set.h (+110/-47)
src/google/protobuf/extension_set_heavy.cc (+221/-0)
src/google/protobuf/generated_message_reflection.cc (+317/-47)
src/google/protobuf/generated_message_reflection.h (+17/-14)
src/google/protobuf/generated_message_reflection_unittest.cc (+116/-0)
src/google/protobuf/generated_message_util.cc (+44/-0)
src/google/protobuf/generated_message_util.h (+65/-0)
src/google/protobuf/io/coded_stream.cc (+46/-50)
src/google/protobuf/io/coded_stream.h (+46/-0)
src/google/protobuf/io/gzip_stream.cc (+0/-296)
src/google/protobuf/io/gzip_stream.h (+0/-178)
src/google/protobuf/io/gzip_stream_unittest.sh (+0/-44)
src/google/protobuf/io/tokenizer.cc (+1/-1)
src/google/protobuf/io/tokenizer_unittest.cc (+1/-0)
src/google/protobuf/io/zero_copy_stream_impl.cc (+0/-345)
src/google/protobuf/io/zero_copy_stream_impl.h (+4/-284)
src/google/protobuf/io/zero_copy_stream_impl_lite.cc (+393/-0)
src/google/protobuf/io/zero_copy_stream_impl_lite.h (+340/-0)
src/google/protobuf/io/zero_copy_stream_unittest.cc (+66/-0)
src/google/protobuf/lite_unittest.cc (+112/-0)
src/google/protobuf/message.cc (+27/-177)
src/google/protobuf/message.h (+87/-157)
src/google/protobuf/message_lite.cc (+293/-0)
src/google/protobuf/message_lite.h (+239/-0)
src/google/protobuf/message_unittest.cc (+0/-30)
src/google/protobuf/repeated_field.cc (+38/-17)
src/google/protobuf/repeated_field.h (+432/-353)
src/google/protobuf/stubs/common.cc (+38/-15)
src/google/protobuf/stubs/common.h (+26/-18)
src/google/protobuf/stubs/map-util.cc (+0/-42)
src/google/protobuf/stubs/once.cc (+0/-82)
src/google/protobuf/stubs/once.h (+0/-122)
src/google/protobuf/stubs/once_unittest.cc (+0/-253)
src/google/protobuf/stubs/stl_util-inl.cc (+0/-41)
src/google/protobuf/test_util.cc (+321/-6)
src/google/protobuf/test_util.h (+15/-0)
src/google/protobuf/test_util_lite.cc (+1502/-0)
src/google/protobuf/test_util_lite.h (+101/-0)
src/google/protobuf/testing/zcgunzip.cc (+0/-73)
src/google/protobuf/testing/zcgzip.cc (+0/-79)
src/google/protobuf/text_format.cc (+48/-16)
src/google/protobuf/text_format.h (+12/-0)
src/google/protobuf/text_format_unittest.cc (+117/-3)
src/google/protobuf/unittest.proto (+10/-0)
src/google/protobuf/unittest_custom_options.proto (+2/-0)
src/google/protobuf/unittest_empty.proto (+0/-37)
src/google/protobuf/unittest_enormous_descriptor.proto (+1045/-0)
src/google/protobuf/unittest_import_lite.proto (+49/-0)
src/google/protobuf/unittest_lite.proto (+312/-0)
src/google/protobuf/unittest_lite_imports_nonlite.proto (+43/-0)
src/google/protobuf/wire_format.cc (+161/-145)
src/google/protobuf/wire_format.h (+96/-366)
src/google/protobuf/wire_format_inl.h (+0/-687)
src/google/protobuf/wire_format_lite.cc (+192/-0)
src/google/protobuf/wire_format_lite.h (+558/-0)
src/google/protobuf/wire_format_lite_inl.h (+657/-0)
src/google/protobuf/wire_format_unittest.cc (+51/-12)
vsprojects/extract_includes.bat (+5/-1)
vsprojects/libprotobuf-lite.vcproj (+270/-0)
vsprojects/libprotobuf.vcproj (+37/-9)
vsprojects/lite-test.vcproj (+273/-0)
vsprojects/protobuf.sln (+16/-0)
vsprojects/readme.txt (+6/-3)
vsprojects/tests.vcproj (+32/-0)