diff --git a/README-maintainer b/README-maintainer index a4840603..b293c07d 100644 --- a/README-maintainer +++ b/README-maintainer @@ -190,8 +190,19 @@ RELEASE PREPARATION casting policy in the manual, and ensure that integer types are properly handled with QIntC or the appropriate cast. -* Increment shared library version information as needed (`LT_CURRENT` - in `configure.ac`). Remember to rerun ./autogen.sh. +* Update versions and shared library details + + * Increment shared library version information as needed + (`LT_CURRENT` in `configure.ac`) + + * Make sure version numbers are consistent in the following locations: + * configure.ac + * libqpdf/QPDF.cc + * manual/qpdf-manual.xml + * qpdf/qpdf.cc + `make_dist` verifies this consistency. + + * Run ./autogen.sh * Performance test is included with binary compatibility steps. Even if releasing a new major release and not doing binary compatibility @@ -230,15 +241,6 @@ pytest -n auto the entities at the top of the document are consistent with the release notes for both version and release date. -* Make sure version numbers are consistent in the following locations: - * configure.ac - * libqpdf/QPDF.cc - * manual/qpdf-manual.xml - * qpdf/qpdf.cc - `make_dist` verifies this consistency. - -* Run ./autogen.sh - * Add a release entry to ChangeLog. diff --git a/autofiles.sums b/autofiles.sums index ce79a9a3..65947722 100644 --- a/autofiles.sums +++ b/autofiles.sums @@ -1,4 +1,4 @@ -cabe87703520d63bbb0ea3e069c3488fd8b43667ae29c2ee5bffffaf20321002 configure.ac +ab2eebed60856bc732a2e6b3b1a2701fc07b0f6be61be2105f76a27bbce0c886 configure.ac d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7 aclocal.m4 3ed561073f0d5c9899e2120e006a7da5ec6bffb80268da1b962cd4f893b89982 libqpdf/qpdf/qpdf-config.h.in 5297971a0ef90bcd5563eb3f7127a032bb76d3ae2af7258bf13479caf8983a60 m4/ax_cxx_compile_stdcxx.m4 diff --git a/configure b/configure index af6e75ff..0e75d59d 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.1.0. +# Generated by GNU Autoconf 2.69 for qpdf 10.2.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.1.0' -PACKAGE_STRING='qpdf 10.1.0' +PACKAGE_VERSION='10.2.0' +PACKAGE_STRING='qpdf 10.2.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1377,7 +1377,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.1.0 to adapt to many kinds of systems. +\`configure' configures qpdf 10.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1443,7 +1443,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of qpdf 10.1.0:";; + short | recursive ) echo "Configuration of qpdf 10.2.0:";; esac cat <<\_ACEOF @@ -1629,7 +1629,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -qpdf configure 10.1.0 +qpdf configure 10.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2298,7 +2298,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.1.0, which was +It was created by qpdf $as_me 10.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -16328,8 +16328,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # * Otherwise, increment LT_REVISION # LT = libtool -LT_CURRENT=29 -LT_AGE=1 +LT_CURRENT=30 +LT_AGE=2 LT_REVISION=0 @@ -19223,7 +19223,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.1.0, which was +This file was extended by qpdf $as_me 10.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19289,7 +19289,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.1.0 +qpdf config.status 10.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 96fdef4d..188cc06e 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.1.0]) +AC_INIT([qpdf],[10.2.0]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_FILES([autoconf.mk]) @@ -52,8 +52,8 @@ LT_INIT([win32-dll]) # * Otherwise, increment LT_REVISION # LT = libtool -LT_CURRENT=29 -LT_AGE=1 +LT_CURRENT=30 +LT_AGE=2 LT_REVISION=0 AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 023e0469..1935d420 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -25,7 +25,7 @@ #include #include -std::string QPDF::qpdf_version = "10.1.0"; +std::string QPDF::qpdf_version = "10.2.0"; static char const* EMPTY_PDF = "%PDF-1.3\n" diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml index 8a1b84ff..565967db 100644 --- a/manual/qpdf-manual.xml +++ b/manual/qpdf-manual.xml @@ -5,8 +5,8 @@ - - + + ]> @@ -5061,7 +5061,7 @@ print "\n"; --> - 10.2.0: Month dd, YYYY + 10.2.0: February 23, 2021 diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc index 5b1295c0..9d489d44 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.1.0"; +static std::string expected_version = "10.2.0"; struct PageSpec {