[Debian-olpc-devel] CDBS and autoconf question

[Morgan Collett]

On Tue, Dec 30, 2008 at 15:48, Jonas Smedegaard <dr at jones.dk> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On Tue, Dec 30, 2008 at 01:24:18PM +0200, Morgan Collett wrote:
>>Background: Sugar 0.82 has Network Manager 0.6 support. Ubuntu 8.10
>>has NM 0.7. There are upstream patches (unreleased) for sugar,
>>sugar-base and sugar-presence-service to switch to NM 0.7 support.
>>
>>I've applied these patches to the appropriate packages for testing on
>>Ubuntu, but I've run into the following problem: The upstream patches
>>for sugar and sugar-base touch, for example, several Makefile.am, but
>>not the corresponding Makefile.in since that is autogenerated.
>>
>>There must be a way to make CDBS do that, but I couldn't find a
>>well-enough documented way to do it. I resorted to making a very ugly
>>patch to apply after the upstream patch, which patches all the
>>appropriate Makefile.in files.
>>
>>Any better way to do it?
>
> Not only do you need to patch Makefile.in's, you also need to ensure
> that they are patched last, to not trigger autobuilding them.
>
> My approach would be to add two patches, one for .am and one for .in.
>
> And example of this approach is patches 1001 and 2991 in the
> sugar-artwork package.

Thanks, it helps to know I'm on the right track.

>
> The alternative, to ask CDBS to regenerate automade files, is
> discouraged, as that will make the build process less reliable.
>
> If you want to go that route anyway, see source of e.g. the libgtkol
> package for an example how to do that.
>
>
> Kind regards,
>
>  - Jonas

Regards
Morgan