← Back to branch summary

~ubuntu-branches/ubuntu/precise/protobuf/precise

~ubuntu-branches/ubuntu/precise/protobuf/precise

Viewing all changes in revision 17.

Committer: Package Import Robot
Author(s): Michael Terry
Date: 2011-12-01 16:08:20 UTC
mfrom: (2.2.9 sid)
Revision ID: package-import@ubuntu.com-20111201160820-fcsdfvulz5seu6ij

Tags: 2.4.1-1ubuntu1

* Merge from Debian testing.  Remaining changes:
  - Switch to dh_python2
  - Fix linking with -lpthread

files added:
.pc/revert_upstream_issue_388_about_rpath.diff

.pc/revert_upstream_issue_388_about_rpath.diff/python

.pc/revert_upstream_issue_388_about_rpath.diff/python/README.txt

.pc/revert_upstream_issue_388_about_rpath.diff/python/setup.py

debian/libprotobuf-java.poms

debian/patches/revert_upstream_issue_388_about_rpath.diff

files removed:
.pc/autogen.diff

.pc/autogen.diff/Makefile.in

.pc/autogen.diff/aclocal.m4

.pc/autogen.diff/config.guess

.pc/autogen.diff/config.sub

.pc/autogen.diff/configure

.pc/autogen.diff/gtest

.pc/autogen.diff/gtest/Makefile.in

.pc/autogen.diff/gtest/aclocal.m4

.pc/autogen.diff/gtest/build-aux

.pc/autogen.diff/gtest/build-aux/config.guess

.pc/autogen.diff/gtest/build-aux/config.sub

.pc/autogen.diff/gtest/build-aux/ltmain.sh

.pc/autogen.diff/gtest/configure

.pc/autogen.diff/ltmain.sh

.pc/autogen.diff/m4

.pc/autogen.diff/m4/libtool.m4

.pc/autogen.diff/m4/ltoptions.m4

.pc/autogen.diff/m4/ltversion.m4

.pc/autogen.diff/m4/lt~obsolete.m4

.pc/autogen.diff/src

.pc/autogen.diff/src/Makefile.in

debian/ant-wrapper

debian/libprotobuf-java.install

debian/libprotobuf-java.links

debian/patches/autogen.diff

files modified:
.pc/applied-patches

CHANGES.txt

Makefile.in

aclocal.m4

config.guess

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/java-build.xml

debian/patches/disable-setuptools-download.diff

debian/patches/series

debian/pkg-test.sh *

debian/rules

gtest/Makefile.in

gtest/aclocal.m4

gtest/build-aux/config.guess

gtest/build-aux/config.sub

gtest/build-aux/ltmain.sh

gtest/configure

java/pom.xml

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

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

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

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

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

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

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

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

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

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

java/src/test/java/com/google/protobuf/test_bad_identifiers.proto

ltmain.sh

m4/libtool.m4

m4/ltoptions.m4

m4/ltversion.m4

m4/lt~obsolete.m4

python/setup.py

src/Makefile.in

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

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

src/google/protobuf/compiler/plugin.pb.h

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/stubs/common.h

vsprojects/extract_includes.bat

Show diffs side-by-side

added added

removed removed

.pc/applied-patches

.pc/autogen.diff/

.pc/autogen.diff/Makefile.in

.pc/autogen.diff/aclocal.m4

.pc/autogen.diff/config.guess

.pc/autogen.diff/config.sub

.pc/autogen.diff/configure

.pc/autogen.diff/gtest/

.pc/autogen.diff/gtest/Makefile.in

.pc/autogen.diff/gtest/aclocal.m4

.pc/autogen.diff/gtest/build-aux/

.pc/autogen.diff/gtest/build-aux/config.guess

.pc/autogen.diff/gtest/build-aux/config.sub

.pc/autogen.diff/gtest/build-aux/ltmain.sh

.pc/autogen.diff/gtest/configure

.pc/autogen.diff/ltmain.sh

.pc/autogen.diff/m4/

.pc/autogen.diff/m4/libtool.m4

.pc/autogen.diff/m4/ltoptions.m4

.pc/autogen.diff/m4/ltversion.m4

.pc/autogen.diff/m4/lt~obsolete.m4

.pc/autogen.diff/src/

.pc/autogen.diff/src/Makefile.in

.pc/revert_upstream_issue_388_about_rpath.diff/

.pc/revert_upstream_issue_388_about_rpath.diff/python/

.pc/revert_upstream_issue_388_about_rpath.diff/python/README.txt

.pc/revert_upstream_issue_388_about_rpath.diff/python/setup.py

debian/ant-wrapper

debian/changelog

debian/java-build.xml

debian/libprotobuf-java.install

debian/libprotobuf-java.links

debian/libprotobuf-java.poms

debian/patches/autogen.diff

debian/patches/disable-setuptools-download.diff

debian/patches/revert_upstream_issue_388_about_rpath.diff

debian/patches/series

debian/pkg-test.sh

gtest/Makefile.in

gtest/aclocal.m4

gtest/build-aux/config.guess

gtest/build-aux/config.sub

gtest/build-aux/ltmain.sh

gtest/configure

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

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

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

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

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

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

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

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

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

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

java/src/test/java/com/google/protobuf/test_bad_identifiers.proto

m4/ltoptions.m4

m4/ltversion.m4

m4/lt~obsolete.m4

python/setup.py

src/Makefile.in

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

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

src/google/protobuf/compiler/plugin.pb.h

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/stubs/common.h

vsprojects/extract_includes.bat

Older »