[poppler] Branch 'poppler-0.26' - CMakeLists.txt configure.ac cpp/Doxyfile NEWS qt4/src qt5/src

[Albert Astals Cid]

 CMakeLists.txt   |    2 +-
 NEWS             |    7 +++++++
 configure.ac     |    2 +-
 cpp/Doxyfile     |    2 +-
 qt4/src/Doxyfile |    2 +-
 qt5/src/Doxyfile |    2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 97843e3a2daf039ca94b6deb0b8017f9c6a9ba21
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Sep 27 15:38:52 2014 +0200

    0.26.5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24902ba..02c82ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "26")
-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 3e0e4fd..7f9822f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Release 0.26.5
+        core:
+         * Fix rendering of broken file with a wrong embedded font. Bug #84270
+
+        glib:
+         * Fix use of uninitialized members in PopplerInputStream. Bug #82630
+
 Release 0.26.4
         core:
          * CairoOutputDev: Make sure we always push a transparency group in setSoftMaskFromImageMask(). Bug #81624
diff --git a/configure.ac b/configure.ac
index b38a2f8..5f2a424 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[26])
-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 b73d953..53c5414 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.26.4
+PROJECT_NUMBER         = 0.26.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 4af5519..93bbb50 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.26.4
+PROJECT_NUMBER         = 0.26.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 677c9f6..90ded75 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.26.4
+PROJECT_NUMBER         = 0.26.5
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.