[poppler] Branch 'poppler-0.20' - CMakeLists.txt configure.ac cpp/Doxyfile NEWS qt4/src

[Albert Astals Cid]

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

New commits:
commit e09be3bc6ba1290fd31bde0c3d19c4ffcbadbf00
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Jul 10 23:06:53 2012 +0200

    0.20.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b9efdc..c427064 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 "20")
-set(POPPLER_MICRO_VERSION "1")
+set(POPPLER_MICRO_VERSION "2")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/NEWS b/NEWS
index 4ebae4f..df7dca7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Release 0.20.2
+        core:
+         * Fix compilation on Windows
+         * Copy resources content defined in the pages dict on save (Bug #51369)
+         * PSOutputDev: Correct %%DocumentCustomColors (Bug #51479)
+         * PSOutputDev: Fix handling of DeviceN images in level 3 PostScript (Bug #51548)
+         * Fix crash in malformed documents
+        
+        qt4:
+         * Do not hang on malformed /Annots objects (Bug #51361)
+
 Release 0.20.1
         core:
          * Remove unnecesary transparency group handling in splash (Bug #13487)
diff --git a/configure.ac b/configure.ac
index 553f2e5..0facfdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[20])
-m4_define([poppler_version_micro],[1])
+m4_define([poppler_version_micro],[2])
 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 03f4dd3..1643e53 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.20.1
+PROJECT_NUMBER         = 0.20.2
 
 # 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 35b2819..0920827 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.20.1
+PROJECT_NUMBER         = 0.20.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.