[poppler] 2 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/Makefile.am qt4/src qt4/tests

[Albert Astals Cid]

 CMakeLists.txt                |    4 ++--
 NEWS                          |   17 +++++++++++++++++
 configure.ac                  |    2 +-
 cpp/Doxyfile                  |    2 +-
 poppler/Makefile.am           |    2 +-
 qt4/src/Doxyfile              |    2 +-
 qt4/tests/check_goostring.cpp |    2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

New commits:
commit f8c1b55e764a6e79b0530fb1be9ee11917f4237e
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Dec 1 22:19:17 2012 +0100

    0.21.3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c690a28..7e8ad51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ test_big_endian(WORDS_BIGENDIAN)
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "21")
-set(POPPLER_MICRO_VERSION "2")
+set(POPPLER_MICRO_VERSION "3")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
@@ -396,7 +396,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 31.0.0 SOVERSION 31)
+set_target_properties(poppler PROPERTIES VERSION 32.0.0 SOVERSION 32)
 target_link_libraries(poppler ${poppler_LIBS})
 target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
 install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/NEWS b/NEWS
index 2f4fc73..d6e0537 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Release 0.21.3
+        core:
+         * Splash: Implement bilinear image scaling (Bug #22138)
+         * CairoOutputDev: Update fill and stroke color in startPage (Bug #54526)
+         * Fix GooString::insert()
+         * Allow large chars in TextPage
+         * Fix crash on ActualText::end
+         * Don't use memcpy to copy classes
+         * Fix warnings
+
+        glib:
+         * Check if words end with spaces (Bug #54504)
+         * Ensure text is only computed on first render
+         * Fix warnings while generating introspection file
+         * Fix returns tag in PopplerAttachmentSaveFunc api doc
+         * Minor demo fixes
+
 Release 0.21.2
         core:
          * CairoOutputDev: make drawImage work with images > 32767 in width/height (Bug #56858)
diff --git a/configure.ac b/configure.ac
index 3d1517a..504f450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[21])
-m4_define([poppler_version_micro],[2])
+m4_define([poppler_version_micro],[3])
 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 a495f0f..7e0099f 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.21.2
+PROJECT_NUMBER         = 0.21.3
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 870fca6..71a6142 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -177,7 +177,7 @@ libpoppler_la_LIBADD =				\
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 31:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 32:0:0 @create_shared_lib@ @auto_import_flags@
 
 if ENABLE_XPDF_HEADERS
 
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index ebd6bce..9e11bac 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.21.2
+PROJECT_NUMBER         = 0.21.3
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit e3716d9d735a1093399a3c5c33ea5471a6adc405
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Dec 1 22:34:00 2012 +0100

    Build on make check correctly

diff --git a/qt4/tests/check_goostring.cpp b/qt4/tests/check_goostring.cpp
index 97f246d..07999b5 100644
--- a/qt4/tests/check_goostring.cpp
+++ b/qt4/tests/check_goostring.cpp
@@ -1,6 +1,6 @@
 #include <QtTest/QtTest>
 
-#include "GooString.h"
+#include "goo/GooString.h"
 
 class TestGooString : public QObject
 {