Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/oneiric/protobuf
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches

Recent revisions

16. By Barry Warsaw

Switch to dh_python2. (LP: #788514)

15. By Matthias Klose

* Merge with Debian; remaining changes:
  - Fix linking with -lpthread.

14. By Matthias Klose

Fix linking with -lpthread. LP: #688819.

13. By Michael Vogt

* Merge from debian unstable. Remaining changes:
  - Don't use python2.4 use python instead (submited to Debian
    as Bug#600261)

12. By Elliot Murphy

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

11. By Steve Kowalik

* 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

* 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

No change rebuild to fix misbuilt binaries on armel.

8. By Michael Vogt

* 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

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.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.