New upstream version 1.25.3

7 files changed, 26 insertions, 17 deletions

diff --git a/INSTALL b/INSTALL
index 6117c6720..a1ae82a67 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-INSTALL - OpenPrinting CUPS Filters v1.25.2 - 2019-08-16
+INSTALL - OpenPrinting CUPS Filters v1.25.3 - 2019-08-21
 --------------------------------------------------------
 
 This file describes how to compile and install OpenPrinting CUPS
diff --git a/NEWS b/NEWS
index 6c82c1a89..40ffc1b74 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
-NEWS - OpenPrinting CUPS Filters v1.25.2 - 2019-08-16
+NEWS - OpenPrinting CUPS Filters v1.25.3 - 2019-08-21
 -----------------------------------------------------
 
+CHANGES IN V1.25.3
+
+	- Sample PPDs: In HP-Color_LaserJet_CM3530_MFP-PDF.ppd renamed
+	  "custom" choice of the option "stapleoption" to "customsize"
+	  as from CUPS 2.2.12 on "custom" is not accepted any more as a
+	  choice name in a PPD file.
+	- cups-browsed: Fixed check whether the remote printer understands
+	  PWG Raster (Issue #141).
+
 CHANGES IN V1.25.2
 
 	- foomatic-rip: Fixed segmentation fault when running
diff --git a/README b/README
index 12ae008b4..41af345a4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README - OpenPrinting CUPS Filters v1.25.2 - 2019-08-16
+README - OpenPrinting CUPS Filters v1.25.3 - 2019-08-21
 -------------------------------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
diff --git a/configure b/configure
index d7bc902d4..1d17188e9 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 cups-filters 1.25.2.
+# Generated by GNU Autoconf 2.69 for cups-filters 1.25.3.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cups-filters'
 PACKAGE_TARNAME='cups-filters'
-PACKAGE_VERSION='1.25.2'
-PACKAGE_STRING='cups-filters 1.25.2'
+PACKAGE_VERSION='1.25.3'
+PACKAGE_STRING='cups-filters 1.25.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1490,7 +1490,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-filters 1.25.2 to adapt to many kinds of systems.
+\`configure' configures cups-filters 1.25.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1561,7 +1561,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cups-filters 1.25.2:";;
+     short | recursive ) echo "Configuration of cups-filters 1.25.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1787,7 +1787,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cups-filters configure 1.25.2
+cups-filters configure 1.25.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2425,7 +2425,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-filters $as_me 1.25.2, which was
+It was created by cups-filters $as_me 1.25.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3460,7 +3460,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cups-filters'
- VERSION='1.25.2'
+ VERSION='1.25.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21664,7 +21664,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-filters $as_me 1.25.2, which was
+This file was extended by cups-filters $as_me 1.25.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21730,7 +21730,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-filters config.status 1.25.2
+cups-filters config.status 1.25.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 27383e7f3..b32bc197d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # ====================
 m4_define([cups_filters_version_major],[1])
 m4_define([cups_filters_version_minor],[25])
-m4_define([cups_filters_version_micro],[2])
+m4_define([cups_filters_version_micro],[3])
 m4_define([cups_filters_version],[cups_filters_version_major.cups_filters_version_minor.cups_filters_version_micro])
 
 # =============
diff --git a/ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd b/ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
index 5e71d95e7..db43fe598 100644
--- a/ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
+++ b/ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
@@ -353,7 +353,7 @@
 *OrderDependency: 100 JCLSetup *stapleoption
 *Defaultstapleoption: none
 *stapleoption default/Default: "@PJL SET STAPLEOPTION=DEFAULT<0A>"
-*stapleoption custom/Custom Size: "@PJL SET STAPLEOPTION=CUSTOM<0A>"
+*stapleoption customsize/Custom Size: "@PJL SET STAPLEOPTION=CUSTOM<0A>"
 *stapleoption five/5: "@PJL SET STAPLEOPTION=FIVE<0A>"
 *stapleoption four/4: "@PJL SET STAPLEOPTION=FOUR<0A>"
 *stapleoption none/None: "@PJL SET STAPLEOPTION=NONE<0A>"
diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
index a0de0904e..c828bd1c4 100644
--- a/utils/cups-browsed.c
+++ b/utils/cups-browsed.c
@@ -7034,11 +7034,11 @@ create_remote_printer_entry (const char *queue_name,
     if (CreateIPPPrinterQueues == IPP_PRINTERS_PWGRASTER ||
 	CreateIPPPrinterQueues == IPP_PRINTERS_DRIVERLESS) {
       valuebuffer[0] = '\0';
-      debug_printf("Checking whether printer %s is PWG Raster:\n",
+      debug_printf("Checking whether printer %s understands PWG Raster:\n",
 		   p->queue_name);
       if ((attr = ippFindAttribute(p->prattrs,
 				   "pwg-raster-document-resolution-supported",
-				   IPP_TAG_KEYWORD)) != NULL) {
+				   IPP_TAG_RESOLUTION)) != NULL) {
 	debug_printf("  Attr: %s\n", ippGetName(attr));
 	ippAttributeString(attr, valuebuffer, sizeof(valuebuffer));
 	debug_printf("  Value: %s\n", valuebuffer);