[SCM] okular packaging branch, master, updated. debian/4.7.2-1-3-g85bbafe

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 62d9968afe5ca69a5c53f6c884dd1fef9e84ee72
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Dec 8 00:15:35 2011 +0100

    Remove upstream_cmake-reenable-the-search-of-the-JPEG-library.patch
---
 debian/changelog                                   |    2 +
 debian/patches/series                              |    1 -
 ...e-reenable-the-search-of-the-JPEG-library.patch |   30 --------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b869538..12174fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ okular (4:4.7.4-0r0) UNRELEASED; urgency=low
   
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4.7.4.
+  * Remove upstream_cmake-reenable-the-search-of-the-JPEG-library.patch, merged
+    upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Dec 2011 00:06:51 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index e7e976b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 1848273..0000000
--- a/debian/patches/upstream_cmake-reenable-the-search-of-the-JPEG-library.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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