Ok closing this bug then.
** Changed in: protobuf (Ubuntu)
Status: Incomplete = Fix Released
--
Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
https://bugs.launchpad.net/bugs/502654
You received this bug notification because you are a member of Ubuntu
Bugs, which is
I ran into https://bugs.launchpad.net/bzr/+bug/522041
Can you provide a debdiff please?
** Changed in: protobuf (Ubuntu)
Status: New = Incomplete
--
Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
https://bugs.launchpad.net/bugs/502654
You received this bug
It looks like this merge has already occurred, but Debian now has
2.3.0-1.
--
Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
https://bugs.launchpad.net/bugs/502654
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
Something went wrong with this:
$ bzr merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654
Warning: criss-cross merge encountered. See bzr help criss-cross.
+N debian/patches/
Do you have a plain debdiff between current Debian and the merge? That's
much easier to review/upload.
--
Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
https://bugs.launchpad.net/bugs/502654
You received this bug notification because you are a member of Ubuntu
Bugs, which is
I did the merge, and proposed the branch here.
https://code.edge.launchpad.net/~statik/ubuntu/lucid/protobuf/merge-
bug502654/+merge/17571
** Branch linked: lp:~statik/ubuntu/lucid/protobuf/merge-bug502654
--
Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
