← Back to branch summary

~ubuntu-branches/ubuntu/maverick/protobuf/maverick

~ubuntu-branches/ubuntu/maverick/protobuf/maverick

Viewing all changes in revision 11.

Committer: Bazaar Package Importer
Author(s): Steve Kowalik
Date: 2010-02-11 11:13:19 UTC
mfrom: (2.2.2 squeeze)
Revision ID: james.westby@ubuntu.com-20100211111319-zdn8hmw0gh8s4cf8

Tags: 2.2.0a-0.1ubuntu1

* Merge from Debian testing.
* Remaining Ubuntu changes:
- Don't use python2.4.
* Ubuntu changes dropped:
- Disable death tests on Itanium, fixed upstream.

files added:
debian/libprotobuf5.install

debian/libprotobuf5.shlibs

debian/libprotoc5.install

debian/libprotoc5.shlibs

gtest/include/gtest/internal/gtest-tuple.h

gtest/include/gtest/internal/gtest-tuple.h.pump

gtest/test/gtest-tuple_test.cc

gtest/test/gtest-unittest-api_test.cc

java/src/main/java/com/google/protobuf/AbstractMessageLite.java

java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java

java/src/main/java/com/google/protobuf/GeneratedMessageLite.java

java/src/main/java/com/google/protobuf/Internal.java

java/src/main/java/com/google/protobuf/MessageLite.java

java/src/test/java/com/google/protobuf/LiteTest.java

protobuf-lite.pc.in

protobuf.pc.in

python/google/protobuf/internal/message_test.py

src/google/protobuf/extension_set_heavy.cc

src/google/protobuf/generated_message_util.cc

src/google/protobuf/generated_message_util.h

src/google/protobuf/io/zero_copy_stream_impl_lite.cc

src/google/protobuf/io/zero_copy_stream_impl_lite.h

src/google/protobuf/lite_unittest.cc

src/google/protobuf/message_lite.cc

src/google/protobuf/message_lite.h

src/google/protobuf/test_util_lite.cc

src/google/protobuf/test_util_lite.h

src/google/protobuf/unittest_enormous_descriptor.proto

src/google/protobuf/unittest_import_lite.proto

src/google/protobuf/unittest_lite.proto

src/google/protobuf/unittest_lite_imports_nonlite.proto

src/google/protobuf/wire_format_lite.cc

src/google/protobuf/wire_format_lite.h

src/google/protobuf/wire_format_lite_inl.h

vsprojects/libprotobuf-lite.vcproj

vsprojects/lite-test.vcproj

files removed:
debian/libprotobuf4.install

debian/libprotoc4.install

src/google/protobuf/stubs/map-util.cc

src/google/protobuf/stubs/stl_util-inl.cc

src/google/protobuf/wire_format_inl.h

files modified:
CHANGES.txt

CONTRIBUTORS.txt

Makefile.am

Makefile.in

README.txt

autogen.sh

configure

configure.ac

debian/changelog

debian/control

debian/java-build.xml

debian/libprotobuf-dev.install

debian/libprotobuf-java.links

debian/patches/series

debian/rules

editors/protobuf-mode.el

examples/Makefile

examples/add_person.cc

examples/list_people.cc

generate_descriptor_proto.sh

gtest/Makefile.am

gtest/Makefile.in

gtest/README

gtest/include/gtest/gtest-death-test.h

gtest/include/gtest/gtest-message.h

gtest/include/gtest/gtest-param-test.h

gtest/include/gtest/gtest-test-part.h

gtest/include/gtest/gtest.h

gtest/include/gtest/internal/gtest-internal.h

gtest/include/gtest/internal/gtest-port.h

gtest/include/gtest/internal/gtest-type-util.h

gtest/include/gtest/internal/gtest-type-util.h.pump

gtest/scons/SConscript

gtest/src/gtest-death-test.cc

gtest/src/gtest-internal-inl.h

gtest/src/gtest-port.cc

gtest/src/gtest-test-part.cc

gtest/src/gtest-typed-test.cc

gtest/src/gtest.cc

gtest/test/gtest-death-test_test.cc

gtest/test/gtest-filepath_test.cc

gtest/test/gtest-param-test_test.cc

gtest/test/gtest-port_test.cc

gtest/test/gtest-test-part_test.cc

gtest/test/gtest-typed-test_test.cc

gtest/test/gtest-typed-test_test.h

gtest/test/gtest_break_on_failure_unittest.py

gtest/test/gtest_color_test.py

gtest/test/gtest_env_var_test.py

gtest/test/gtest_filter_unittest.py

gtest/test/gtest_filter_unittest_.cc

gtest/test/gtest_help_test.py

gtest/test/gtest_list_tests_unittest.py

gtest/test/gtest_list_tests_unittest_.cc

gtest/test/gtest_nc_test.py

gtest/test/gtest_output_test.py

gtest/test/gtest_output_test_.cc

gtest/test/gtest_output_test_golden_lin.txt

gtest/test/gtest_output_test_golden_win.txt

gtest/test/gtest_stress_test.cc

gtest/test/gtest_test_utils.py

gtest/test/gtest_throw_on_failure_test.py

gtest/test/gtest_uninitialized_test.py

gtest/test/gtest_unittest.cc

gtest/test/gtest_xml_outfiles_test.py

gtest/test/gtest_xml_output_unittest.py

gtest/test/gtest_xml_test_utils.py

java/README.txt

java/pom.xml

java/src/main/java/com/google/protobuf/AbstractMessage.java

java/src/main/java/com/google/protobuf/ByteString.java

java/src/main/java/com/google/protobuf/CodedInputStream.java

java/src/main/java/com/google/protobuf/CodedOutputStream.java

java/src/main/java/com/google/protobuf/Descriptors.java

java/src/main/java/com/google/protobuf/DynamicMessage.java

java/src/main/java/com/google/protobuf/ExtensionRegistry.java

java/src/main/java/com/google/protobuf/FieldSet.java

java/src/main/java/com/google/protobuf/GeneratedMessage.java

java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java

java/src/main/java/com/google/protobuf/Message.java

java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java

java/src/main/java/com/google/protobuf/RpcUtil.java

java/src/main/java/com/google/protobuf/ServiceException.java

java/src/main/java/com/google/protobuf/TextFormat.java

java/src/main/java/com/google/protobuf/UninitializedMessageException.java

java/src/main/java/com/google/protobuf/UnknownFieldSet.java

java/src/main/java/com/google/protobuf/WireFormat.java

java/src/test/java/com/google/protobuf/DescriptorsTest.java

java/src/test/java/com/google/protobuf/DynamicMessageTest.java

java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

java/src/test/java/com/google/protobuf/TestUtil.java

java/src/test/java/com/google/protobuf/TextFormatTest.java

java/src/test/java/com/google/protobuf/WireFormatTest.java

m4/acx_check_suncc.m4

python/google/protobuf/internal/containers.py

python/google/protobuf/internal/decoder.py

python/google/protobuf/internal/decoder_test.py

python/google/protobuf/internal/encoder.py

python/google/protobuf/internal/encoder_test.py

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/internal/test_util.py

python/google/protobuf/internal/text_format_test.py

python/google/protobuf/internal/type_checkers.py

python/google/protobuf/internal/wire_format.py

python/google/protobuf/message.py

python/google/protobuf/reflection.py

python/google/protobuf/service.py

python/google/protobuf/text_format.py

python/setup.py

src/Makefile.am

src/Makefile.in

src/google/protobuf/compiler/code_generator.cc

src/google/protobuf/compiler/code_generator.h

src/google/protobuf/compiler/cpp/cpp_enum.cc

src/google/protobuf/compiler/cpp/cpp_enum.h

src/google/protobuf/compiler/cpp/cpp_enum_field.cc

src/google/protobuf/compiler/cpp/cpp_extension.cc

src/google/protobuf/compiler/cpp/cpp_field.cc

src/google/protobuf/compiler/cpp/cpp_field.h

src/google/protobuf/compiler/cpp/cpp_file.cc

src/google/protobuf/compiler/cpp/cpp_generator.cc

src/google/protobuf/compiler/cpp/cpp_helpers.cc

src/google/protobuf/compiler/cpp/cpp_helpers.h

src/google/protobuf/compiler/cpp/cpp_message.cc

src/google/protobuf/compiler/cpp/cpp_message.h

src/google/protobuf/compiler/cpp/cpp_message_field.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

src/google/protobuf/compiler/cpp/cpp_service.cc

src/google/protobuf/compiler/cpp/cpp_string_field.cc

src/google/protobuf/compiler/cpp/cpp_unittest.cc

src/google/protobuf/compiler/java/java_enum.cc

src/google/protobuf/compiler/java/java_enum_field.cc

src/google/protobuf/compiler/java/java_extension.cc

src/google/protobuf/compiler/java/java_file.cc

src/google/protobuf/compiler/java/java_file.h

src/google/protobuf/compiler/java/java_generator.cc

src/google/protobuf/compiler/java/java_helpers.cc

src/google/protobuf/compiler/java/java_helpers.h

src/google/protobuf/compiler/java/java_message.cc

src/google/protobuf/compiler/java/java_primitive_field.cc

src/google/protobuf/compiler/parser.cc

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.pb.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/descriptor.proto

src/google/protobuf/descriptor_unittest.cc

src/google/protobuf/dynamic_message.cc

src/google/protobuf/extension_set.cc

src/google/protobuf/extension_set.h

src/google/protobuf/generated_message_reflection.cc

src/google/protobuf/generated_message_reflection.h

src/google/protobuf/generated_message_reflection_unittest.cc

src/google/protobuf/io/coded_stream.cc

src/google/protobuf/io/coded_stream.h

src/google/protobuf/io/gzip_stream.cc

src/google/protobuf/io/gzip_stream.h

src/google/protobuf/io/tokenizer.cc

src/google/protobuf/io/tokenizer_unittest.cc

src/google/protobuf/io/zero_copy_stream_impl.cc

src/google/protobuf/io/zero_copy_stream_impl.h

src/google/protobuf/io/zero_copy_stream_unittest.cc

src/google/protobuf/message.cc

src/google/protobuf/message.h

src/google/protobuf/message_unittest.cc

src/google/protobuf/repeated_field.cc

src/google/protobuf/repeated_field.h

src/google/protobuf/stubs/common.cc

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/once.cc

src/google/protobuf/stubs/once.h

src/google/protobuf/test_util.cc

src/google/protobuf/test_util.h

src/google/protobuf/text_format.cc

src/google/protobuf/text_format.h

src/google/protobuf/text_format_unittest.cc

src/google/protobuf/unittest.proto

src/google/protobuf/unittest_custom_options.proto

src/google/protobuf/wire_format.cc

src/google/protobuf/wire_format.h

src/google/protobuf/wire_format_unittest.cc

vsprojects/extract_includes.bat

vsprojects/libprotobuf.vcproj

vsprojects/protobuf.sln

vsprojects/readme.txt

vsprojects/tests.vcproj

Show diffs side-by-side

added added

removed removed

CONTRIBUTORS.txt

debian/changelog

debian/java-build.xml

debian/libprotobuf-dev.install

debian/libprotobuf-java.links

debian/libprotobuf4.install

debian/libprotobuf5.install

debian/libprotobuf5.shlibs

debian/libprotoc4.install

debian/libprotoc5.install

debian/libprotoc5.shlibs

debian/patches/series

editors/protobuf-mode.el

examples/Makefile

examples/add_person.cc

examples/list_people.cc

generate_descriptor_proto.sh

gtest/Makefile.am

gtest/Makefile.in

gtest/include/gtest/gtest-death-test.h

gtest/include/gtest/gtest-message.h

gtest/include/gtest/gtest-param-test.h

gtest/include/gtest/gtest-test-part.h

gtest/include/gtest/gtest.h

gtest/include/gtest/internal/gtest-internal.h

gtest/include/gtest/internal/gtest-port.h

gtest/include/gtest/internal/gtest-tuple.h

gtest/include/gtest/internal/gtest-tuple.h.pump

gtest/include/gtest/internal/gtest-type-util.h

gtest/include/gtest/internal/gtest-type-util.h.pump

gtest/scons/SConscript

gtest/src/gtest-death-test.cc

gtest/src/gtest-internal-inl.h

gtest/src/gtest-port.cc

gtest/src/gtest-test-part.cc

gtest/src/gtest-typed-test.cc

gtest/src/gtest.cc

gtest/test/gtest-death-test_test.cc

gtest/test/gtest-filepath_test.cc

gtest/test/gtest-param-test_test.cc

gtest/test/gtest-port_test.cc

gtest/test/gtest-test-part_test.cc

gtest/test/gtest-tuple_test.cc

gtest/test/gtest-typed-test_test.cc

gtest/test/gtest-typed-test_test.h

gtest/test/gtest-unittest-api_test.cc

gtest/test/gtest_break_on_failure_unittest.py

gtest/test/gtest_color_test.py

gtest/test/gtest_env_var_test.py

gtest/test/gtest_filter_unittest.py

gtest/test/gtest_filter_unittest_.cc

gtest/test/gtest_help_test.py

gtest/test/gtest_list_tests_unittest.py

gtest/test/gtest_list_tests_unittest_.cc

gtest/test/gtest_nc_test.py

gtest/test/gtest_output_test.py

gtest/test/gtest_output_test_.cc

gtest/test/gtest_output_test_golden_lin.txt

gtest/test/gtest_output_test_golden_win.txt

gtest/test/gtest_stress_test.cc

gtest/test/gtest_test_utils.py

gtest/test/gtest_throw_on_failure_test.py

gtest/test/gtest_uninitialized_test.py

gtest/test/gtest_unittest.cc

gtest/test/gtest_xml_outfiles_test.py

gtest/test/gtest_xml_output_unittest.py

gtest/test/gtest_xml_test_utils.py

java/README.txt

java/src/main/java/com/google/protobuf/AbstractMessage.java

java/src/main/java/com/google/protobuf/AbstractMessageLite.java

java/src/main/java/com/google/protobuf/ByteString.java

java/src/main/java/com/google/protobuf/CodedInputStream.java

java/src/main/java/com/google/protobuf/CodedOutputStream.java

java/src/main/java/com/google/protobuf/Descriptors.java

java/src/main/java/com/google/protobuf/DynamicMessage.java

java/src/main/java/com/google/protobuf/ExtensionRegistry.java

java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java

java/src/main/java/com/google/protobuf/FieldSet.java

java/src/main/java/com/google/protobuf/GeneratedMessage.java

java/src/main/java/com/google/protobuf/GeneratedMessageLite.java

java/src/main/java/com/google/protobuf/Internal.java

java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java

java/src/main/java/com/google/protobuf/Message.java

java/src/main/java/com/google/protobuf/MessageLite.java

java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java

java/src/main/java/com/google/protobuf/RpcUtil.java

java/src/main/java/com/google/protobuf/ServiceException.java

java/src/main/java/com/google/protobuf/TextFormat.java

java/src/main/java/com/google/protobuf/UninitializedMessageException.java

java/src/main/java/com/google/protobuf/UnknownFieldSet.java

java/src/main/java/com/google/protobuf/WireFormat.java

java/src/test/java/com/google/protobuf/DescriptorsTest.java

java/src/test/java/com/google/protobuf/DynamicMessageTest.java

java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

java/src/test/java/com/google/protobuf/LiteTest.java

java/src/test/java/com/google/protobuf/TestUtil.java

java/src/test/java/com/google/protobuf/TextFormatTest.java

java/src/test/java/com/google/protobuf/WireFormatTest.java

m4/acx_check_suncc.m4

protobuf-lite.pc.in

python/google/protobuf/internal/containers.py

python/google/protobuf/internal/decoder.py

python/google/protobuf/internal/decoder_test.py

python/google/protobuf/internal/encoder.py

python/google/protobuf/internal/encoder_test.py

python/google/protobuf/internal/message_test.py

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/internal/test_util.py

python/google/protobuf/internal/text_format_test.py

python/google/protobuf/internal/type_checkers.py

python/google/protobuf/internal/wire_format.py

python/google/protobuf/message.py

python/google/protobuf/reflection.py

python/google/protobuf/service.py

python/google/protobuf/text_format.py

python/setup.py

src/Makefile.am

src/Makefile.in

src/google/protobuf/compiler/code_generator.cc

src/google/protobuf/compiler/code_generator.h

src/google/protobuf/compiler/cpp/cpp_enum.cc

src/google/protobuf/compiler/cpp/cpp_enum.h

src/google/protobuf/compiler/cpp/cpp_enum_field.cc

src/google/protobuf/compiler/cpp/cpp_extension.cc

src/google/protobuf/compiler/cpp/cpp_field.cc

src/google/protobuf/compiler/cpp/cpp_field.h

src/google/protobuf/compiler/cpp/cpp_file.cc

src/google/protobuf/compiler/cpp/cpp_generator.cc

src/google/protobuf/compiler/cpp/cpp_helpers.cc

src/google/protobuf/compiler/cpp/cpp_helpers.h

src/google/protobuf/compiler/cpp/cpp_message.cc

src/google/protobuf/compiler/cpp/cpp_message.h

src/google/protobuf/compiler/cpp/cpp_message_field.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

src/google/protobuf/compiler/cpp/cpp_service.cc

src/google/protobuf/compiler/cpp/cpp_string_field.cc

src/google/protobuf/compiler/cpp/cpp_unittest.cc

src/google/protobuf/compiler/java/java_enum.cc

src/google/protobuf/compiler/java/java_enum_field.cc

src/google/protobuf/compiler/java/java_extension.cc

src/google/protobuf/compiler/java/java_file.cc

src/google/protobuf/compiler/java/java_file.h

src/google/protobuf/compiler/java/java_generator.cc

src/google/protobuf/compiler/java/java_helpers.cc

src/google/protobuf/compiler/java/java_helpers.h

src/google/protobuf/compiler/java/java_message.cc

src/google/protobuf/compiler/java/java_primitive_field.cc

src/google/protobuf/compiler/parser.cc

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.pb.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/descriptor.proto

src/google/protobuf/descriptor_unittest.cc

src/google/protobuf/dynamic_message.cc

src/google/protobuf/extension_set.cc

src/google/protobuf/extension_set.h

src/google/protobuf/extension_set_heavy.cc

src/google/protobuf/generated_message_reflection.cc

src/google/protobuf/generated_message_reflection.h

src/google/protobuf/generated_message_reflection_unittest.cc

src/google/protobuf/generated_message_util.cc

src/google/protobuf/generated_message_util.h

src/google/protobuf/io/coded_stream.cc

src/google/protobuf/io/coded_stream.h

src/google/protobuf/io/gzip_stream.cc

src/google/protobuf/io/gzip_stream.h

src/google/protobuf/io/tokenizer.cc

src/google/protobuf/io/tokenizer_unittest.cc

src/google/protobuf/io/zero_copy_stream_impl.cc

src/google/protobuf/io/zero_copy_stream_impl.h

src/google/protobuf/io/zero_copy_stream_impl_lite.cc

src/google/protobuf/io/zero_copy_stream_impl_lite.h

src/google/protobuf/io/zero_copy_stream_unittest.cc

src/google/protobuf/lite_unittest.cc

src/google/protobuf/message.cc

src/google/protobuf/message.h

src/google/protobuf/message_lite.cc

src/google/protobuf/message_lite.h

src/google/protobuf/message_unittest.cc

src/google/protobuf/repeated_field.cc

src/google/protobuf/repeated_field.h

src/google/protobuf/stubs/common.cc

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/map-util.cc

src/google/protobuf/stubs/once.cc

src/google/protobuf/stubs/once.h

src/google/protobuf/stubs/stl_util-inl.cc

src/google/protobuf/test_util.cc

src/google/protobuf/test_util.h

src/google/protobuf/test_util_lite.cc

src/google/protobuf/test_util_lite.h

src/google/protobuf/text_format.cc

src/google/protobuf/text_format.h

src/google/protobuf/text_format_unittest.cc

src/google/protobuf/unittest.proto

src/google/protobuf/unittest_custom_options.proto

src/google/protobuf/unittest_enormous_descriptor.proto

src/google/protobuf/unittest_import_lite.proto

src/google/protobuf/unittest_lite.proto

src/google/protobuf/unittest_lite_imports_nonlite.proto

src/google/protobuf/wire_format.cc

src/google/protobuf/wire_format.h

src/google/protobuf/wire_format_inl.h

src/google/protobuf/wire_format_lite.cc

src/google/protobuf/wire_format_lite.h

src/google/protobuf/wire_format_lite_inl.h

src/google/protobuf/wire_format_unittest.cc

vsprojects/extract_includes.bat

vsprojects/libprotobuf-lite.vcproj

vsprojects/libprotobuf.vcproj

vsprojects/lite-test.vcproj

vsprojects/protobuf.sln

vsprojects/readme.txt

vsprojects/tests.vcproj

Older »