From 478be219772a6c298baad568da3643895cd50d35 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Fri, 21 Apr 2017 16:29:44 +0200
Subject: Poppler 0.54

---
 CMakeLists.txt      |  2 +-
 NEWS                | 14 ++++++++++++++
 configure.ac        |  2 +-
 cpp/Doxyfile        |  2 +-
 glib/CMakeLists.txt |  2 +-
 glib/Makefile.am    |  2 +-
 gtk-doc.make        |  1 +
 qt4/src/Doxyfile    |  2 +-
 qt5/src/Doxyfile    |  2 +-
 9 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ff0c0d..b3ff39de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "53")
+set(POPPLER_MINOR_VERSION "54")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
diff --git a/NEWS b/NEWS
index 1cf43ce0..8f02c6e4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Release 0.54.0
+        core:
+         * Make XRef reconstruction a bit better. Bug #100509
+
+        glib:
+         * Expose movie play mode. Bug #99625
+         * demo: Show play mode in movie properties view
+
+        qt5:
+         * Compile with -DQT_NO_CAST_FROM_BYTEARRAY. Bug #100311
+
+        utils:
+         * pdfimages: don't fail listing if inline image data contains 'EI'. Bug #100737
+
 Release 0.53.0
         core:
          * Form support improvements
diff --git a/configure.ac b/configure.ac
index 7a233b9b..050a8912 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[53])
+m4_define([poppler_version_minor],[54])
 m4_define([poppler_version_micro],[0])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index e969a627..665af301 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.53.0
+PROJECT_NUMBER         = 0.54.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 a40fc8ab..8433d2a3 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -81,7 +81,7 @@ set(poppler_glib_generated_SRCS
   ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
 )
 add_library(poppler-glib SHARED ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
-set_target_properties(poppler-glib PROPERTIES VERSION 8.8.0 SOVERSION 8)
+set_target_properties(poppler-glib PROPERTIES VERSION 8.9.0 SOVERSION 8)
 target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES} ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES})
 if(HAVE_PTHREAD)
    target_link_libraries(poppler-glib -lpthread)
diff --git a/glib/Makefile.am b/glib/Makefile.am
index c2605cbf..1cae1229 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -82,7 +82,7 @@ libpoppler_glib_la_LIBADD =				\
 	$(FREETYPE_LIBS)
 
 libpoppler_glib_la_LDFLAGS =			\
-	-version-info 16:0:8			\
+	-version-info 17:0:9			\
 	@create_shared_lib@			\
 	@auto_import_flags@
 
diff --git a/gtk-doc.make b/gtk-doc.make
index e4a12a5b..2454c285 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -196,6 +196,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
 	  if test -f $(abs_builddir)/$$file ; then \
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
+	  test -f $$file && cp $$file $(abs_builddir)/html; \
 	done;
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 04a12221..98d8f8d7 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.53.0
+PROJECT_NUMBER         = 0.54.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/qt5/src/Doxyfile b/qt5/src/Doxyfile
index 0b4e3e51..1cd97d03 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.53.0
+PROJECT_NUMBER         = 0.54.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