summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2012-11-09 20:02:25 +0100
committerAlbert Astals Cid <aacid@kde.org>2012-11-09 20:02:25 +0100
commit7e2e9567f51d01be9a88848e1141c6d4f0f768a1 (patch)
treea6b2e571ce20186e4721994343420bfae827f4b8
parent98b7cfd289abb53a745a88d6ec99e95df477fc8f (diff)
-rw-r--r--CMakeLists.txt4
-rw-r--r--NEWS14
-rw-r--r--configure.ac2
-rw-r--r--cpp/Doxyfile2
-rw-r--r--poppler/Makefile.am2
-rw-r--r--qt4/src/CMakeLists.txt2
-rw-r--r--qt4/src/Doxyfile2
-rw-r--r--qt4/src/Makefile.am2
8 files changed, 22 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8836ae41..d1de3c2d 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 "21")
-set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_MICRO_VERSION "1")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
@@ -394,7 +394,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 29.0.0 SOVERSION 29)
+set_target_properties(poppler PROPERTIES VERSION 30.0.0 SOVERSION 30)
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 c0381a59..3955431d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Release 0.21.1
+ core:
+ * Annotation improvements
+ * Form improvements
+ * CairoImageOutputDev: Support parameterized Gouraud shading (Bug #56463)
+ * UTF validation fixes
+ * Do not call drawing routines if we don't need non text (Bug #54617)
+ * Fix Memory leak in CharCodeToUnicode (Bug #54702)
+
+ qt4:
+ * Make LinkRendition properties available (Bug #55378)
+ * Accessors for FormWidgetChoice::editChoice
+ * Implement overprint
+
Release 0.21.0
core:
* Support the modification of files with Encrypt
diff --git a/configure.ac b/configure.ac
index 2c44efb2..762aa6b2 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],[0])
+m4_define([poppler_version_micro],[1])
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 8a2aa70f..fbcd4724 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.0
+PROJECT_NUMBER = 0.21.1
# 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 e10d19d5..e210a1d6 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 29:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 30:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
index c06730b3..b5469542 100644
--- a/qt4/src/CMakeLists.txt
+++ b/qt4/src/CMakeLists.txt
@@ -30,7 +30,7 @@ set(poppler_qt4_SRCS
)
qt4_automoc(${poppler_qt4_SRCS})
add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
-set_target_properties(poppler-qt4 PROPERTIES VERSION 4.1.0 SOVERSION 4)
+set_target_properties(poppler-qt4 PROPERTIES VERSION 4.2.0 SOVERSION 4)
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/Doxyfile b/qt4/src/Doxyfile
index 85673f46..dcb8bf01 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.0
+PROJECT_NUMBER = 0.21.1
# 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/Makefile.am b/qt4/src/Makefile.am
index b91daf0f..77426470 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 \
$(POPPLER_QT4_LIBS)
-libpoppler_qt4_la_LDFLAGS = -version-info 5:0:1 @create_shared_lib@ @auto_import_flags@
+libpoppler_qt4_la_LDFLAGS = -version-info 6:0:2 @create_shared_lib@ @auto_import_flags@
# This rule lets GNU make create any *.moc from the equivalent *.h
.h.moc: