Comment 62 for bug 806248

@arges: Hi. So otherwise all fine but we have the packaging in a different branch (lp:~ubuntu-desktop/unity/precise), to where we do merges from the upstream branch (lp:unity/5.0). Didier's message was a bit compact, but meant that you'd bzr branch the packaging branch, do bzr merge lp:unity/5.0 to pick up this wanted change to the packaging branch and add the changelog entry there. Since you only proposed merging - via Launchpad - the upstream branch to the packaging branch, it lacked the changelog entry compared to eg. your debdiff. I just took the changelog entry from your debdiff after the merging and offered that together with the merged upstream commit (identical to your debdiff) so that it's ready for upload immediately after accepting.

I think that https://wiki.ubuntu.com/StableReleaseUpdates could use some updating to promote the bazaar branch usage over debdiff more, since it's more convenient for the sponsors / SRU team than debdiff:s that they need to download and apply manually. Sometimes it's hard to find the correct, up-to-date packaging branch, though.

Note that in raring Unity stack upstream + packaging branches are again combined since this separate branch setup requires more of this kind of branch merging. The only difference with these separate branches after all is that the upstream branch has a cleaner revision history and the packaging branch has the additional debian/ directory.