ubuntu-phone team mailing list archive

[Robert Park <robert.park@xxxxxxxxxxxxx>]

On Wed, Jan 8, 2014 at 11:28 AM, Barry Warsaw <barry@xxxxxxxxxx> wrote:
>     "Note that some people are merging the packaging branch into the upstream
>     trunk. Both have pros and cons. I'm not attached to any particular form as
>     debian/changelog is already the history of a package. But before merging,
>     you should revert all generated files (modified or new)."
>
> Will the new process require stronger language here?


Uh, yes, there are two possible ways of doing the merge, but there is
no ambiguity about the fact that debian/ directory must live within
trunk.