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

[Albert Astals Cid]

 CMakeLists.txt     |    2 +-
 NEWS               |   12 ++++++++++++
 configure.ac       |    4 ++--
 cpp/Doxyfile       |    2 +-
 qt4/src/Doxyfile   |    2 +-
 qt5/src/Doxyfile   |    2 +-
 utils/pdftohtml.cc |    2 +-
 7 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit 2dd9b95fd910023a7d9d23f2c2e41dcab91d3c31
Merge: fed71eb b36d27b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jun 6 21:43:49 2014 +0200

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

commit b36d27b42417d15866a5729409e39d6f7c2b0289
Author: Hib Eris <hib at hiberis.nl>
Date:   Fri Jun 6 21:42:10 2014 +0200

    Fix typo in configure.ac
    
    Bug #79742

diff --git a/configure.ac b/configure.ac
index bffec48..4d55bec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,7 +229,7 @@ if test x$enable_libtiff = xyes; then
   if test x"$LIBTIFF_LIBS" = x; then
     LIBTIFF_LIBS="-ltiff"
   fi
-  AC_SUBST(LIBTIFF_CFLAGSS)
+  AC_SUBST(LIBTIFF_CFLAGS)
   AC_SUBST(LIBTIFF_LIBS)
   AC_DEFINE(ENABLE_LIBTIFF)
 fi
commit f5e702060a84362bfdf75260531920d4ba8b7333
Author: Pino Toscano <pino at kde.org>
Date:   Sat May 24 15:59:42 2014 +0200

    pdftohtml: exit with 0 with -v and -h

diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 8ce0430..35e8d84 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -200,7 +200,7 @@ int main(int argc, char *argv[]) {
     if (!printVersion) {
       printUsage("pdftohtml", "<PDF-file> [<html-file> <xml-file>]", argDesc);
     }
-    exit(1);
+    exit(printHelp || printVersion ? 0 : 1);
   }
  
   // init error file
commit 700bf398ef7b20306f5035e423becfaa3d28fb10
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri May 23 20:05:41 2014 +0200

    0.26.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbafc4e..7ceb643 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "26")
-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
diff --git a/NEWS b/NEWS
index fb46164..9522bfe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Release 0.26.1
+        core:
+         * Use field value V for radio buttons. Bug #75979
+         * Fix extraction of text in some files. Bug #78145
+         * Only add annotations of the current page when splitting. Bug #77549
+
+        build system:
+         * autoconf: Fix libopenjpeg 1.5 detection on some systems. Bug #78389
+
+        glib:
+         * Fix multiple definition of PopplerTextSpan
+
 Release 0.26.0
         qt4:
          * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent
diff --git a/configure.ac b/configure.ac
index fdfe570..bffec48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[26])
-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 87d14de..a657514 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.26.0
+PROJECT_NUMBER         = 0.26.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/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 73b3bef..b37989e 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.26.0
+PROJECT_NUMBER         = 0.26.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/qt5/src/Doxyfile b/qt5/src/Doxyfile
index bab1f0f..ad50aa8 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.26.0
+PROJECT_NUMBER         = 0.26.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.