Branches for Oneiric

Author: Till Kamppeter
Revision Date: 2011-08-10 06:34:41 UTC

* debian/control, debian/rules, debian/docs, debian/libicc2.install,
  debian/libicc-dev.install, debian/argyll.install, debian/argyll.examples,
  debian/README.Debian, debian/local/configure.ac, debian/local/Makefile.am:
  Reverted the merge of the argyll and libicc2 source packages. Only libicc2
  is really needed for Oneiric's new color management stack. Argyll is not
  absolutely needed and its upstream source is far from suitable for use in
  Linux distributions. It uses the jam build system which is unmaintained for
  years and it ships patched derivatives of system libraries (libusb). For
  calibration instrument support it must be decided between one of two
  solution, either a general improvement of Argyll's architecture or moving
  of calibration hardware drivers into colord. This cannot be decided any
  more in Oneiric and needs to get worked out with upstream.
* debian/rules: Removed /usr/bin/icclu and /usr/bin/iccdump as these are
  already in the libicc2 package.
* debian/control: Removed conflict with libicc as we have removed the
  conflicting files.