Re: [kernel] r7360 - in dists/trunk/linux-2.6/debian: . arch/powerpc
On Thu, Sep 07, 2006 at 09:18:18AM +0000, Bastian Blank wrote:
> Author: waldi
> Date: Thu Sep 7 09:18:17 2006
> New Revision: 7360
>
> Modified:
> dists/trunk/linux-2.6/debian/arch/powerpc/defines
> dists/trunk/linux-2.6/debian/changelog
>
> Log:
> Revert r7359: Always merge _all_ sensible changes since the last merge without
> breaking the state which defines the merge base.
Bastian, can you please stop this svn commit game, and actually explain what
you are speaking about ? The above two logs seems pure giberish to me, as i
did a svn up on the changelog file (on the whole trunk/linux-2.6 subtree even),
and did a clean merge. The removal of the experimental1 package, i understand,
even though you should have added some info into the changelog for the
experimental1, since as it was, it seemed a mistake from Martin.
Also, do you have any hint or idea on the build failure ? It seems to die in
one of the nice python scripts as Zomb discovered yesterday :
22:53 < Zomb> make[3]: Leaving directory
`/home/bloch/debian/kernel/linux-2.6/linux-2.6-2.6.17+2.6.18-rc5/debian/build/build-powerpc-none-prep'
22:53 < Zomb> python2.4 debian/bin/abicheck.py
debian/build/build-powerpc-none-prep powerpc none prep
22:53 < Zomb> Traceback (most recent call last):
22:53 < Zomb> File "debian/bin/abicheck.py", line 88, in ?
22:53 < Zomb> ok, what is missing?
22:58 < svenl> Zomb: i had the same error. waldi you around ?
Friendly,
Sven Luther
Reply to: