tags 639051 + patch
tags 639051 + pending
thanks
Dear maintainer,
I've prepared an NMU for libpodofo (versioned as 0.9.0-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
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-11-09 16:02:28.000000000 +0100
@@ -1,3 +1,18 @@
+libpodofo (0.9.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Didier Raboud ]
+ * Build-Depends against libjpeg-dev, not libjpeg62-dev (Closes: #639051).
+ * Import Ubuntu patch to fix build against the multiarch'ed libfreetype.
+
+ [ Ubuntu: Philip Muskovac & Daniel T Chen ]
+ * debian/rules: export DEB_HOST_MULTIARCH for the freetype patch.
+ * debian/patches/freetype_multiarch: Add multiarch directory to cmake search
+ path for freetype (LP: #778410, #831277).
+
+ -- Didier Raboud <o...@debian.org> Wed, 09 Nov 2011 16:02:17 +0100
+
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-11-09 15:35:34.000000000 +0100
@@ -1,7 +1,7 @@
Source: libpodofo
Priority: extra
Maintainer: Oleksandr Moskalenko <ma...@debian.org>
-Build-Depends: debhelper (>= 7), cmake, zlib1g-dev, libtiff4-dev,
libjpeg62-dev, libfreetype6-dev, libfontconfig1-dev, quilt
+Build-Depends: debhelper (>= 7), cmake, zlib1g-dev, libtiff4-dev, libjpeg-dev,
libfreetype6-dev, libfontconfig1-dev, quilt
#, libboost-graph1.46-dev
Standards-Version: 3.9.1
Section: libdevel
diff -Nru libpodofo-0.9.0/debian/patches/build_again
libpodofo-0.9.0/debian/patches/build_again
--- libpodofo-0.9.0/debian/patches/build_again 1970-01-01 01:00:00.000000000
+0100
+++ libpodofo-0.9.0/debian/patches/build_again 2011-11-09 15:38:49.000000000
+0100
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -351,7 +351,7 @@
+
+ FIND_PACKAGE(OpenSSL)
+
+-FIND_PACKAGE(FREETYPE REQUIRED)
++FIND_PACKAGE(Freetype REQUIRED)
+ MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers
${FREETYPE_INCLUDE_DIR}")
+
+ FIND_PACKAGE(LIBSTLPORT)
diff -Nru libpodofo-0.9.0/debian/patches/freetype_multiarch
libpodofo-0.9.0/debian/patches/freetype_multiarch
--- libpodofo-0.9.0/debian/patches/freetype_multiarch 1970-01-01
01:00:00.000000000 +0100
+++ libpodofo-0.9.0/debian/patches/freetype_multiarch 2011-11-09
15:48:51.000000000 +0100
@@ -0,0 +1,22 @@
+Description: add multiarch directory to cmake search path for freetype
+ This resolves the cmake error caused by freetype being installed in the new
+ multiarch directory.
+Bug-Ubuntu: http://launchpad.net/bugs/778410
+Bug-Ubuntu: http://launchpad.net/bugs/831277
+Author: Philip Muskovac <yo...@kubuntu.org>
+Reviewed-by: Daniel T Chen <crim...@ubuntu.com>
+Last-Updated: 2011-09-22
+
+Index: libpodofo-0.9.0/cmake/modules/FindFREETYPE.cmake
+===================================================================
+--- libpodofo-0.9.0.orig/cmake/modules/FindFREETYPE.cmake 2007-11-07
12:45:20.000000000 -0500
++++ libpodofo-0.9.0/cmake/modules/FindFREETYPE.cmake 2011-09-22
14:24:58.000000000 -0400
+@@ -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/$ENV{DEB_HOST_MULTIARCH})
+
+ FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE
+ ${FREETYPE_LIBRARY_NAMES_RELEASE}
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-11-09 15:53:21.000000000
+0100
@@ -1,2 +1,3 @@
FindZLIB.cmake
CMakeLists.txt.top
+freetype_multiarch
diff -Nru libpodofo-0.9.0/debian/rules libpodofo-0.9.0/debian/rules
--- libpodofo-0.9.0/debian/rules 2011-03-23 18:09:26.000000000 +0100
+++ libpodofo-0.9.0/debian/rules 2011-11-09 16:00:52.000000000 +0100
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
#export DH_VERBOSE=1
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# shared library versions, option 1
version=0.9.0
major=0
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
