diff -Nru libpodofo-0.9.0/debian/changelog libpodofo-0.9.0/debian/changelog --- libpodofo-0.9.0/debian/changelog 2011-03-23 18:10:55.000000000 +0100 +++ libpodofo-0.9.0/debian/changelog 2011-05-07 20:40:55.000000000 +0200 @@ -1,3 +1,9 @@ +libpodofo (0.9.0-1ubuntu1) oneiric; urgency=low + + * Add ubuntu_01_freetype_multiarch.diff to fix FTBFS (LP: #778410) + + -- Philip Muškovac Fri, 06 May 2011 11:57:33 +0200 + libpodofo (0.9.0-1) unstable; urgency=low * New upstream release. The packaging is based on 0.8.4 that has been diff -Nru libpodofo-0.9.0/debian/control libpodofo-0.9.0/debian/control --- libpodofo-0.9.0/debian/control 2011-03-22 21:47:17.000000000 +0100 +++ libpodofo-0.9.0/debian/control 2011-05-07 20:40:55.000000000 +0200 @@ -1,6 +1,7 @@ Source: libpodofo Priority: extra -Maintainer: Oleksandr Moskalenko +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Oleksandr Moskalenko Build-Depends: debhelper (>= 7), cmake, zlib1g-dev, libtiff4-dev, libjpeg62-dev, libfreetype6-dev, libfontconfig1-dev, quilt #, libboost-graph1.46-dev Standards-Version: 3.9.1 diff -Nru libpodofo-0.9.0/debian/patches/series libpodofo-0.9.0/debian/patches/series --- libpodofo-0.9.0/debian/patches/series 2011-03-23 00:38:35.000000000 +0100 +++ libpodofo-0.9.0/debian/patches/series 2011-05-07 20:40:55.000000000 +0200 @@ -1,2 +1,3 @@ FindZLIB.cmake CMakeLists.txt.top +ubuntu_01_freetype_multiarch.diff diff -Nru libpodofo-0.9.0/debian/patches/ubuntu_01_freetype_multiarch.diff libpodofo-0.9.0/debian/patches/ubuntu_01_freetype_multiarch.diff --- libpodofo-0.9.0/debian/patches/ubuntu_01_freetype_multiarch.diff 1970-01-01 01:00:00.000000000 +0100 +++ libpodofo-0.9.0/debian/patches/ubuntu_01_freetype_multiarch.diff 2011-05-07 22:42:44.000000000 +0200 @@ -0,0 +1,18 @@ +Description: add multiarch directory to cmake search path for freetype + This resovles the cmake error caused by freetype being installed in the new + multiarch directory. +Bug-Ubuntu: http://launchpad.net/bugs/778410 +Author: Philip Muskovac +Index: libpodofo-0.9.0/cmake/modules/FindFREETYPE.cmake +=================================================================== +--- libpodofo-0.9.0.orig/cmake/modules/FindFREETYPE.cmake 2011-04-17 03:58:51.372305366 +0200 ++++ libpodofo-0.9.0/cmake/modules/FindFREETYPE.cmake 2011-04-17 03:59:21.282842927 +0200 +@@ -41,7 +41,7 @@ + SET(FREETYPE_LIBRARY_NAMES_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG} freetyped libfreetyped) + SET(FREETYPE_LIBRARY_NAMES_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} freetype libfreetype) + +-SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib) ++SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib /usr/lib/${CMAKE_ARCH_TRIPLET}) + + FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE + ${FREETYPE_LIBRARY_NAMES_RELEASE}