[APPLIED] Re: [PATCH 0/2] [Maverick] fix linux-libc-dev versioning

[Leann Ogasawara]

On Mon, 2010-09-13 at 19:45 +0100, Andy Whitcroft wrote:
> A recent ti-omap4 upload recently inadvertantly emitted a linux-libc-dev
> at version 2.6.35-803.8 for armel.  This unfortuantly overrides the
> version emitted by the master branch.  This leads to a binary upload
> failure following build for armel and we are no longer able to upload
> armel from master.  Talking this through with the AAs we have little
> choice but to bump the version of linux-libc-dev over the broken version.
> The simplest and least user visible way is to just bump the ABI for
> this one package.  This patch set adds a maverick and master branch
> specific bodge to increment the ABI by 1000.  As this package is not a
> 'multiple install' package (there is only the latest on the system in
> an unversioned path) this should be transparent to the consumers and the
> main ABI remains as normal.  There is a second patch which should prevent
> this ever occuring again.
> 
> I have tested this via a binary-arch build for i386 and it seems to do
> the right thing there.  But the more eyes the better.  Please test this
> and confirm the versions generated are as expected.

I've tested building on i386, amd64, and armel and can confirm the
linux-libc-dev package has an incremented ABI by 1000, ie
linux-libc-dev_2.6.35-1021.31.  All other package versions are as
expected, ie 2.6.35-21.31.  Applied to Maverick linux master.

Thanks,
Leann

> For Maverick.
> 
> -apw
> 
> Andy Whitcroft (2):
>   UBUNTU: bodge linux-libc-dev package version due to ti-omap4 error
>   UBUNTU: linux-libc-dev -- ensure we can only build this on
>     debian.master
> 
>  debian/rules.d/0-common-vars.mk |   12 ++++++++++++
>  debian/rules.d/1-maintainer.mk  |    1 +
>  debian/rules.d/2-binary-arch.mk |    6 +++++-
>  3 files changed, 18 insertions(+), 1 deletions(-)
> 
>