[ckan-changes] [okfn/ckan] 89c87a: Reformat long command to make it easier to underst...

Fri Oct 19 14:13:11 UTC 2012

  Branch: refs/heads/release-v1.8
  Home:   https://github.com/okfn/ckan
  Commit: 89c87a480146baf4cb16a287af11c3ee3445058c
      https://github.com/okfn/ckan/commit/89c87a480146baf4cb16a287af11c3ee3445058c
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Reformat long command to make it easier to understand

  Commit: 339f3661640124d04db36eb8141457c84601872c
      https://github.com/okfn/ckan/commit/339f3661640124d04db36eb8141457c84601872c
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Remove unused variable

  Commit: b074d38b5b89b064b9712d60d4475a8b4c535e6d
      https://github.com/okfn/ckan/commit/b074d38b5b89b064b9712d60d4475a8b4c535e6d
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Mend build for missing requires files

  Commit: 53e3d1e46104200d913cc08166d08e10f2e7cf34
      https://github.com/okfn/ckan/commit/53e3d1e46104200d913cc08166d08e10f2e7cf34
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  python-licenses is no longer a dependancy of CKAN.

  Commit: 103de0cc5522e384d3df5bfcd41f0917be1818ca
      https://github.com/okfn/ckan/commit/103de0cc5522e384d3df5bfcd41f0917be1818ca
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Correction to way of installing deps

  Commit: ed2b41b70a0ffa44388fa4c510e38f5a7588c386
      https://github.com/okfn/ckan/commit/ed2b41b70a0ffa44388fa4c510e38f5a7588c386
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  No need to rename packages

  Commit: 5fd36470a016cc6596b9d94a0fcbf51e60bfc17d
      https://github.com/okfn/ckan/commit/5fd36470a016cc6596b9d94a0fcbf51e60bfc17d
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Missed out the psycopg2 module name

  Commit: ba0fa37bc4144ee0d58dcda4100df1068a2a6662
      https://github.com/okfn/ckan/commit/ba0fa37bc4144ee0d58dcda4100df1068a2a6662
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Correction to tidy-up

  Commit: 71825e9b82956e6dbaabb1e164692526c5ec6a78
      https://github.com/okfn/ckan/commit/71825e9b82956e6dbaabb1e164692526c5ec6a78
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Pull solr version from pip-requirements.txt

  Commit: 81bad0b4f9d04225ed42d23e6570551d65cfdb99
      https://github.com/okfn/ckan/commit/81bad0b4f9d04225ed42d23e6570551d65cfdb99
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Non-python deps for pyscopg2

  Commit: ed7aad63533a7445bc4be2b65e523f21d03d76c1
      https://github.com/okfn/ckan/commit/ed7aad63533a7445bc4be2b65e523f21d03d76c1
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Specify ubuntu release name as lucid

  Commit: 2de5406cd165bcce820bb26df8daf9258ec14dba
      https://github.com/okfn/ckan/commit/2de5406cd165bcce820bb26df8daf9258ec14dba
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Configurable release name

  Commit: cfa247cec8256d4f86be094f3bb22fb968005a34
      https://github.com/okfn/ckan/commit/cfa247cec8256d4f86be094f3bb22fb968005a34
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Small correction

  Commit: 3dd12d19841987f9e077d96e93d255c5940cc08a
      https://github.com/okfn/ckan/commit/3dd12d19841987f9e077d96e93d255c5940cc08a
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M pip-requirements.txt

  Log Message:
  -----------
  Added missing dependency for paster command

  Commit: bfcf571feba2b29b4ac072777c6853a9a770d1d3
      https://github.com/okfn/ckan/commit/bfcf571feba2b29b4ac072777c6853a9a770d1d3
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  pastescript name conflict

  Commit: 8b5d32d338e340c714b8e1590e9f3363d962ddb3
      https://github.com/okfn/ckan/commit/8b5d32d338e340c714b8e1590e9f3363d962ddb3
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    A requires/lucid_conflict.txt
    A requires/lucid_missing.txt
    A requires/lucid_present.txt
    A requires/precise_conflict.txt
    A requires/precise_missing.txt
    A requires/precise_present.txt

  Log Message:
  -----------
  Re-instate requires/ files.

This is for building the package only.  The definitive list is still pip-requirements.txt

  Commit: 8862a4fc83bc944bc33c75d375719ed28908aee4
      https://github.com/okfn/ckan/commit/8862a4fc83bc944bc33c75d375719ed28908aee4
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Use requires files again.

  Commit: fce1964a8af826b36740208263ccab01bd5ef0f9
      https://github.com/okfn/ckan/commit/fce1964a8af826b36740208263ccab01bd5ef0f9
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

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

  Log Message:
  -----------
  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.

  Commit: cbde922c9d1678106fa6f6a903f37ecc7d8b873b
      https://github.com/okfn/ckan/commit/cbde922c9d1678106fa6f6a903f37ecc7d8b873b
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh
    M requires/precise_present.txt

  Log Message:
  -----------
  Move pybabel into conflict

  Commit: c907c1642040109cefcae3866a69e666019f731c
      https://github.com/okfn/ckan/commit/c907c1642040109cefcae3866a69e666019f731c
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Ensure dist/ directory is removed prior to build

  Commit: b79750924475b60682046db102e6d764c803d2a8
      https://github.com/okfn/ckan/commit/b79750924475b60682046db102e6d764c803d2a8
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M requires/precise_conflict.txt
    M requires/precise_missing.txt

  Log Message:
  -----------
  Move markupsafe to conflict for precise build

  Commit: 29c49bbb2c3bf52b9ff37f49cd8c682a53882333
      https://github.com/okfn/ckan/commit/29c49bbb2c3bf52b9ff37f49cd8c682a53882333
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M requires/lucid_conflict.txt
    M requires/lucid_missing.txt
    M requires/precise_conflict.txt
    M requires/precise_missing.txt

  Log Message:
  -----------
  Move pyutilib into conflict.

  Commit: fef0652e64a0aa1e4239f68d9effd30a8f903405
      https://github.com/okfn/ckan/commit/fef0652e64a0aa1e4239f68d9effd30a8f903405
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M requires/lucid_conflict.txt
    M requires/lucid_present.txt
    R requires/precise_conflict.txt
    R requires/precise_missing.txt
    R requires/precise_present.txt

  Log Message:
  -----------
  Remove support for building preceise

  Commit: d93a7b443934dccc014245293b4a9eb96d9afb28
      https://github.com/okfn/ckan/commit/d93a7b443934dccc014245293b4a9eb96d9afb28
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh
    M requires/lucid_missing.txt

  Log Message:
  -----------
  Re-instate the repoze renames for lucid

...after removing precise from the build, they can go back in lucid_present.

Ensure repoze.lru is installed site-wide.  It should be pulled in by routes==0.13, but
that doesn't seem to have worked

  Commit: f5a50f1375b6204e48e44e4e40afffbca8cff328
      https://github.com/okfn/ckan/commit/f5a50f1375b6204e48e44e4e40afffbca8cff328
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Remove erroneous pybabel rename.

pybabel is being installed as a conflict due to a version upgrade (rather than package
install), so no longer needs the rename.

  Commit: 7671386f8247ca37c80916b99f55295a19ed818f
      https://github.com/okfn/ckan/commit/7671386f8247ca37c80916b99f55295a19ed818f
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Remove reference to 12.04

  Commit: 6676a5396c648508e04b6804a4ef78a6a85801dc
      https://github.com/okfn/ckan/commit/6676a5396c648508e04b6804a4ef78a6a85801dc
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M requires/lucid_conflict.txt
    M requires/lucid_present.txt

  Log Message:
  -----------
  Try downgrading babel version

  Commit: 37374be2808abf840408db122461529948d2aa4f
      https://github.com/okfn/ckan/commit/37374be2808abf840408db122461529948d2aa4f
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Rename package-installed babel

  Commit: 10aedf6324ac5d01cd5bd43591ba29cde56cef0b
      https://github.com/okfn/ckan/commit/10aedf6324ac5d01cd5bd43591ba29cde56cef0b
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Fix missing line-continutation

Compare: https://github.com/okfn/ckan/compare/989c561bc16f...10aedf6324ac