cmake merge

[Scott Kitterman]

Jonathan Riddell <jriddell at ubuntu.com> wrote:

>   * Merge with Debian, remaining changes:
>    - Add ubuntu_qt_import_dir_variable.diff
>define QT_IMPORTS_DIR even when that dir does not exist.
>    - Add multiarch-python-include-dirs.patch
>  * Fix FindPythonLibs to specify both include paths to Python.h &
>  pyconfig.h in PYTHON_INCLUDE_DIRS. Packages should not use deprecated
>    PYTHON_INCLUDE_PATH, nor only PYTHON_INCLUDE_DIR (which will only
>    point to Python.h location).
>
>http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/saucy/cmake/saucy/files/head:/debian/patches/
>
>Jonathan

Debian won't need the multi-arch change until after the Python changes in experimental hit unstable. 

Scott K