[poppler] Branch 'poppler-0.26' - 2 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/Lexer.cc qt4/src qt5/src utils/pdftohtml.cc

[Albert Astals Cid]

 CMakeLists.txt     |    2 +-
 NEWS               |   10 ++++++++++
 configure.ac       |    2 +-
 cpp/Doxyfile       |    2 +-
 poppler/Lexer.cc   |    2 +-
 qt4/src/Doxyfile   |    2 +-
 qt5/src/Doxyfile   |    2 +-
 utils/pdftohtml.cc |    1 +
 8 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 266a61ab1c9f536a4fb7d68c8f285c854eb2d6e9
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jun 19 20:16:19 2014 +0200

    0.26.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ceb643..6089cd6 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 "1")
+set(POPPLER_MICRO_VERSION "2")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/NEWS b/NEWS
index 9522bfe..afa01d9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Release 0.26.2
+        core:
+         * Make sure we have an xref before using. KDE Bug #335413
+
+        build system:
+         * autoconf: Fix typo in configure.ac
+
+        utils:
+         * pdftohtml: exit with 0 with -v and -h
+
 Release 0.26.1
         core:
          * Use field value V for radio buttons. Bug #75979
diff --git a/configure.ac b/configure.ac
index 4d55bec..44d33a7 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],[1])
+m4_define([poppler_version_micro],[2])
 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 a657514..ee6c048 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.1
+PROJECT_NUMBER         = 0.26.2
 
 # 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 b37989e..bfb9184 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.1
+PROJECT_NUMBER         = 0.26.2
 
 # 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 ad50aa8..53ac3f1 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.1
+PROJECT_NUMBER         = 0.26.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit 3381ee20efca2ce27733182d0d6720c1e6936a7f
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jun 19 19:57:31 2014 +0200

    Update (C)

diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc
index a0a5cd0..952967a 100644
--- a/poppler/Lexer.cc
+++ b/poppler/Lexer.cc
@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2006-2010, 2012, 2013 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2010, 2012-2014 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
 // Copyright (C) 2010 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2012, 2013 Adrian Johnson <ajohnson at redneon.com>
diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 35e8d84..aabed0b 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -22,6 +22,7 @@
 // Copyright (C) 2012 Igor Slepchin <igor.redhat at gmail.com>
 // Copyright (C) 2012 Ihar Filipau <thephilips at gmail.com>
 // Copyright (C) 2012 Luis Parravicini <lparravi at gmail.com>
+// Copyright (C) 2014 Pino Toscano <pino at kde.org>
 //
 // 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