summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2013-05-13 23:15:55 +0200
committerAlbert Astals Cid <aacid@kde.org>2013-05-13 23:15:55 +0200
commitea61a9dc012fbffd9bc9fe8a09264ba8744635fc (patch)
tree766674c82c066fedd04c61964b54612fed549658
parent7a5eee1cbebe241b8bd44027fc07682944686910 (diff)
Includes news, soversions, updated copyrights, etc
-rw-r--r--CMakeLists.txt6
-rw-r--r--NEWS12
-rw-r--r--configure.ac4
-rw-r--r--cpp/Doxyfile2
-rw-r--r--goo/gfile.cc1
-rw-r--r--goo/gfile.h1
-rw-r--r--poppler/CairoOutputDev.h2
-rw-r--r--poppler/Makefile.am2
-rw-r--r--poppler/Stream.cc1
-rw-r--r--poppler/Stream.h1
-rw-r--r--poppler/XRef.cc1
-rw-r--r--qt4/src/CMakeLists.txt2
-rw-r--r--qt4/src/Doxyfile2
-rw-r--r--qt4/src/Makefile.am2
14 files changed, 28 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d3f7ac5..67d024ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "22")
-set(POPPLER_MICRO_VERSION "4")
+set(POPPLER_MINOR_VERSION "23")
+set(POPPLER_MICRO_VERSION "0")
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 37.0.0 SOVERSION 37)
+set_target_properties(poppler PROPERTIES VERSION 38.0.0 SOVERSION 38)
target_link_libraries(poppler ${poppler_LIBS})
if(HAVE_PTHREAD)
target_link_libraries(poppler -lpthread)
diff --git a/NEWS b/NEWS
index b374a9c5..7cec86e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Release 0.23.0
+ core:
+ * Make rendering thread safe
+ * Large file support
+ * Implement Crypt filter (Bug #62800)
+ * Fix endstream detection (Bug #62985)
+ * CairoOutputDev: support uncolored tiling patterns (Bug #59179)
+ * SplashOutputDev: Introduce Thin Line mode support (Bug #37347)
+
+ qt4:
+ * Expose Thin Line mode support
+
Release 0.22.4
core:
* Always consider a softmask transfer function (Bug #63587)
diff --git a/configure.ac b/configure.ac
index 460142b5..79fbc604 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],[4])
+m4_define([poppler_version_minor],[23])
+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/cpp/Doxyfile b/cpp/Doxyfile
index a651685a..9b50ed36 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.4
+PROJECT_NUMBER = 0.23.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/goo/gfile.cc b/goo/gfile.cc
index c46fd86c..2371db2c 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -22,6 +22,7 @@
// Copyright (C) 2009, 2012 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --git a/goo/gfile.h b/goo/gfile.h
index 0caee711..5f546f11 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -19,6 +19,7 @@
// Copyright (C) 2009, 2011, 2012 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
index 483b1615..bbad744f 100644
--- a/poppler/CairoOutputDev.h
+++ b/poppler/CairoOutputDev.h
@@ -18,7 +18,7 @@
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009, 2011, 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008, 2009, 2011-2013 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
//
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 74515012..036edca1 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 37:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 38:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index e9533faf..190a83a9 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -29,6 +29,7 @@
// Copyright (C) 2012 Even Rouault <even.rouault@mines-paris.org>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2013 Pino Toscano <pino@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --git a/poppler/Stream.h b/poppler/Stream.h
index 0a178b4c..aa58e8c1 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -25,6 +25,7 @@
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2013 Pino Toscano <pino@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 85745ffc..9df48019 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -23,6 +23,7 @@
// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@kabelmail.de>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Pino Toscano <pino@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
index b5469542..dff7aa69 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.2.0 SOVERSION 4)
+set_target_properties(poppler-qt4 PROPERTIES VERSION 4.3.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 90a0645c..eceae65b 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.4
+PROJECT_NUMBER = 0.23.0
# 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 77426470..efa0e14a 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 6:0:2 @create_shared_lib@ @auto_import_flags@
+libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
# This rule lets GNU make create any *.moc from the equivalent *.h
.h.moc: