lp://staging/ubuntu/maverick/protobuf

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12. By Elliot Murphy on 2010-06-08

* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - Don't use python2.4 (refreshed this patch)

11. By Steve Kowalik on 2010-02-11

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

10. By Steve Kowalik on 2009-11-16

* Merge from Debian testing.
* Remaining Ubuntu changes:
  - Disable the death tests on IA64, now as a quilt patch.
  - Don't use python2.4, also as a quilt patch.

9. By Loïc Minier on 2009-10-21

No change rebuild to fix misbuilt binaries on armel.

8. By Michael Vogt on 2009-06-04

* Merge from debian unstable, remaining changes:
  - src/google/protobuf/compiler/python/python_generator.cc:
    do not hardcode python2.4
  - src/gtest/internal/gtest-port.h
     disable death tests if architecture is IA64

7. By Brian Murray on 2009-03-26

src/google/protobuf/compiler/python/python_generator.cc:
removed line in code generator that added "#!/usr/bin/python2.4"
to every python file created, (LP: #348243) should be fixed in
upstream revision 2.0.4.

6. By Manny Vindiola on 2008-12-18

* Merge from new upstream version (LP: #309237), remaining changes:
   * debian/control Moving python-support from Build-Depends-Indep
     to Build-Depends to fix build failures.
* Fix FTBFS on ia64 architecture due to lack of clone(2)
   - src/gtest/internal/gtest-port.h (LP: #308829)
     disable death tests if architecture is IA64
     adapted from gtest upstream fix at:
     http://codereview.appspot.com/8690/show
* Fix FTBFS on x64 architectures due to python 2.x int vs long issue
  test expects return type long but on x64 architecture return type
  unpacks to int
   -python/google/protobuf/internal/decoder_test.py
    explicitly type the result value as long
   taken from upstream discussion:
   http://groups.google.com/group/protobuf/browse_thread
       /thread/2357176cb1f50e10/

5. By Manny Vindiola on 2008-11-26

* Merge from debian unstable (LP: #302680), remaining changes:
  + debian/control Moving python-support from Build-Depends-Indep
    to Build-Depends to fix build failures.
    change kept from 2.0.0~b-3ubuntu1

4. By Elliot Murphy on 2008-09-23

* src/google/protobuf/compiler/cpp/cpp_enum.cc: added patch to stop
  generating trailing comma after enum definition. (Going to be applied
  upstream soon: http://tinyurl.com/3l72co) (LP: #264124)
* src/google/protobuf/descriptor.pb.h: Run 'bash
  generate_descriptor_proto.sh'.

3. By Elliot Murphy on 2008-08-29

Moving python-support from Build-Depends-Indep to Build-Depends to
fix build failures. (LP: #262665)