[Bug 502654] Re: Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
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 subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502654] Re: Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
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 notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502654] Re: Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
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. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502654] Re: Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
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/ +N debian/patches/series.OTHER M debian/changelog R debian/patches/ = debian/patches.moved/ R debian/patches/default_python_version = debian/patches/default_python_version R debian/patches/no_death_tests_on_ia64 = debian/patches/no_death_tests_on_ia64 RM debian/patches/series = debian/patches.moved/series.THIS Text conflict in debian/changelog Conflict adding files to debian/patches. Created directory. Conflict because debian/patches is not versioned, but has versioned children. Versioned directory. Conflict adding file debian/patches. Moved existing file to debian/patches.moved. Contents conflict in debian/patches.moved/series Contents conflict in debian/patches/series 6 conflicts encountered. -- 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. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502654] Re: Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
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 subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 502654] Re: Please merge protobuf 2.2.0a-0.1 (main) from Debian testing (main)
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) https://bugs.launchpad.net/bugs/502654 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
