summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2014-01-02 23:48:29 +0100
committerAlbert Astals Cid <aacid@kde.org>2014-01-02 23:48:29 +0100
commita2f0e4b1fd8b3d9675cc00a561094bd78a63d048 (patch)
tree8710c35d49767f15ca67d3f8e23e63dac8a093e5
parent523b2731e0489bab58e66b21016bd6f010e616ea (diff)
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS4
-rw-r--r--configure.ac2
-rw-r--r--cpp/Doxyfile2
-rw-r--r--qt4/src/Doxyfile2
-rw-r--r--qt5/src/Doxyfile2
6 files changed, 9 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b66a694..dfd5be69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "24")
-set(POPPLER_MICRO_VERSION "4")
+set(POPPLER_MICRO_VERSION "5")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
diff --git a/NEWS b/NEWS
index ff38e7f6..38ef36d6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 0.24.5
+ core:
+ * Fix crash due to wrong formatting of error message. KDE Bug #328511
+
Release 0.24.4
core:
* Fix regression in broken endstream detection. Bug #70854
diff --git a/configure.ac b/configure.ac
index 2f44f71e..74760217 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[24])
-m4_define([poppler_version_micro],[4])
+m4_define([poppler_version_micro],[5])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index d84579d0..40c6cc4e 100644
--- a/cpp/Doxyfile
+++ b/cpp/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler CPP"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.24.4
+PROJECT_NUMBER = 0.24.5
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 70665aff..bd1417c3 100644
--- a/qt4/src/Doxyfile
+++ b/qt4/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt4 "
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.24.4
+PROJECT_NUMBER = 0.24.5
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index 4f70d4cf..4e2f9cd8 100644
--- a/qt5/src/Doxyfile
+++ b/qt5/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.24.4
+PROJECT_NUMBER = 0.24.5
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.