tags 634143 + patch
tags 634143 + pending
thanks

Dear maintainer,

I've prepared an NMU for libpodofo0.8.0 (versioned as 0.8.0+svn20100512-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u libpodofo0.8.0-0.8.0+svn20100512/debian/control 
libpodofo0.8.0-0.8.0+svn20100512/debian/control
--- libpodofo0.8.0-0.8.0+svn20100512/debian/control
+++ libpodofo0.8.0-0.8.0+svn20100512/debian/control
@@ -1,7 +1,7 @@
 Source: libpodofo0.8.0
 Priority: extra
 Maintainer: Oleksandr Moskalenko <ma...@debian.org>
-Build-Depends: debhelper (>= 7), cmake, zlib1g-dev, libtiff4-dev, 
libjpeg62-dev, libfreetype6-dev, libfontconfig1-dev
+Build-Depends: debhelper (>= 7), cmake, zlib1g-dev, libtiff4-dev, libjpeg-dev, 
libfreetype6-dev, libfontconfig1-dev
 Standards-Version: 3.8.4
 Section: libdevel
 Homepage: http://podofo.sourceforge.net/
diff -u libpodofo0.8.0-0.8.0+svn20100512/debian/changelog 
libpodofo0.8.0-0.8.0+svn20100512/debian/changelog
--- libpodofo0.8.0-0.8.0+svn20100512/debian/changelog
+++ libpodofo0.8.0-0.8.0+svn20100512/debian/changelog
@@ -1,3 +1,18 @@
+libpodofo0.8.0 (0.8.0+svn20100512-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  
+  [ Didier Raboud ]
+  * Build-Depends against libjpeg-dev, not libjpeg62-dev (Closes: #634143).
+  * Import Ubuntu patch from libpodofo to fix build against the multiarch'ed
+    libfreetype.
+  
+  [ Ubuntu: Philip Muskovac & Daniel T Chen ]
+  * debian/rules: export DEB_HOST_MULTIARCH for the freetype patch.
+  * Add multiarch directory to cmake search path for freetype.
+
+ -- Didier Raboud <o...@debian.org>  Wed, 09 Nov 2011 16:34:50 +0100
+
 libpodofo0.8.0 (0.8.0+svn20100512-1) unstable; urgency=low
 
   * Initial release (Closes: #431809).
diff -u libpodofo0.8.0-0.8.0+svn20100512/debian/rules 
libpodofo0.8.0-0.8.0+svn20100512/debian/rules
--- libpodofo0.8.0-0.8.0+svn20100512/debian/rules
+++ libpodofo0.8.0-0.8.0+svn20100512/debian/rules
@@ -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.8.0
 major=0
only in patch2:
unchanged:
--- libpodofo0.8.0-0.8.0+svn20100512.orig/cmake/modules/FindFREETYPE.cmake
+++ libpodofo0.8.0-0.8.0+svn20100512/cmake/modules/FindFREETYPE.cmake
@@ -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}



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to