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

[Albert Astals Cid]

 CMakeLists.txt      |    6 +++---
 NEWS                |   14 ++++++++++++++
 configure.ac        |    4 ++--
 cpp/Doxyfile        |    2 +-
 poppler/Makefile.am |    2 +-
 qt4/src/Doxyfile    |    2 +-
 6 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 801f7feea79e5bc3b5417566552e4df1e6b8a51c
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Dec 29 19:22:54 2012 +0100

    0.22.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69aceae..913615c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ include(TestBigEndian)
 test_big_endian(WORDS_BIGENDIAN)
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "21")
-set(POPPLER_MICRO_VERSION "4")
+set(POPPLER_MINOR_VERSION "22")
+set(POPPLER_MICRO_VERSION "0")
 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 33.0.0 SOVERSION 33)
+set_target_properties(poppler PROPERTIES VERSION 34.0.0 SOVERSION 34)
 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 b7adb3b..22e9a0b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Release 0.22.0
+        core:
+         * Fix crash in invalid files that define a <= 0 bits per image value
+         * Fix a few issues in JPX decoding when not using OpenJPEG
+         * TextOutputDev: Use page size for max value in TextPage::visitSelection
+         * Fix typo in error message
+
+        utils:
+         * Fix pdfunite regression (Bug #58569)
+         * Demo fixes and improvements
+
+        misc:
+         * pdf-inspector improvements
+
 Release 0.21.4
         core:
          * SplashOutputDev: Fix crash when rendering in monochrome mode
diff --git a/configure.ac b/configure.ac
index 399ece7..c2d6bdd 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],[4])
+m4_define([poppler_version_minor],[22])
+m4_define([poppler_version_micro],[0])
 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 580c5ae..f0f5618 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.4
+PROJECT_NUMBER         = 0.22.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/poppler/Makefile.am b/poppler/Makefile.am
index 34d0ce4..c25ab03 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 33:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@
 
 if ENABLE_XPDF_HEADERS
 
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 9547cd5..30e73e5 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.4
+PROJECT_NUMBER         = 0.22.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.