From bb00a153e65c88fd465a25eddecf19c3d8baa557 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Wed, 18 Mar 2015 23:53:47 +0100
Subject: [PATCH 1/2] Update for 15.04 Beta 3

SVN_SILENT
---
 VERSION        | 2 +-
 core/version.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 8c26d1d39..b1e96517f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-okular v0.21.80
+okular v0.21.95
diff --git a/core/version.h b/core/version.h
index 5cdd10c61..6309b88d9 100644
--- a/core/version.h
+++ b/core/version.h
@@ -10,10 +10,10 @@
 #ifndef _OKULAR_VERSION_H_
 #define _OKULAR_VERSION_H_
 
-#define OKULAR_VERSION_STRING "0.21.80"
+#define OKULAR_VERSION_STRING "0.21.95"
 #define OKULAR_VERSION_MAJOR 0
 #define OKULAR_VERSION_MINOR 21
-#define OKULAR_VERSION_RELEASE 80
+#define OKULAR_VERSION_RELEASE 95
 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 
 #define OKULAR_VERSION \

From 250eccf530fdb0547f468ac6875952fd3d733fd2 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Fri, 20 Mar 2015 00:34:46 +0100
Subject: [PATCH 2/2] plucker: Also accept f as false

This bug is present at upstream unpluck too, but given the cvs code hasn't
been touched in ages i have not reported it there
---
 generators/plucker/unpluck/config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/plucker/unpluck/config.cpp b/generators/plucker/unpluck/config.cpp
index ac97adab5..bba93b5b5 100644
--- a/generators/plucker/unpluck/config.cpp
+++ b/generators/plucker/unpluck/config.cpp
@@ -393,7 +393,7 @@ int plkr_GetConfigBoolean
              || (strcmp (svalue, "off") == 0)
              || (strcmp (svalue, "OFF") == 0)
              || (strcmp (svalue, "F") == 0)
-             || (strcmp (svalue, "F") == 0)
+             || (strcmp (svalue, "f") == 0)
              || (strcmp (svalue, "False") == 0))
         return 0;