diff --git a/ChangeLog b/ChangeLog index 23c213a6..e48c1d82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2021-12-20 Jay Berkenbilt + + * 10.5.0: release + 2021-12-19 Jay Berkenbilt * C API: clarify documentation around string lengths. Add two new diff --git a/aclocal.m4 b/aclocal.m4 index 3fbe0b65..e8d099d4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.4 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/autofiles.sums b/autofiles.sums index a0476d70..0190d135 100644 --- a/autofiles.sums +++ b/autofiles.sums @@ -1,5 +1,5 @@ -44c66263db20dec40cefe94df4f9f9effe7410f20865cd53cf89268f6a98010f configure.ac -a45b129101efb46d7ac59ca2cf12d137a5742c2593ea11ebb32401aefd915b96 aclocal.m4 +c2704f4dca902266b5356fc80558ee642a5df6fac0ca97367903cb62efef5e75 configure.ac +d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7 aclocal.m4 c12d837479fa9a3fa4c278b6dc7d6b449503d663e0f0d294305595a51ff43f70 libqpdf/qpdf/qpdf-config.h.in 5297971a0ef90bcd5563eb3f7127a032bb76d3ae2af7258bf13479caf8983a60 m4/ax_cxx_compile_stdcxx.m4 35bc5c645dc42d47f2daeea06f8f3e767c8a1aee6a35eb2b4854fd2ce66c3413 m4/ax_random_device.m4 diff --git a/configure b/configure index eaf6a7f5..9b17a651 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for qpdf 10.4.0. +# Generated by GNU Autoconf 2.69 for qpdf 10.5.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='qpdf' PACKAGE_TARNAME='qpdf' -PACKAGE_VERSION='10.4.0' -PACKAGE_STRING='qpdf 10.4.0' +PACKAGE_VERSION='10.5.0' +PACKAGE_STRING='qpdf 10.5.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1371,7 +1371,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures qpdf 10.4.0 to adapt to many kinds of systems. +\`configure' configures qpdf 10.5.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1437,7 +1437,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of qpdf 10.4.0:";; + short | recursive ) echo "Configuration of qpdf 10.5.0:";; esac cat <<\_ACEOF @@ -1619,7 +1619,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -qpdf configure 10.4.0 +qpdf configure 10.5.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2288,7 +2288,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by qpdf $as_me 10.4.0, which was +It was created by qpdf $as_me 10.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -16316,8 +16316,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # * Otherwise, increment LT_REVISION # LT = libtool -LT_CURRENT=32 -LT_AGE=4 +LT_CURRENT=33 +LT_AGE=5 LT_REVISION=0 @@ -19241,7 +19241,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by qpdf $as_me 10.4.0, which was +This file was extended by qpdf $as_me 10.5.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19307,7 +19307,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -qpdf config.status 10.4.0 +qpdf config.status 10.5.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5e868dce..f5f789f4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl This config.in requires autoconf 2.5 or greater. AC_PREREQ([2.68]) -AC_INIT([qpdf],[10.4.0]) +AC_INIT([qpdf],[10.5.0]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_FILES([autoconf.mk]) @@ -51,8 +51,8 @@ LT_INIT([win32-dll]) # * Otherwise, increment LT_REVISION # LT = libtool -LT_CURRENT=32 -LT_AGE=4 +LT_CURRENT=33 +LT_AGE=5 LT_REVISION=0 AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index c81aede0..b90c213e 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -25,7 +25,7 @@ #include #include -std::string QPDF::qpdf_version = "10.4.0"; +std::string QPDF::qpdf_version = "10.5.0"; static char const* EMPTY_PDF = "%PDF-1.3\n" diff --git a/manual/conf.py b/manual/conf.py index aaed236f..3fb14c5a 100644 --- a/manual/conf.py +++ b/manual/conf.py @@ -11,7 +11,7 @@ import sphinx_rtd_theme # noQA F401 project = 'QPDF' copyright = '2005-2021, Jay Berkenbilt' author = 'Jay Berkenbilt' -release = '10.4.0' +release = '10.5.0' version = release extensions = [ 'sphinx_rtd_theme', diff --git a/manual/release-notes.rst b/manual/release-notes.rst index 4750cb23..7db44c08 100644 --- a/manual/release-notes.rst +++ b/manual/release-notes.rst @@ -6,7 +6,7 @@ Release Notes For a detailed list of changes, please see the file :file:`ChangeLog` in the source distribution. -10.5.0: XXX Month dd, YYYY +10.5.0: December 20, 2021 - Packaging changes - The structure of the ``doc`` directory is different. The PDF diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc index c363c087..5f9acabc 100644 --- a/qpdf/qpdf.cc +++ b/qpdf/qpdf.cc @@ -40,7 +40,7 @@ static int constexpr EXIT_CORRECT_PASSWORD = 3; static char const* whoami = 0; -static std::string expected_version = "10.4.0"; +static std::string expected_version = "10.5.0"; struct PageSpec {