From: Michael R Sweet Date: Thu, 26 Jan 2017 21:14:10 +0000 (-0500) Subject: Bump version to 2.2.3. X-Git-Tag: v2.2.3~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8a1fa03d05414b03469ab0b8051135cd42d762b;p=thirdparty%2Fcups.git Bump version to 2.2.3. Update changelog. --- diff --git a/CHANGES.txt b/CHANGES.txt index 4be9f3fd13..5dc93414e7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,11 @@ -CHANGES.txt - 2.2.2 - 2017-01-17 +CHANGES.txt - 2.2.3 - 2017-01-26 -------------------------------- +CHANGES IN CUPS V2.2.3 + + - Fixed some localization issues on macOS. + + CHANGES IN CUPS V2.2.2 - Fixed some issues with the Zebra ZPL printer driver (Issue #4898) diff --git a/configure b/configure index 1788f33119..51cb587fc7 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.68 for CUPS 2.2.2. +# Generated by GNU Autoconf 2.68 for CUPS 2.2.3. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.2.2' -PACKAGE_STRING='CUPS 2.2.2' +PACKAGE_VERSION='2.2.3' +PACKAGE_STRING='CUPS 2.2.3' PACKAGE_BUGREPORT='https://github.com/apple/cups/issues' PACKAGE_URL='https://www.cups.org/' @@ -1448,7 +1448,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 CUPS 2.2.2 to adapt to many kinds of systems. +\`configure' configures CUPS 2.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1509,7 +1509,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.2.2:";; + short | recursive ) echo "Configuration of CUPS 2.2.3:";; esac cat <<\_ACEOF @@ -1689,7 +1689,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.2.2 +CUPS configure 2.2.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2153,7 +2153,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 CUPS $as_me 2.2.2, which was +It was created by CUPS $as_me 2.2.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2527,7 +2527,7 @@ esac ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.2.2" +CUPS_VERSION="2.2.3" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" @@ -10748,7 +10748,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 CUPS $as_me 2.2.2, which was +This file was extended by CUPS $as_me 2.2.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10811,7 +10811,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="\\ -CUPS config.status 2.2.2 +CUPS config.status 2.2.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7369e0f1ab..ad3ec8e36f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl dnl Configuration script for CUPS. dnl -dnl Copyright 2007-2016 by Apple Inc. +dnl Copyright 2007-2017 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -15,7 +15,7 @@ dnl We need at least autoconf 2.60... AC_PREREQ(2.60) dnl Package name and version... -AC_INIT([CUPS], [2.2.2], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/]) +AC_INIT([CUPS], [2.2.3], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/]) sinclude(config-scripts/cups-opsys.m4) sinclude(config-scripts/cups-common.m4) diff --git a/cups/cups.h b/cups/cups.h index 06e2f9bbe0..3205dd82f2 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,7 +1,7 @@ /* * API definitions for CUPS. * - * Copyright 2007-2016 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -47,10 +47,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 2.0202 +# define CUPS_VERSION 2.0203 # define CUPS_VERSION_MAJOR 2 # define CUPS_VERSION_MINOR 2 -# define CUPS_VERSION_PATCH 2 +# define CUPS_VERSION_PATCH 3 # define CUPS_BC_FD 3 /* Back-channel file descriptor for diff --git a/vcnet/config.h b/vcnet/config.h index b336a8170d..05fe9b2a0b 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -94,8 +94,8 @@ typedef unsigned long useconds_t; * Version of software... */ -#define CUPS_SVERSION "CUPS v2.2.2" -#define CUPS_MINIMAL "CUPS/2.2.2" +#define CUPS_SVERSION "CUPS v2.2.3" +#define CUPS_MINIMAL "CUPS/2.2.3" /* diff --git a/xcode/config.h b/xcode/config.h index 271b699af9..26b12a71b1 100644 --- a/xcode/config.h +++ b/xcode/config.h @@ -22,8 +22,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v2.2.2" -#define CUPS_MINIMAL "CUPS/2.2.2" +#define CUPS_SVERSION "CUPS v2.2.3" +#define CUPS_MINIMAL "CUPS/2.2.3" /*