summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2014-06-19 20:16:19 +0200
committerAlbert Astals Cid <aacid@kde.org>2014-06-19 20:16:19 +0200
commit266a61ab1c9f536a4fb7d68c8f285c854eb2d6e9 (patch)
tree21b529df8372f0391a77b6828a25153292202bf7
parent3381ee20efca2ce27733182d0d6720c1e6936a7f (diff)
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS10
-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, 15 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ceb6433..6089cd61 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 9522bfe3..afa01d94 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 4d55bec3..44d33a7c 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 a657514e..ee6c048b 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 b37989e4..bfb9184e 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 ad50aa8a..53ac3f18 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.