From 1a43637fc8278ba8ede00fa68a7565ad3626edba Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Sun, 21 Oct 2018 18:47:56 +0200
Subject: Poppler 0.70.0

---
 CMakeLists.txt         |  4 ++--
 NEWS                   | 21 +++++++++++++++++++++
 cpp/Doxyfile           |  2 +-
 glib/CMakeLists.txt    |  2 +-
 qt5/src/CMakeLists.txt |  2 +-
 qt5/src/Doxyfile       |  2 +-
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72ee5483..96388a98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "69")
+set(POPPLER_MINOR_VERSION "70")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
@@ -480,7 +480,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else()
 add_library(poppler ${poppler_SRCS})
 endif()
-set_target_properties(poppler PROPERTIES VERSION 80.0.0 SOVERSION 80)
+set_target_properties(poppler PROPERTIES VERSION 81.0.0 SOVERSION 81)
 if(MINGW)
     get_target_property(POPPLER_SOVERSION poppler SOVERSION)
     set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff --git a/NEWS b/NEWS
index e38866e2..b60f74d9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Release 0.70.0
+        core:
+         * FreeText annotations: default to font from default appearance string
+         * Splash: Speed improvements
+         * Fix security issues found by oss-fuzz
+         * Improve page lable parsing
+         * Use std some std classes instead of self grown ones
+         * Various internal improvements
+
+        qt5:
+         * Add Page::index() method
+         * Improve method to get the page from a label string
+
+        glib:
+         * Fix crash on missing embedded file
+         * Add support for PDF subtype property
+         * Only export symbols in the public API
+
+        utils:
+         * pdftohtml: Improve font handling
+
 Release 0.69.0
         core:
          * Add annotation font color
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 0e035427..137ac3f5 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.69.0
+PROJECT_NUMBER         = 0.70.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 3fd2a751..97317f03 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -85,7 +85,7 @@ set(poppler_glib_generated_SRCS
   ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
 )
 add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
-set_target_properties(poppler-glib PROPERTIES VERSION 8.9.0 SOVERSION 8)
+set_target_properties(poppler-glib PROPERTIES VERSION 8.10.0 SOVERSION 8)
 set_target_properties(poppler-glib PROPERTIES C_VISIBILITY_PRESET hidden)
 set_target_properties(poppler-glib PROPERTIES CXX_VISIBILITY_PRESET hidden)
 set_target_properties(poppler-glib PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
index 20bb13aa..ffa16fa8 100644
--- a/qt5/src/CMakeLists.txt
+++ b/qt5/src/CMakeLists.txt
@@ -30,7 +30,7 @@ set(poppler_qt5_SRCS
   ArthurOutputDev.cc
 )
 add_library(poppler-qt5 ${poppler_qt5_SRCS})
-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.16.0 SOVERSION 1)
+set_target_properties(poppler-qt5 PROPERTIES VERSION 1.17.0 SOVERSION 1)
 if(MINGW)
     get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
     set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index af1c7ebc..031796e8 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.69.0
+PROJECT_NUMBER         = 0.70.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
-- 
cgit v1.2.3