[SCM] okular packaging branch, master, updated. b3e0f525aa5f1110708e592bd6af6b34b5fc57da

[Pino Toscano]

The following commit has been merged in the master branch:
commit 5b8104b57cd69fe33b1dac2f0f21446166388f82
Author: Pino Toscano <pino at debian.org>
Date:   Tue Oct 4 15:31:36 2011 +0200

    backport an upstream patch to find JPEG and compile the plucker backend
---
 debian/patches/series                              |    1 +
 ...e-reenable-the-search-of-the-JPEG-library.patch |   30 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e7e976b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_cmake-reenable-the-search-of-the-JPEG-library.patch
diff --git a/debian/patches/upstream_cmake-reenable-the-search-of-the-JPEG-library.patch b/debian/patches/upstream_cmake-reenable-the-search-of-the-JPEG-library.patch
new file mode 100644
index 0000000..1848273
--- /dev/null
+++ b/debian/patches/upstream_cmake-reenable-the-search-of-the-JPEG-library.patch
@@ -0,0 +1,30 @@
+From 41c572463c33e711ebbb094b9989868a9564e467 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 4 Oct 2011 15:27:36 +0200
+Subject: [PATCH] cmake: reenable the search of the JPEG library
+
+there is no more a top-level CMakeLists.txt searching it;
+this makes the plucker backend compilable again
+---
+ generators/CMakeLists.txt |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
+index 9978bbf..0f6fc5c 100644
+--- a/generators/CMakeLists.txt
++++ b/generators/CMakeLists.txt
+@@ -20,9 +20,8 @@ macro_log_feature(TIFF_FOUND "libTIFF" "A library for reading and writing TIFF f
+ macro_optional_find_package(Freetype)
+ macro_log_feature(FREETYPE_FOUND "FreeType" "A font rendering engine" "http://www.freetype.org" FALSE "" "Provides freetype font support in the okular DVI generator.")
+ 
+-#we look for JPEG in kdegraphics/CMakeLists.txt
+-#macro_optional_find_package(JPEG)
+-#macro_log_feature(JPEG_FOUND "JPEG" "A library for reading and writing JPEG image files." "http://www.ijg.org" FALSE "" "Support fof PalmDB documents in okular.")
++macro_optional_find_package(JPEG)
++macro_log_feature(JPEG_FOUND "JPEG" "A library for reading and writing JPEG image files." "http://www.ijg.org" FALSE "" "Support fof PalmDB documents in okular.")
+ macro_optional_find_package(ZLIB)
+ macro_log_feature(ZLIB_FOUND "ZLib" "The Zlib compression library" "http://www.zlib.net" FALSE "" "Support for Plucker files in Okular.")
+ 
+-- 
+1.7.6.3
+

-- 
okular packaging