[ckan-changes] [okfn/ckan] 80c615: [#2859] Move some libraries into conflict.

[GitHub]

  Branch: refs/heads/2859-fix-the-build
  Home:   https://github.com/okfn/ckan
  Commit: 80c615116e37cab476887a16c6347cab4f78e715
      https://github.com/okfn/ckan/commit/80c615116e37cab476887a16c6347cab4f78e715
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M build.sh
    M requires/lucid_conflict.txt
    M requires/lucid_present.txt
    M requires/precise_conflict.txt

  Log Message:
  -----------
  [#2859] Move some libraries into conflict.

These libraries require a bit of buildkit trickery to package correectly, but
so they need to be moved into the same requires file (ie - conflict) in order
that the buildkit command can be shared across both the lucid build and the
precise build.