[poppler] Branch 'poppler-0.12' - CMakeLists.txt configure.ac msvc/config.h NEWS qt4/src

[Albert Astals Cid]

 CMakeLists.txt   |    2 +-
 NEWS             |   19 +++++++++++++++++++
 configure.ac     |    2 +-
 msvc/config.h    |    6 +++---
 qt4/src/Doxyfile |    2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

New commits:
commit 06292945368f0cb97daa187d61fd6620c0891d3b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 17 22:30:51 2010 +0000

    0.12.4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c700e80..cb78bb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ include(MacroBoolTo01)
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "12")
-set(POPPLER_MICRO_VERSION "3")
+set(POPPLER_MICRO_VERSION "4")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/NEWS b/NEWS
index 83c2ddb..5e39ba0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+Release 0.12.4
+
+	core:
+	 * Fix Uncover and Fade transition parsing. Bug #26034
+	 * Fix GfxRadialShading::GfxRadialShading. KDE bug #223359
+	 * Fix a memory leak in CairoFontEngine
+	 * Use the right matrix for the mask in drawMaskedImage() in CairoOutputDev. Bug #16906
+	 * Only assume a OC is not visible if it exists and is set to no. Bug #26532
+	 * Guard agains malloc returning NULL in SplashFTFont
+
+	qt4:
+	 * Update requirement to Qt 4.4
+	
+	glib:
+	 * Use PDFDoc(wchar_t *, ...) on Windows. Bug #25032
+
+	build system:
+	 * fix typo: "MULTITHREAD" -> "MULTITHREADED" in CMake
+
 Release 0.12.3
 
 	core:
diff --git a/configure.ac b/configure.ac
index 293f128..9315973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[12])
-m4_define([poppler_version_micro],[3])
+m4_define([poppler_version_micro],[4])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
 AC_PREREQ(2.59)
diff --git a/msvc/config.h b/msvc/config.h
index 89743b2..745322b 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -32,13 +32,13 @@
 #define PACKAGE_NAME "poppler"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "poppler 0.12.3"
+#define PACKAGE_STRING "poppler 0.12.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "poppler"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.12.3"
+#define PACKAGE_VERSION "0.12.4"
 
 /* Poppler data dir */
 #define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -53,7 +53,7 @@
 /* #undef USE_EXCEPTIONS */
 
 /* Version number of package */
-#define VERSION "0.12.3"
+#define VERSION "0.12.4"
 
 #define snprintf _snprintf
 #define unlink _unlink
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index afe4165..70f639b 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.12.3
+PROJECT_NUMBER         = 0.12.4
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put.