[poppler] 2 commits - CMakeLists.txt configure.ac msvc/config.h NEWS qt4/src

[Albert Astals Cid]

 CMakeLists.txt         |    4 ++--
 NEWS                   |   18 ++++++++++++++++++
 configure.ac           |    4 ++--
 msvc/config.h          |    6 +++---
 qt4/src/CMakeLists.txt |    2 +-
 qt4/src/Doxyfile       |    2 +-
 qt4/src/Makefile.am    |    2 +-
 7 files changed, 28 insertions(+), 10 deletions(-)

New commits:
commit 943a13c9354dec18cb023642aebbe5d3bb920ed7
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Sep 9 20:04:06 2009 +0200

    poppler 0.12.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbd608a..caaa3a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,8 @@ include(MacroEnsureVersion)
 include(MacroBoolTo01)
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "11")
-set(POPPLER_MICRO_VERSION "3")
+set(POPPLER_MINOR_VERSION "12")
+set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/NEWS b/NEWS
index 0a45463..ea21c51 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Release 0.12.0
+
+	core:
+	 * Fix printf format security warnings
+	 * Improve rendering of radial shadings. Bug #20238
+	 * Better fallback when there's a font type mismatch. Bug #17252
+	 * Do not crash on attachments without data stream. Bug #10386
+	 * Fix infinite loop in JBIG2Decoder. Bug #23025
+	
+	build system:
+	 * Minimizes pkg-config dependencies for Qt frontends
+	 * Add automake 1.11 support
+	 * Use the newest automake found and not the oldest
+	 * Support AM_SILENT_RULES when using automake 1.11
+	
+	utils:
+	 * Add common options to pdftoabw
+
 Release 0.11.3 (0.12 RC 1)
 
 	core:
diff --git a/configure.ac b/configure.ac
index 2b51f51..1fd49fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[11])
-m4_define([poppler_version_micro],[3])
+m4_define([poppler_version_minor],[12])
+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/msvc/config.h b/msvc/config.h
index a8ff352..8bc5ea0 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.11.3"
+#define PACKAGE_STRING "poppler 0.12.0"
 
 /* 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.11.3"
+#define PACKAGE_VERSION "0.12.0"
 
 /* Poppler data dir */
 #define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -53,7 +53,7 @@
 /* #undef USE_EXCEPTIONS */
 
 /* Version number of package */
-#define VERSION "0.11.3"
+#define VERSION "0.12.0"
 
 #define snprintf _snprintf
 #define unlink _unlink
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index c1a41ee..6938b16 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.11.3
+PROJECT_NUMBER         = 0.12.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
commit e8ed7210346cb18f6e4588ad557f993c6d42f4a3
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Sep 9 19:21:21 2009 +0200

    increase library to 3.2.0

diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
index b18c491..59e5083 100644
--- a/qt4/src/CMakeLists.txt
+++ b/qt4/src/CMakeLists.txt
@@ -33,7 +33,7 @@ if (ENABLE_SPLASH)
 endif (ENABLE_SPLASH)
 qt4_automoc(${poppler_qt4_SRCS})
 add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
-set_target_properties(poppler-qt4 PROPERTIES VERSION 3.1.0 SOVERSION 3)
+set_target_properties(poppler-qt4 PROPERTIES VERSION 3.2.0 SOVERSION 3)
 target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
 if(MSVC)
 target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index 1aa00ef..04620af 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -61,7 +61,7 @@ libpoppler_qt4_la_LIBADD += 			\
 	$(top_builddir)/poppler/libpoppler-arthur.la
 endif
 
-libpoppler_qt4_la_LDFLAGS = -version-info 4:0:1
+libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc: