[poppler] 3 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS qt4/src qt5/src utils/pdfseparate.cc

[Albert Astals Cid]

 CMakeLists.txt       |    2 +-
 NEWS                 |    8 ++++++++
 configure.ac         |    2 +-
 cpp/Doxyfile         |    2 +-
 qt4/src/Doxyfile     |    2 +-
 qt5/src/Doxyfile     |    2 +-
 utils/pdfseparate.cc |    1 +
 7 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit a2742c8fce0594ccbdb036dd0c29c6e15d2229f3
Merge: 6b30a52 06dabe1
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Sep 30 19:32:41 2013 +0200

    Merge remote-tracking branch 'origin/poppler-0.24'

commit 06dabe1eed912e5f5c96fe9f371ab459516e5a99
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Sep 27 12:41:23 2013 +0200

    0.24.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96fb5da..e6e2898 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "24")
-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
diff --git a/NEWS b/NEWS
index e1f7cfe..8eef665 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Release 0.24.2
+        core:
+         * Windows: Fix CreateFile fails with ERROR_SHARING_VIOLATION. Bug #69597
+
+        utils:
+         * pdfseparate: improve the path building
+         * pdftocairo: check file opening failure in beginDocument()
+        
 Release 0.24.1
         core:
          * SplashOutputDev: use getRGBLine images if available. Bug #66928
diff --git a/configure.ac b/configure.ac
index 3d23656..ee6b37b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[24])
-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 09f69a3..5903dab 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.24.1
+PROJECT_NUMBER         = 0.24.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/qt4/src/Doxyfile b/qt4/src/Doxyfile
index fbc59e4..c833e01 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.24.1
+PROJECT_NUMBER         = 0.24.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/qt5/src/Doxyfile b/qt5/src/Doxyfile
index 1c3b18f..5e4d8da 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.24.1
+PROJECT_NUMBER         = 0.24.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit 78141da189c42a04b6a303767284de755a4a2d4d
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Sep 27 12:39:00 2013 +0200

    Update copyrights

diff --git a/utils/pdfseparate.cc b/utils/pdfseparate.cc
index e41e547..1d4901b 100644
--- a/utils/pdfseparate.cc
+++ b/utils/pdfseparate.cc
@@ -6,6 +6,7 @@
 //
 // Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2013 Pino Toscano <pino at kde.org>
 //
 //========================================================================
 #include "config.h"