CMakeLists.txt | 4 ++-- Makefile.am | 2 +- configure.ac | 2 +- cpp/Doxyfile | 2 +- poppler/Annot.cc | 2 +- poppler/Annot.h | 2 +- poppler/Makefile.am | 2 +- poppler/Page.cc | 2 +- poppler/TextOutputDev.cc | 2 +- poppler/TextOutputDev.h | 2 +- qt4/src/Doxyfile | 2 +- qt5/src/Doxyfile | 2 +- qt5/src/poppler-annotation.cc | 2 +- qt5/src/poppler-annotation.h | 2 +- qt5/src/poppler-document.cc | 2 +- qt5/src/poppler-link.cc | 2 +- qt5/src/poppler-qt5.h | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit df1fe9dc7ade5228e37c16c6f0c9a2d4890fdc90 Author: Albert Astals Cid <[email protected]> Date: Tue Jul 2 00:33:04 2013 +0200 0.23.3 diff --git a/CMakeLists.txt b/CMakeLists.txt index fccdde4..1d6cff5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS() set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "23") -set(POPPLER_MICRO_VERSION "2") +set(POPPLER_MICRO_VERSION "3") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches @@ -420,7 +420,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 40.0.0 SOVERSION 40) +set_target_properties(poppler PROPERTIES VERSION 41.0.0 SOVERSION 41) target_link_libraries(poppler ${poppler_LIBS}) if(HAVE_PTHREAD) target_link_libraries(poppler -lpthread) diff --git a/Makefile.am b/Makefile.am index a0d09f6..e7e5bac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,7 +92,7 @@ EXTRA_DIST += \ cmake/modules/FindIconv.cmake \ cmake/modules/FindLCMS.cmake \ cmake/modules/FindLCMS2.cmake \ - cmake/modules/FindQt5.cmake \ + cmake/modules/FindQt4.cmake \ cmake/modules/GObjectIntrospectionMacros.cmake \ cmake/modules/MacroBoolTo01.cmake \ cmake/modules/MacroEnsureVersion.cmake \ diff --git a/configure.ac b/configure.ac index 7599434..1a7ca8c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[23]) -m4_define([poppler_version_micro],[2]) +m4_define([poppler_version_micro],[3]) 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 db2e048..06075f3 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.23.2 +PROJECT_NUMBER = 0.23.3 # 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 db6b34e..c061e71 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -157,7 +157,7 @@ libpoppler_la_LIBADD = \ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 40:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 41:0:0 @create_shared_lib@ @auto_import_flags@ if ENABLE_XPDF_HEADERS diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile index 74678c4..44efcbf 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.23.2 +PROJECT_NUMBER = 0.23.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile index 8a6e6d9..5b337e3 100644 --- a/qt5/src/Doxyfile +++ b/qt5/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.23.2 +PROJECT_NUMBER = 0.23.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. commit df9d4fee17adfe003c822175b6921a3cd93675f6 Author: Albert Astals Cid <[email protected]> Date: Mon Jul 1 21:04:10 2013 +0200 Update copyrights diff --git a/poppler/Annot.cc b/poppler/Annot.cc index 454ce71..f0cce6d 100644 --- a/poppler/Annot.cc +++ b/poppler/Annot.cc @@ -16,7 +16,7 @@ // Copyright (C) 2006 Scott Turner <[email protected]> // Copyright (C) 2007, 2008 Julien Rebetez <[email protected]> // Copyright (C) 2007-2013 Albert Astals Cid <[email protected]> -// Copyright (C) 2007-2012 Carlos Garcia Campos <[email protected]> +// Copyright (C) 2007-2013 Carlos Garcia Campos <[email protected]> // Copyright (C) 2007, 2008 Iñigo MartÃnez <[email protected]> // Copyright (C) 2007 Jeff Muizelaar <[email protected]> // Copyright (C) 2008, 2011 Pino Toscano <[email protected]> diff --git a/poppler/Annot.h b/poppler/Annot.h index 90c7328..2865d23 100644 --- a/poppler/Annot.h +++ b/poppler/Annot.h @@ -15,7 +15,7 @@ // // Copyright (C) 2006 Scott Turner <[email protected]> // Copyright (C) 2007, 2008 Julien Rebetez <[email protected]> -// Copyright (C) 2007-2011 Carlos Garcia Campos <[email protected]> +// Copyright (C) 2007-2011, 2013 Carlos Garcia Campos <[email protected]> // Copyright (C) 2007, 2008 Iñigo MartÃnez <[email protected]> // Copyright (C) 2008 Michael Vrable <[email protected]> // Copyright (C) 2008 Hugo Mercier <[email protected]> diff --git a/poppler/Page.cc b/poppler/Page.cc index a7f3e2d..e0a3b29 100644 --- a/poppler/Page.cc +++ b/poppler/Page.cc @@ -24,7 +24,7 @@ // Copyright (C) 2008 Iñigo MartÃnez <[email protected]> // Copyright (C) 2008 Brad Hards <[email protected]> // Copyright (C) 2008 Ilya Gorenbein <[email protected]> -// Copyright (C) 2012 Fabio D'Urso <[email protected]> +// Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2013 Jason Crain <[email protected]> // diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc index 928e95a..5efb5c3 100644 --- a/poppler/TextOutputDev.cc +++ b/poppler/TextOutputDev.cc @@ -15,7 +15,7 @@ // // Copyright (C) 2005-2007 Kristian Høgsberg <[email protected]> // Copyright (C) 2005 Nickolay V. Shmyrev <[email protected]> -// Copyright (C) 2006-2008, 2011, 2012 Carlos Garcia Campos <[email protected]> +// Copyright (C) 2006-2008, 2011-2013 Carlos Garcia Campos <[email protected]> // Copyright (C) 2006, 2007 Ed Catmur <[email protected]> // Copyright (C) 2006 Jeff Muizelaar <[email protected]> // Copyright (C) 2007, 2008, 2012 Adrian Johnson <[email protected]> diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h index 6269f1c..56736b3 100644 --- a/poppler/TextOutputDev.h +++ b/poppler/TextOutputDev.h @@ -15,7 +15,7 @@ // // Copyright (C) 2005-2007 Kristian Høgsberg <[email protected]> // Copyright (C) 2006 Ed Catmur <[email protected]> -// Copyright (C) 2007, 2008, 2011 Carlos Garcia Campos <[email protected]> +// Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <[email protected]> // Copyright (C) 2007 Adrian Johnson <[email protected]> // Copyright (C) 2008, 2010 Albert Astals Cid <[email protected]> // Copyright (C) 2010 Brian Ewins <[email protected]> diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc index 89d33e3..052e060 100644 --- a/qt5/src/poppler-annotation.cc +++ b/qt5/src/poppler-annotation.cc @@ -1,5 +1,5 @@ /* poppler-annotation.cc: qt interface to poppler - * Copyright (C) 2006, 2009, 2012 Albert Astals Cid <[email protected]> + * Copyright (C) 2006, 2009, 2012, 2013 Albert Astals Cid <[email protected]> * Copyright (C) 2006, 2008, 2010 Pino Toscano <[email protected]> * Copyright (C) 2012, Guillermo A. Amaral B. <[email protected]> * Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> diff --git a/qt5/src/poppler-annotation.h b/qt5/src/poppler-annotation.h index afdca33..bbcb9de 100644 --- a/qt5/src/poppler-annotation.h +++ b/qt5/src/poppler-annotation.h @@ -1,5 +1,5 @@ /* poppler-annotation.h: qt interface to poppler - * Copyright (C) 2006-2008, 2012 Albert Astals Cid <[email protected]> + * Copyright (C) 2006-2008, 2012, 2013 Albert Astals Cid <[email protected]> * Copyright (C) 2006, 2008 Pino Toscano <[email protected]> * Copyright (C) 2007, Brad Hards <[email protected]> * Copyright (C) 2010, Philip Lorenz <[email protected]> diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc index edc8008..af1804e 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc @@ -1,7 +1,7 @@ /* poppler-document.cc: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. * Copyright (C) 2005, 2008, Brad Hards <[email protected]> - * Copyright (C) 2005-2010, 2012, Albert Astals Cid <[email protected]> + * Copyright (C) 2005-2010, 2012, 2013, Albert Astals Cid <[email protected]> * Copyright (C) 2006-2010, Pino Toscano <[email protected]> * Copyright (C) 2010, 2011 Hib Eris <[email protected]> * Copyright (C) 2012 Koji Otani <[email protected]> diff --git a/qt5/src/poppler-link.cc b/qt5/src/poppler-link.cc index 7de569c..ca6e6eb 100644 --- a/qt5/src/poppler-link.cc +++ b/qt5/src/poppler-link.cc @@ -1,5 +1,5 @@ /* poppler-link.cc: qt interface to poppler - * Copyright (C) 2006-2007, Albert Astals Cid + * Copyright (C) 2006-2007, 2013, Albert Astals Cid * Copyright (C) 2007-2008, Pino Toscano <[email protected]> * Copyright (C) 2010 Hib Eris <[email protected]> * Copyright (C) 2012, Tobias Koenig <[email protected]> diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h index 9a9feba..bf820a1 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h @@ -1,7 +1,7 @@ /* poppler-qt.h: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. * Copyright (C) 2005, 2007, Brad Hards <[email protected]> - * Copyright (C) 2005-2012, Albert Astals Cid <[email protected]> + * Copyright (C) 2005-2013, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Stefan Kebekus <[email protected]> * Copyright (C) 2006-2011, Pino Toscano <[email protected]> * Copyright (C) 2009 Shawn Rutledge <[email protected]>
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
