Comment 4 for bug 979694

Hi Philip,

It seems you simply forgot to request new build after you uploaded revision 85
to lp:~gpoweroff/gpoweroff/lucid

I've just builded new lucid build without any problems with your recipe:

https://code.launchpad.net/~gpoweroff/+recipe/gpoweroff-lucid

As you see, merging works fine now :) Conflict was before, because in both
branches the same line in debian/control file was changed after branch split,
but now you changed this line only in one branch - lp:~gpoweroff/gpoweroff/lucid

Btw, could you set automatic translation export to main lp:gpoweroff branch?

Simply type gpoweroff here:
https://translations.launchpad.net/gpoweroff/trunk/+link-translations-branch

I can't set this because you are the owner of main lp:gpoweroff branch

On Thu, Apr 12, 2012 at 02:50:23PM -0000, Philip Peitsch wrote:
> It appears the merging & nesting only functions if the base source does
> not contain a debian folder, in spite of what the docs appear to say.
> As soon as both the base branch and the merged/nesting branch have the
> debian folder, the build recipes throw their hands up and claim it's all
> a conflict, irrespective of whether the history is shared or not.
>
> I'll leave this for tonight and come back and wrestle with it tomorrow.
> If you know how to create a proper packaging branch, feel free to get
> one setup and I'll check it out. Otherwise I will ponder more seriously
> reverting the move to dh_python2 until some magical time in the future
> when I can be bothered again :)
>
> --
> https://bugs.launchpad.net/bugs/979694
> python-support has been deprecated and should be replaced with
> dh_python2

--
Labanaktis/Good luck,
Mantas Kriaučiūnas Jabber ID: <email address hidden> GPG ID: 43535BD5
Public organization "Open Source for Lithuania" - www.akl.lt
Geriausios biuro programos verslui ir namams - http://openoffice.lt
Prekyba naujais ir atnaujintais kompiuteriais su Linux OS - http://tinklas.eu
Naudok Baltix GNU/Linux sistemą savo kompiuteryje - http://baltix.lt