[poppler] CMakeLists.txt cpp/Doxyfile NEWS qt4/src qt5/src

[Albert Astals Cid]

 CMakeLists.txt   |    2 +-
 NEWS             |    7 +++++++
 cpp/Doxyfile     |    2 +-
 qt4/src/Doxyfile |    2 +-
 qt5/src/Doxyfile |    2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit f09a9923bb65755e183694c5f1be6af4a50e96e6
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Oct 5 19:15:44 2017 +0200

    Poppler 0.60.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83370af4..7485b2ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "60")
-set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_MICRO_VERSION "1")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 set (CMAKE_CXX_STANDARD 11)
diff --git a/NEWS b/NEWS
index 55a2ae96..018088ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Release 0.60.1
+        qt5:
+         * ArthurOutputDev: Add missing 'return' in error paths
+
+        build system:
+         * FindLIBOPENJPEG.cmake: Add CheckCXXSourceCompiles
+
 Release 0.60.0
         core:
          * Enable libcurl support by default
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 42e2d885..dde54a46 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.60.0
+PROJECT_NUMBER         = 0.60.1
 
 # 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 97998f39..a38057b8 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.60.0
+PROJECT_NUMBER         = 0.60.1
 
 # 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 25b5ebfe..6fa59360 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.60.0
+PROJECT_NUMBER         = 0.60.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.