From 38d8362c09e1d41c85f808995ad93a3bed238cf7 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Tue, 15 Feb 2022 19:36:39 -0500 Subject: [PATCH] Prepare 10.6.2 release --- ChangeLog | 4 ++++ aclocal.m4 | 4 ++-- autofiles.sums | 4 ++-- configure | 20 ++++++++++---------- configure.ac | 4 ++-- include/qpdf/DLL.h | 4 ++-- manual/conf.py | 2 +- manual/release-notes.rst | 2 +- 8 files changed, 24 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd67c9d4..eb3ef323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2022-02-16 Jay Berkenbilt + + * 10.6.2: release + 2022-02-15 Jay Berkenbilt * Fix asymmetrical logic between diff --git a/aclocal.m4 b/aclocal.m4 index e8d099d4..3fbe0b65 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.4 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 4d5cb978..05bf6701 100644 --- a/autofiles.sums +++ b/autofiles.sums @@ -1,5 +1,5 @@ -1a0d01f5ebf03a5ce79a5f116318d0d5fe03480fbb48378397b29d5b7eddffdf configure.ac -d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7 aclocal.m4 +f1a3a7bb38e1b94bf35670f2d91bc6e605b2313c099cff94ae36d6d141b1c01d configure.ac +a45b129101efb46d7ac59ca2cf12d137a5742c2593ea11ebb32401aefd915b96 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 6d072083..bab10f80 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.6.1. +# Generated by GNU Autoconf 2.69 for qpdf 10.6.2. # # # 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.6.1' -PACKAGE_STRING='qpdf 10.6.1' +PACKAGE_VERSION='10.6.2' +PACKAGE_STRING='qpdf 10.6.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1373,7 +1373,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.6.1 to adapt to many kinds of systems. +\`configure' configures qpdf 10.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1439,7 +1439,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of qpdf 10.6.1:";; + short | recursive ) echo "Configuration of qpdf 10.6.2:";; esac cat <<\_ACEOF @@ -1626,7 +1626,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -qpdf configure 10.6.1 +qpdf configure 10.6.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2295,7 +2295,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.6.1, which was +It was created by qpdf $as_me 10.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -16338,7 +16338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # LT = libtool LT_CURRENT=34 LT_AGE=6 -LT_REVISION=1 +LT_REVISION=2 @@ -19261,7 +19261,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.6.1, which was +This file was extended by qpdf $as_me 10.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19327,7 +19327,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.6.1 +qpdf config.status 10.6.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 32309006..490dec81 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.6.1]) +AC_INIT([qpdf],[10.6.2]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_FILES([autoconf.mk]) @@ -64,7 +64,7 @@ LT_INIT([win32-dll]) # LT = libtool LT_CURRENT=34 LT_AGE=6 -LT_REVISION=1 +LT_REVISION=2 AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) diff --git a/include/qpdf/DLL.h b/include/qpdf/DLL.h index dc2ab52e..70401a59 100644 --- a/include/qpdf/DLL.h +++ b/include/qpdf/DLL.h @@ -26,8 +26,8 @@ /* The first version of qpdf to include the version constants is 10.6.0. */ #define QPDF_MAJOR_VERSION 10 #define QPDF_MINOR_VERSION 6 -#define QPDF_PATCH_VERSION 1 -#define QPDF_VERSION "10.6.1" +#define QPDF_PATCH_VERSION 2 +#define QPDF_VERSION "10.6.2" #if (defined _WIN32 || defined __CYGWIN__) && defined(DLL_EXPORT) # define QPDF_DLL __declspec(dllexport) diff --git a/manual/conf.py b/manual/conf.py index 2f1caed4..3dc67b92 100644 --- a/manual/conf.py +++ b/manual/conf.py @@ -16,7 +16,7 @@ project = 'QPDF' copyright = '2005-2022, Jay Berkenbilt' author = 'Jay Berkenbilt' # make_dist and the CI build lexically find the release version from this file. -release = '10.6.1' +release = '10.6.2' version = release extensions = [ 'sphinx_rtd_theme', diff --git a/manual/release-notes.rst b/manual/release-notes.rst index d5a0212e..6e6bcd50 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.6.2: February XXX, 2022 +10.6.2: February 16, 2022 - Bug fixes: - Recognize strings encoded as UTF-16LE as Unicode. The PDF spec