-
Committer:
Package Import Robot
-
Author(s):
Logan Rosen
-
Date:
2014-12-25 23:16:58 UTC
-
mfrom:
(4.3.21 sid)
-
Revision ID:
package-import@ubuntu.com-20141225231658-p1139nmdrphtf86u
Tags: 1.4.14~dfsg0-1ubuntu1
* Merge from Debian unstable. Remaining changes:
  - debian/patches:
    + 0099-as-needed-fix.patch: Move -latomic to the right part of the link
      line to resolve FTBFS with as-needed on -latomic arches like powerpc.
    + 0099-libOpenImageIO-underlinked.patch: Link libOpenImageIO with -ldl.
    + fix-build-without-iv.patch: Fix documentation build when building
      without iv.
  - debian/control: Disable iv build on armhf (by excluding that architecture
    from the libqt4-opengl-dev build-dependency), due to a GLfloat/GLdouble
    type conflict.
* debian/patches/0099-libOpenImageIO-underlinked.patch: Link libutil against
  libdl as well (from dpkg-shlibdeps warnings).