summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2011-05-03 21:54:59 +0100
committerAlbert Astals Cid <aacid@kde.org>2011-05-03 21:54:59 +0100
commit632d6a40ce3a5d3d8e10bf7e93e8eb578beae907 (patch)
tree5427b3200d4d399ba396ca8f985cc3941d39051c
parentecb136b9927a454df9360a307ccd741eaea3ca93 (diff)
-rw-r--r--CMakeLists.txt4
-rw-r--r--NEWS12
-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, 18 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a708f7c..76cee378 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 "0")
+set(POPPLER_MICRO_VERSION "1")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
@@ -351,7 +351,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 14.0.0 SOVERSION 14)
+set_target_properties(poppler PROPERTIES VERSION 15.0.0 SOVERSION 15)
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 1be8758e..220936be 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Release 0.17.1 (0.18 Beta 1)
+ core:
+ * Rework the way form fields tree is built
+ * Cleanup unused parameters/variables
+
+ glib:
+ * Add JavaScript actions
+ * demo: Show javascript actions in actions view
+
+ qt4:
+ * tests: Turn some assignments to bool into QVERIFY checks
+
Release 0.17.0 (0.18 Alpha)
core:
* Splash: Implement tiling patterns
diff --git a/configure.ac b/configure.ac
index 86ab39bc..b7af92b9 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],[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 203554d1..733b3fbd 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.0
+PROJECT_NUMBER = 0.17.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 cb258ee8..cdf61de8 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -171,7 +171,7 @@ libpoppler_la_LIBADD = \
$(PTHREAD_LIBS) \
$(win32_libs)
-libpoppler_la_LDFLAGS = -version-info 14:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 15:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index f6ad8f84..77e5c44c 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.0
+PROJECT_NUMBER = 0.17.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.