record new upstream branch and merge it

8 files changed, 33 insertions, 26 deletions

diff --git a/INSTALL b/INSTALL
index 35128f929..e4c60aea3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-INSTALL - OpenPrinting CUPS Filters v1.22.4 - 2019-04-05
+INSTALL - OpenPrinting CUPS Filters v1.22.5 - 2019-04-07
 --------------------------------------------------------
 
 This file describes how to compile and install OpenPrinting CUPS
diff --git a/NEWS b/NEWS
index da6154fbc..491a790c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
-NEWS - OpenPrinting CUPS Filters v1.22.4 - 2019-04-05
+NEWS - OpenPrinting CUPS Filters v1.22.5 - 2019-04-07
 -----------------------------------------------------
 
+CHANGES IN V1.22.5
+
+	- foomatic-rip: Changed Ghostscript call to count pages in a
+	  PDF file to use "runpdfbegin" and not the undocumented
+	  Ghostscript internal "pdfdict", so that it works with
+	  Ghostscript 9.27 and later (Debian bug #926576, Arch Linux
+	  bug #62251).
+
 CHANGES IN V1.22.4
 
 	- cups-browsed: Fix broken trailing space removal on
diff --git a/README b/README
index d76fde723..2d80e32e9 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README - OpenPrinting CUPS Filters v1.22.4 - 2019-04-05
+README - OpenPrinting CUPS Filters v1.22.5 - 2019-04-07
 -------------------------------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
diff --git a/configure b/configure
index 11a7847c5..4be91e438 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.22.4.
+# Generated by GNU Autoconf 2.69 for cups-filters 1.22.5.
 #
 #
 # 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.22.4'
-PACKAGE_STRING='cups-filters 1.22.4'
+PACKAGE_VERSION='1.22.5'
+PACKAGE_STRING='cups-filters 1.22.5'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1500,7 +1500,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.22.4 to adapt to many kinds of systems.
+\`configure' configures cups-filters 1.22.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1571,7 +1571,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cups-filters 1.22.4:";;
+     short | recursive ) echo "Configuration of cups-filters 1.22.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1801,7 +1801,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cups-filters configure 1.22.4
+cups-filters configure 1.22.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2439,7 +2439,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.22.4, which was
+It was created by cups-filters $as_me 1.22.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3474,7 +3474,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cups-filters'
- VERSION='1.22.4'
+ VERSION='1.22.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21793,7 +21793,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.22.4, which was
+This file was extended by cups-filters $as_me 1.22.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21859,7 +21859,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.22.4
+cups-filters config.status 1.22.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 6f78b6b5a..317792b6e 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],[22])
-m4_define([cups_filters_version_micro],[4])
+m4_define([cups_filters_version_micro],[5])
 m4_define([cups_filters_version],[cups_filters_version_major.cups_filters_version_minor.cups_filters_version_micro])
 
 # =============
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 5e5517b0a..6521ae4c9 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-b09dfce23d0997448230c18773d5bb4d8e679927
-b09dfce23d0997448230c18773d5bb4d8e679927
-b09dfce23d0997448230c18773d5bb4d8e679927
-b09dfce23d0997448230c18773d5bb4d8e679927
-cups-filters_1.22.4.orig.tar.xz
-ae6fbe1b2f310cbc96af2bd525e778ba60c1c55e
-1476820
+bd00f293b5c84f812fd1114557a61eb3ea8a6463
+bd00f293b5c84f812fd1114557a61eb3ea8a6463
+bd00f293b5c84f812fd1114557a61eb3ea8a6463
+bd00f293b5c84f812fd1114557a61eb3ea8a6463
+cups-filters_1.22.5.orig.tar.xz
+f746c37905986147ff7fc699312a1a79332387b2
+1476792
diff --git a/filter/foomatic-rip/pdf.c b/filter/foomatic-rip/pdf.c
index 9c3979bb2..bc739bd80 100644
--- a/filter/foomatic-rip/pdf.c
+++ b/filter/foomatic-rip/pdf.c
@@ -47,9 +47,8 @@ static int pdf_count_pages(const char *filename)
     size_t bytes;
 
     snprintf(gscommand, CMDLINE_MAX, "%s -dNODISPLAY -q -c "
-	     "'/pdffile (%s) (r) file def pdfdict begin pdffile pdfopen begin "
-	     "(PageCount: ) print pdfpagecount == flush currentdict pdfclose "
-	     "end end quit'",
+	     "'/pdffile (%s) (r) file runpdfbegin (PageCount: ) print "
+	     "pdfpagecount = quit'",
 	     gspath, filename);
 
     FILE *pd = popen(gscommand, "r");
diff --git a/filter/urftopdf.cpp b/filter/urftopdf.cpp
index ec3f8dce3..4e7f6535a 100644
--- a/filter/urftopdf.cpp
+++ b/filter/urftopdf.cpp
@@ -12,8 +12,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @brief Decode URF  to a PDF file
- * @file urf_decode.cpp
+ * @brief Decode URF to a PDF file
+ * @file urftopdf.cpp
  * @author Neil 'Superna' Armstrong <superna9999@gmail.com> (C) 2010
  * @author Tobias Hoffmann <smilingthax@gmail.com> (c) 2012
  */