summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2013-03-11 19:20:06 +0100
committerAlbert Astals Cid <aacid@kde.org>2013-03-11 19:20:06 +0100
commit341e863d65fdd5619a071e4fd903fa82bf33c757 (patch)
treeb72cbe0fb3358f264d05a357d2a908aa5b191676
parent5db6585c2b02dd4071f1adabd53509506333dcf8 (diff)
-rw-r--r--CMakeLists.txt4
-rw-r--r--NEWS16
-rw-r--r--configure.ac2
-rw-r--r--cpp/Doxyfile2
-rw-r--r--poppler/Makefile.am2
-rw-r--r--qt4/src/Doxyfile2
6 files changed, 22 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b439153d..4643ae02 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 "22")
-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
@@ -396,7 +396,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 34.0.0 SOVERSION 34)
+set_target_properties(poppler PROPERTIES VERSION 35.0.0 SOVERSION 35)
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 36c0398f..c3865576 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+Release 0.22.2
+ core:
+ * Correct rendering of underline and strike out annotations (Bug #61518)
+ * Workaround broken jpeg stream definitions (Bug #61994)
+ * SplashOutputDev: Restore CTM on early exits (Bug #61413)
+ * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432)
+ * Fix latin page labels. (Bug #61034)
+ * Fix compilation with jpeglib9
+ * Fix minor valgrind warning
+
+ utils:
+ * pdfimages: Fix extraction of some images (Bug #61168)
+
+ build system:
+ * Fix the build with automake-1.13
+
Release 0.22.1
core:
* Fix crash in some pdf files when extracting text (Bug #59561)
diff --git a/configure.ac b/configure.ac
index 7653523b..fc77b228 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[22])
-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 2001c0cf..513f2870 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.22.1
+PROJECT_NUMBER = 0.22.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/poppler/Makefile.am b/poppler/Makefile.am
index c25ab03b..9b29591e 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 34:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 35:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 2c4bfb9c..065c643a 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.22.1
+PROJECT_NUMBER = 0.22.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.