Comment 1 for bug 768640

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 768640] [NEW] bzr merge-upstream should have more Ubuntu-appropriate defaults

On Thu, 2011-04-21 at 22:18 +0000, Barry Warsaw wrote:
> Public bug reported:
>
> The new watch file support in merge-upstream is awesome. However, I'm
> thinking that the defaults for distribution and the changelog entry
> version number should be different to better support Ubuntu development.
> Here's the use case:
>
> We have foo-1.2-1 in Debian and Ubuntu. Upstream has released foo-2.0
> but the Debian maintainer hasn't upgraded that package yet. Because we
> want to get foo-2.0 into Ubuntu in the meantime, and because we're
> almost definitely doing development *for* Ubuntu if we're using UDD,
> when I do `bzr merge-upstream` I would expect the changelog entry to be
> targeted for the current Ubuntu development version, using a version
> number like foo-2.0-0ubuntu1. That way, when foo-2.0 appears in Debian
> and we do a sync request, Debian's foo-2.0-1 will be later than ours.

   summary "Use -XubuntuY debian revision when target distribution is
Ubuntu"
   affects bzr-builddeb
   status triaged
   tags +merge-upstream