[poppler] Branch 'poppler-0.24' - 2 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/JBIG2Stream.cc qt4/src qt5/src

[Albert Astals Cid]

 CMakeLists.txt         |    2 +-
 NEWS                   |    4 ++++
 configure.ac           |    2 +-
 cpp/Doxyfile           |    2 +-
 poppler/JBIG2Stream.cc |    1 +
 qt4/src/Doxyfile       |    2 +-
 qt5/src/Doxyfile       |    2 +-
 7 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit a2f0e4b1fd8b3d9675cc00a561094bd78a63d048
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jan 2 23:48:29 2014 +0100

    0.24.5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b66a69..dfd5be6 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 ff38e7f..38ef36d 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 2f44f71..7476021 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 d84579d..40c6cc4 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 70665af..bd1417c 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 4f70d4c..4e2f9cd 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.
commit 523b2731e0489bab58e66b21016bd6f010e616ea
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jan 2 22:54:42 2014 +0100

    Update copyrights

diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index dbc7bdc..bda7d52 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -21,6 +21,7 @@
 // Copyright (C) 2012 William Bader <williambader at hotmail.com>
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2013 Fabio D'Urso <fabiodurso at hotmail.it>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git