CMakeLists.txt | 2 +- NEWS | 5 +++++ configure.ac | 2 +- cpp/Doxyfile | 2 +- glib/CMakeLists.txt | 12 ++++++------ glib/Makefile.am | 12 ++++++------ qt4/src/Doxyfile | 2 +- 7 files changed, 21 insertions(+), 16 deletions(-)
New commits: commit 245e331a14e11a615bf47abbeb34a3561e393b41 Author: Albert Astals Cid <[email protected]> Date: Mon Sep 12 13:43:49 2011 +0200 0.17.4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1db4be1..ba899a1 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 "17") -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 e864980..3c19060 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +Release 0.17.4 (0.18 RC) + core: + * SplashOutputDev: Compile when defining USE_FIXEDPOINT + * PNGWriter: Compile with libpng >= 1.5.0 + Release 0.17.3 (0.18 Beta 3) core: * PSOutputDev: Use Patterns for tiling fill when PS level >= 2 diff --git a/configure.ac b/configure.ac index 6d4332d..0fa75cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[17]) -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/cpp/Doxyfile b/cpp/Doxyfile index 3b4abd8..09ac90e 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.17.3 +PROJECT_NUMBER = 0.17.4 # 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 f747599..73909e2 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.17.3 +PROJECT_NUMBER = 0.17.4 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. commit 194b2413eb2c6a1641508aec63336aaf89ec3b51 Author: Albert Astals Cid <[email protected]> Date: Mon Sep 12 13:43:35 2011 +0200 gir 0.18 diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index 73980ee..edc22f1 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -107,20 +107,20 @@ if (HAVE_INTROSPECTION) set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers} poppler-private.h) - set(Poppler_0_16_gir "poppler-glib") - set(Poppler_0_16_gir_INCLUDES GObject-2.0 cairo-1.0) + set(Poppler_0_18_gir "poppler-glib") + set(Poppler_0_18_gir_INCLUDES GObject-2.0 cairo-1.0) get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) _list_prefix(_includes _tmp_includes "-I") - set(Poppler_0_16_gir_CFLAGS ${_includes}) - set(Poppler_0_16_gir_LIBS poppler-glib) + set(Poppler_0_18_gir_CFLAGS ${_includes}) + set(Poppler_0_18_gir_LIBS poppler-glib) _list_prefix(_abs_introspection_files introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/") list(APPEND _abs_introspection_files ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h ) - set(Poppler_0_16_gir_FILES ${_abs_introspection_files}) + set(Poppler_0_18_gir_FILES ${_abs_introspection_files}) - list(APPEND INTROSPECTION_GIRS Poppler-0.16.gir) + list(APPEND INTROSPECTION_GIRS Poppler-0.18.gir) gir_add_introspections(INTROSPECTION_GIRS) endif () diff --git a/glib/Makefile.am b/glib/Makefile.am index e362ff5..67116fc 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -92,13 +92,13 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) introspection_files = $(libpoppler_glib_la_SOURCES) $(poppler_glib_include_HEADERS) -Poppler-0.16.gir: libpoppler-glib.la -Poppler_0_16_gir_INCLUDES = GObject-2.0 cairo-1.0 -Poppler_0_16_gir_CFLAGS = $(INCLUDES) -I$(top_builddir) -Poppler_0_16_gir_LIBS = libpoppler-glib.la -Poppler_0_16_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +Poppler-0.18.gir: libpoppler-glib.la +Poppler_0_18_gir_INCLUDES = GObject-2.0 cairo-1.0 +Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir) +Poppler_0_18_gir_LIBS = libpoppler-glib.la +Poppler_0_18_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) -INTROSPECTION_GIRS += Poppler-0.16.gir +INTROSPECTION_GIRS += Poppler-0.18.gir girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
