Hello community,
here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2015-05-23 13:03:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cups-filters (Old)
and /work/SRC/openSUSE:Factory/.cups-filters.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups-filters"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2015-03-30 19:09:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2015-05-23 13:03:06.000000000 +0200
@@ -1,0 +2,17 @@
+Thu May 14 13:08:33 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 1.0.68:
+ * cups-browsed: Numeric IDs for GSources of the glib event
+ loop must be positive integers greater than zero according
+ to the documentation of the g_source_get_id() function.
+ Taken care of this at all places.
+ * cups-browsed: Added conditionals so that it also builds with
+ CUPS 1.5.x (but then withou support for automatically creating
+ queues for IPP network printers). Thanks to Johannes Meixner from
+ SUSE for the patch (Bug #1268).
+ * Ricoh-PDF_Printer-PDF.ppd: Added PPD file for Ricoh's PDF printers
+ (experimental). Thanks to Ulrich Wehner from Ricoh for the file.
+- Remove upstream merged patch:
+ * fix-create_local_queue-ifndef-HAVE_CUPS_1_6.diff
+
+-------------------------------------------------------------------
Old:
----
cups-filters-1.0.67.tar.xz
fix-create_local_queue-ifndef-HAVE_CUPS_1_6.diff
New:
----
cups-filters-1.0.68.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups-filters.spec ++++++
--- /var/tmp/diff_new_pack.TmrlzD/_old 2015-05-23 13:03:07.000000000 +0200
+++ /var/tmp/diff_new_pack.TmrlzD/_new 2015-05-23 13:03:07.000000000 +0200
@@ -36,16 +36,9 @@
# and also run: zypper vcmp 'next version' 'current version'
# e.g. zypper vcmp '1.0.49' '1.0.49.20140326' -> 1.0.49 is older than 1.0.49.20140326
# and zypper vcmp '1.0.50' '1.0.49.20140326' -> 1.0.50 is newer than 1.0.49.20140326
-Version: 1.0.67
+Version: 1.0.68
Release: 0
Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
-# Patch1 fix-create_local_queue-ifndef-HAVE_CUPS_1_6.diff
-# makes it compile again without errors also for CUPS <= 1.5.4
-# by excluding code that uses CUPS >= 1.6 specific stuff,
-# in particular by skipping create_local_queue for non-CUPS
-# printer broadcasts for CUPS <= 1.5.4, see the upstream bug
-# https://bugs.linuxfoundation.org/show_bug.cgi?id=1268
-Patch1: fix-create_local_queue-ifndef-HAVE_CUPS_1_6.diff
# Since cups-filters version 1.0.42 foomatic-rip is also provided by cups-filters.
# The foomatic-rip version that is provided by cups-filters is not specified in the cups-filters sources
# but on http://www.openprinting.org/download/foomatic/ the foomatic-filters-4.0-current.tar.gz
@@ -282,13 +275,6 @@
%prep
%setup -q
-# Patch1 fix-create_local_queue-ifndef-HAVE_CUPS_1_6.diff
-# makes it compile again without errors also for CUPS <= 1.5.4
-# by excluding code that uses CUPS >= 1.6 specific stuff,
-# in particular by skipping create_local_queue for non-CUPS
-# printer broadcasts for CUPS <= 1.5.4, see the upstream bug
-# https://bugs.linuxfoundation.org/show_bug.cgi?id=1268
-%patch1
%build
# Just do what is described in the upstream INSTALL file
++++++ cups-filters-1.0.67.tar.xz -> cups-filters-1.0.68.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/INSTALL new/cups-filters-1.0.68/INSTALL
--- old/cups-filters-1.0.67/INSTALL 2015-03-11 16:17:51.000000000 +0100
+++ new/cups-filters-1.0.68/INSTALL 2015-04-13 16:46:32.000000000 +0200
@@ -1,4 +1,4 @@
-INSTALL - OpenPrinting CUPS Filters v1.0.67 - 2015-03-11
+INSTALL - OpenPrinting CUPS Filters v1.0.68 - 2015-04-13
--------------------------------------------------------
This file describes how to compile and install OpenPrinting CUPS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/Makefile.am new/cups-filters-1.0.68/Makefile.am
--- old/cups-filters-1.0.67/Makefile.am 2015-02-27 18:50:43.000000000 +0100
+++ new/cups-filters-1.0.68/Makefile.am 2015-03-18 01:41:33.000000000 +0100
@@ -751,6 +751,7 @@
ppd/Generic-PDF_Printer-PDF.ppd \
ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd \
ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd \
+ ppd/Ricoh-PDF_Printer-PDF.ppd \
ppd/pxlcolor.ppd \
ppd/pxlmono.ppd \
ppd/textonly.ppd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/Makefile.in new/cups-filters-1.0.68/Makefile.in
--- old/cups-filters-1.0.67/Makefile.in 2015-03-11 16:21:39.000000000 +0100
+++ new/cups-filters-1.0.68/Makefile.in 2015-04-13 17:09:58.000000000 +0200
@@ -1630,6 +1630,7 @@
ppd/Generic-PDF_Printer-PDF.ppd \
ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd \
ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd \
+ ppd/Ricoh-PDF_Printer-PDF.ppd \
ppd/pxlcolor.ppd \
ppd/pxlmono.ppd \
ppd/textonly.ppd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/NEWS new/cups-filters-1.0.68/NEWS
--- old/cups-filters-1.0.67/NEWS 2015-03-11 16:17:28.000000000 +0100
+++ new/cups-filters-1.0.68/NEWS 2015-04-13 16:47:23.000000000 +0200
@@ -1,6 +1,19 @@
-NEWS - OpenPrinting CUPS Filters v1.0.67 - 2015-03-11
+NEWS - OpenPrinting CUPS Filters v1.0.68 - 2015-04-13
-----------------------------------------------------
+CHANGES IN V1.0.68
+
+ - cups-browsed: Numeric IDs for GSources of the glib event
+ loop must be positive integers greater than zero according
+ to the documentation of the g_source_get_id() function.
+ Taken care of this at all places.
+ - cups-browsed: Added conditionals so that it also builds with
+ CUPS 1.5.x (but then withou support for automatically creating
+ queues for IPP network printers). Thanks to Johannes Meixner from
+ SUSE for the patch (Bug #1268).
+ - Ricoh-PDF_Printer-PDF.ppd: Added PPD file for Ricoh's PDF printers
+ (experimental). Thanks to Ulrich Wehner from Ricoh for the file.
+
CHANGES IN V1.0.67
- cups-browsed: Use g_source_remove() instead of g_source_destroy()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/README new/cups-filters-1.0.68/README
--- old/cups-filters-1.0.67/README 2015-03-11 16:18:11.000000000 +0100
+++ new/cups-filters-1.0.68/README 2015-04-13 16:45:59.000000000 +0200
@@ -1,4 +1,4 @@
-README - OpenPrinting CUPS Filters v1.0.67 - 2015-03-11
+README - OpenPrinting CUPS Filters v1.0.68 - 2015-04-13
-------------------------------------------------------
Looking for compile instructions? Read the file "INSTALL.txt"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/aclocal.m4 new/cups-filters-1.0.68/aclocal.m4
--- old/cups-filters-1.0.67/aclocal.m4 2015-03-11 16:21:38.000000000 +0100
+++ new/cups-filters-1.0.68/aclocal.m4 2015-04-13 17:09:56.000000000 +0200
@@ -180,6 +180,61 @@
fi[]dnl
])# PKG_CHECK_MODULES
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -733,7 +788,8 @@
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/config.guess new/cups-filters-1.0.68/config.guess
--- old/cups-filters-1.0.67/config.guess 2015-03-11 16:21:39.000000000 +0100
+++ new/cups-filters-1.0.68/config.guess 2015-04-13 17:09:57.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-06-10'
+timestamp='2014-03-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
@@ -826,7 +826,7 @@
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -969,10 +969,10 @@
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
@@ -1260,16 +1260,26 @@
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
@@ -1361,154 +1371,6 @@
exit ;;
esac
-eval $set_cc_for_build
-cat >$dummy.c <
-# include
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
cat >&2 <>confdefs.h <<_ACEOF
@@ -3354,6 +3354,7 @@
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
fi
fi
+
# Check whether --enable-silent-rules was given.
if test "${enable_silent_rules+set}" = set; then :
enableval=$enable_silent_rules;
@@ -19438,7 +19439,7 @@
# 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.0.67, which was
+This file was extended by cups-filters $as_me 1.0.68, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19504,7 +19505,7 @@
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.0.67
+cups-filters config.status 1.0.68
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/configure.ac new/cups-filters-1.0.68/configure.ac
--- old/cups-filters-1.0.67/configure.ac 2015-03-11 16:18:25.000000000 +0100
+++ new/cups-filters-1.0.68/configure.ac 2015-04-13 16:47:41.000000000 +0200
@@ -7,7 +7,7 @@
# ====================
m4_define([cups_filters_version_major],[1])
m4_define([cups_filters_version_minor],[0])
-m4_define([cups_filters_version_micro],[67])
+m4_define([cups_filters_version_micro],[68])
m4_define([cups_filters_version],[cups_filters_version_major.cups_filters_version_minor.cups_filters_version_micro])
# =============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/ltmain.sh new/cups-filters-1.0.68/ltmain.sh
--- old/cups-filters-1.0.67/ltmain.sh 2015-03-11 16:21:36.000000000 +0100
+++ new/cups-filters-1.0.68/ltmain.sh 2015-04-13 17:09:54.000000000 +0200
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.10ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1.10ubuntu1"
TIMESTAMP=""
package_revision=1.3337
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/ppd/Ricoh-PDF_Printer-PDF.ppd new/cups-filters-1.0.68/ppd/Ricoh-PDF_Printer-PDF.ppd
--- old/cups-filters-1.0.67/ppd/Ricoh-PDF_Printer-PDF.ppd 1970-01-01 01:00:00.000000000 +0100
+++ new/cups-filters-1.0.68/ppd/Ricoh-PDF_Printer-PDF.ppd 2015-03-18 01:36:29.000000000 +0100
@@ -0,0 +1,413 @@
+*PPD-Adobe: "4.3"
+*%
+*% This PPD file is for using a Ricoh PDF printer in its native PDF mode, with
+*% option settings controlled via PJL commands. It uses CUPS with the
+*% OpenPrinting CUPS Filters package.
+*%
+*% This PPD is experimental. It is possible that some of the options
+*% and settings do not make sense or do not cause any change on the output.
+*% It can even happen that with certain settings nothing or an error page
+*% comes out.
+*%
+*% This file is published under the GNU General Public License
+*%
+*% You may save this file as 'Ricoh-PDF_Printer-PDF.ppd'
+*%
+*%
+*FormatVersion: "4.3"
+*FileVersion: "2.0"
+*LanguageVersion: English
+*LanguageEncoding: ISOLatin1
+*PCFileName: "RICOHPDF.PPD"
+*Manufacturer: "Ricoh"
+*Product: "(RICOH PDF Printer)"
+*cupsVersion: 1.0
+*cupsManualCopies: False
+*cupsModelNumber: 2
+*ModelName: "Ricoh PDF Printer"
+*ShortNickName: "Ricoh PDF Printer"
+*NickName: "Ricoh PDF Printer"
+*PSVersion: "(3010.107) 0"
+*LanguageLevel: "3"
+*ColorDevice: True
+*DefaultColorSpace: CMYK
+*FileSystem: False
+*Throughput: "30"
+*LandscapeOrientation: Plus90
+*TTRasterizer: Type42
+*1284DeviceID: "MFG:RICOH;CMD:PJL,PDF;MDL:PDF Printer;CLS:PRINTER;DES:Ricoh PDF Printer;DRV:DPDF,R1,M0;"
+*JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+*JCLToPDFInterpreter: "@PJL ENTER LANGUAGE = PDF<0A>"
+*JCLEnd: "<1B>%-12345X@PJL EOJ <0A><1B>%-12345X"
+*cupsFilter: "application/vnd.cups-pdf 0 -"
+
+*OpenGroup: General/General
+*JCLOpenUI *PageSize/Page Size: PickOne
+*OrderDependency: 100 JCLSetup *PageSize
+*DefaultPageSize: Letter
+*PageSize Letter/Letter: "@PJL SET FITTOPAGESIZE=LETTER<0A>"
+*PageSize A4/A4: "@PJL SET FITTOPAGESIZE=A4<0A>"
+*PageSize A5/A5: "@PJL SET FITTOPAGESIZE=A5<0A>"
+*PageSize A6/A6: "@PJL SET FITTOPAGESIZE=A6<0A>"
+*PageSize ISOB5/ISO B5: "@PJL SET FITTOPAGESIZE=B5<0A>"
+*PageSize EnvC5/C5: "@PJL SET FITTOPAGESIZE=C5<0A>"
+*PageSize Env10/Com 10: "@PJL SET FITTOPAGESIZE=COM10<0A>"
+*PageSize EnvDL/DL: "@PJL SET FITTOPAGESIZE=DL<0A>"
+*PageSize 5x13/Eight Point 5x13: "@PJL SET FITTOPAGESIZE=EIGHTPOINT5X13<0A>"
+*PageSize EnvC6/Envelope C6: "@PJL SET FITTOPAGESIZE=ENVELOPEC6<0A>"
+*PageSize Executive/Executive: "@PJL SET FITTOPAGESIZE=EXECUTIVE<0A>"
+*PageSize 183x256mm/JIS B5: "@PJL SET FITTOPAGESIZE=JISB5<0A>"
+*PageSize 128x183mm/JIS B6: "@PJL SET FITTOPAGESIZE=JISB6<0A>"
+*PageSize Legal/Legal: "@PJL SET FITTOPAGESIZE=LEGAL<0A>"
+*PageSize Tabloid/11x17: "@PJL SET FITTOPAGESIZE=LEDGER<0A>"
+*PageSize EnvMonarch/Monarch: "@PJL SET FITTOPAGESIZE=MONARCH<0A>"
+*PageSize 69x95mm/16K: "@PJL SET FITTOPAGESIZE=SIZE16K195x270<0A>"
+*PageSize Statement/Statement: "@PJL SET FITTOPAGESIZE=STATEMENT<0A>"
+*JCLCloseUI: *PageSize
+
+*JCLOpenUI *PageRegion: PickOne
+*OrderDependency: 100 JCLSetup *PageRegion
+*DefaultPageRegion: Letter
+*PageRegion Letter/Letter: "@PJL SET PAPER=LETTER<0A>"
+*PageRegion A4/A4: "@PJL SET PAPER=A4<0A>"
+*PageRegion A5/A5: "@PJL SET PAPER=A5<0A>"
+*PageRegion A6/A6: "@PJL SET PAPER=A6<0A>"
+*PageRegion ISOB5/ISO B5: "@PJL SET PAPER=B5<0A>"
+*PageRegion EnvC5/C5: "@PJL SET PAPER=C5<0A>"
+*PageRegion Env10/Com 10: "@PJL SET PAPER=COM10<0A>"
+*PageRegion EnvDL/DL: "@PJL SET PAPER=DL<0A>"
+*PageRegion 5x13/Eight Point 5x13: "@PJL SET PAPER=EIGHTPOINT5X13<0A>"
+*PageRegion EnvC6/Envelope C6: "@PJL SET PAPER=ENVELOPEC6<0A>"
+*PageRegion Executive/Executive: "@PJL SET PAPER=EXECUTIVE<0A>"
+*PageRegion 183x256mm/JIS B5: "@PJL SET PAPER=JISB5<0A>"
+*PageRegion 128x183mm/JIS B6: "@PJL SET PAPER=JISB6<0A>"
+*PageRegion Legal/Legal: "@PJL SET PAPER=LEGAL<0A>"
+*PageRegion Tabloid/11x17: "@PJL SET PAPER=LEDGER<0A>"
+*PageRegion EnvMonarch/Monarch: "@PJL SET PAPER=MONARCH<0A>"
+*PageRegion 69x95mm/16K: "@PJL SET PAPER=SIZE16K195x270<0A>"
+*PageRegion Statement/Statement: "@PJL SET PAPER=STATEMENT<0A>"
+*JCLCloseUI: *PageRegion
+
+*DefaultImageableArea: Letter
+*ImageableArea Letter/Letter: "18 36 594 756"
+*ImageableArea A4/A4: "18 36 577 806"
+*ImageableArea A5/A5: "18 36 402 559"
+*ImageableArea A6/A6: "18 36 279 384"
+*ImageableArea ISOB5/ISO B5: "18 36 480 672"
+*ImageableArea EnvC5/C5: "18 36 441 613"
+*ImageableArea Env10/Com 10: "18 36 279 648"
+*ImageableArea EnvDL/DL: "18 36 293 587"
+*ImageableArea 5x13/Eight Point 5x13: "18 36 342 900"
+*ImageableArea EnvC6/Envelope C6: "18 36 305 423"
+*ImageableArea Executive/Executive: "18 36 504 720"
+*ImageableArea 183x256mm/JIS B5: "18 36 500 691"
+*ImageableArea 128x183mm/JIS B6: "18 36 344 482"
+*ImageableArea Legal/Legal: "18 36 594 972"
+*ImageableArea Tabloid/11x17: "12 12 780 1212"
+*ImageableArea EnvMonarch/Monarch: "18 36 261 504"
+*ImageableArea 69x95mm/16K: "18 36 177 234"
+*ImageableArea Statement/Statement: "18 36 378 576"
+
+*DefaultPaperDimension: Letter
+*PaperDimension Letter/Letter: "612 792"
+*PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
+*PaperDimension A6/A6: "297 420"
+*PaperDimension ISOB5/ISO B5: "498 708"
+*PaperDimension EnvC5/C5: "459 649"
+*PaperDimension Env10/Com 10: "297 684"
+*PaperDimension EnvDL/DL: "311 623"
+*PaperDimension 5x13/Eight Point 5x13: "360 936"
+*PaperDimension EnvC6/Envelope C6: "323 459"
+*PaperDimension Executive/Executive: "522 756"
+*PaperDimension 183x256mm/JIS B5: "518 727"
+*PaperDimension 128x183mm/JIS B6: "362 518"
+*PaperDimension Legal/Legal: "612 1008"
+*PaperDimension Tabloid/11x17: "792 1224"
+*PaperDimension EnvMonarch/Monarch: "279 540"
+*PaperDimension 69x95mm/16K: "195 270"
+*PaperDimension Statement/Statement: "396 612"
+
+*JCLOpenUI *Duplex/Double-Sided Printing: PickOne
+*OrderDependency: 100 JCLSetup *Duplex
+*DefaultDuplex: DuplexNoTumble
+*Duplex None/Off: "@PJL SET DUPLEX=OFF<0A>"
+*Duplex DuplexNoTumble/Long-Edge binding: "@PJL SET DUPLEX=ON<0A>@PJL SET BINDING=LONGEDGE<0A>"
+*Duplex DuplexTumble/Short-Edge binding: "@PJL SET DUPLEX=ON<0A>@PJL SET BINDING=SHORTEDGE<0A>"
+*JCLCloseUI: *Duplex
+
+*JCLOpenUI *Resolution/Resolution: PickOne
+*OrderDependency: 100 JCLSetup *Resolution
+*DefaultResolution: 600dpi
+*Resolution 600dpi/600 dpi: "@PJL SET RESOLUTION=600<0A>"
+*Resolution 1200dpi/1200 dpi: "@PJL SET RESOLUTION=1200<0A>"
+*JCLCloseUI: *Resolution
+
+*JCLOpenUI *borderline/Borderline Printing: PickOne
+*OrderDependency: 100 JCLSetup *borderline
+*Defaultborderline: off
+*borderline off/Off: "@PJL SET BORDERLINE=OFF<0A>"
+*borderline on/On: "@PJL SET BORDERLINE=ON<0A>"
+*JCLCloseUI: *borderline
+
+*JCLOpenUI *edgetoedge/Edge to edge: PickOne
+*OrderDependency: 100 JCLSetup *edgetoedge
+*Defaultedgetoedge: no
+*edgetoedge no/No: "@PJL SET EDGETOEDGE=NO<0A>"
+*edgetoedge yes/Yes: "@PJL SET EDGETOEDGE=YES<0A>"
+*JCLCloseUI: *edgetoedge
+
+*JCLOpenUI *joboffset/Job Offset: PickOne
+*OrderDependency: 100 JCLSetup *joboffset
+*Defaultjoboffset: shift
+*joboffset off/Off: "@PJL SET JOBOFFSET=OFF<0A>"
+*joboffset on/On: "@PJL SET JOBOFFSET=ON<0A>"
+*joboffset shift/Shift: "@PJL SET JOBOFFSET=SHIFT<0A>@PJL SET OUTBIN=FINISHERSHIFT<0A>"
+*joboffset rotate/Rotate: "@PJL SET JOBOFFSET=ROTATE<0A>"
+*JCLCloseUI: *joboffset
+
+*JCLOpenUI *WideA4/Wide A4: PickOne
+*OrderDependency: 100 JCLSetup *WideA4
+*DefaultWideA4: no
+*WideA4 no/No: "@PJL SET WIDEA4=NO<0A>"
+*WideA4 yes/Yes: "@PJL SET WIDEA4=YES<0A>"
+*JCLCloseUI: *WideA4
+
+*JCLOpenUI *ColorModel/Color Mode: PickOne
+*OrderDependency: 100 JCLSetup *ColorModel
+*DefaultColorModel: CMYK
+*ColorModel Gray/Black and White: "@PJL SET RENDERMODE=GRAYSCALE<0A>@PJL SET DATAMODE=GRAYSCALE<0A>"
+*ColorModel CMYK/Color: "@PJL SET RENDERMODE=COLOR<0A>@PJL SET DATAMODE=COLOR<0A>"
+*JCLCloseUI: *ColorModel
+
+*JCLOpenUI *InputSlot/InputSlot: PickOne
+*OrderDependency: 30 JCLSetup *InputSlot
+*DefaultInputSlot: Auto
+*InputSlot MultiTray/Bypass Tray: "@PJL SET TRAY = BYPASS<0A>"
+*InputSlot 1Tray/Tray 1: "@PJL SET TRAY = Tray1<0A>"
+*InputSlot 2Tray/Tray 2: "@PJL SET TRAY = Tray2<0A>"
+*InputSlot 3Tray/Tray 3: "@PJL SET TRAY = Tray3<0A>"
+*InputSlot 4Tray/Tray 4: "@PJL SET TRAY = Tray4<0A>"
+*InputSlot 5Tray/Large Capacity Tray: "@PJL SET TRAY = LCT<0A>"
+*InputSlot Auto/Auto Select: "@PJL SET TRAY = ALL<0A>"
+*CloseUI: *InputSlot
+
+*JCLOpenUI *MediaType/Paper Type: PickOne
+*OrderDependency: 205 JCLSetup *MediaType
+*DefaultMediaType: Plain
+*MediaType Auto/Plain/Recycled: "@PJL SET MEDIATYPE=PLAINORRECYCLED<0A>"
+*MediaType Plain/Plain: "@PJL SET MEDIATYPE=PLAIN<0A>"
+*MediaType Recycled/Recycled: "@PJL SET MEDIATYPE=RECYCLED<0A>"
+*MediaType Special/Special: "@PJL SET MEDIATYPE=SPECIAL<0A>"
+*MediaType Special2/Special 2: "@PJL SET MEDIATYPE=SPECIAL2<0A>"
+*MediaType Special3/Special 3: "@PJL SET MEDIATYPE=SPECIAL3<0A>"
+*MediaType Colored/Color: "@PJL SET MEDIATYPE=COLOR<0A>"
+*MediaType Letterhead/Letterhead: "@PJL SET MEDIATYPE=LETTERHEAD<0A>"
+*MediaType Preprinted/Preprinted: "@PJL SET MEDIATYPE=PREPRINTED<0A>"
+*MediaType Labels/Labels: "@PJL SET MEDIATYPE=LABELS<0A>"
+*MediaType Coated/Coated: "@PJL SET MEDIATYPE=COATED<0A>"
+*MediaType Bond/Bond: "@PJL SET MEDIATYPE=BOND<0A>"
+*MediaType Cardstock/Cardstock: "@PJL SET MEDIATYPE=CARDSTOCK<0A>"
+*MediaType OHP/Transparency: "@PJL SET MEDIATYPE=TRANSPARENCY<0A>"
+*MediaType Thick/Thick: "@PJL SET MEDIATYPE=THICK<0A>"
+*MediaType Thick2/Thick 2: "@PJL SET MEDIATYPE=THICK2<0A>"
+*MediaType Thick3/Thick 3: "@PJL SET MEDIATYPE=THICK3<0A>"
+*MediaType Thin/Thin: "@PJL SET MEDIATYPE=THIN<0A>"
+*MediaType Middlethick/Middle Thick: "@PJL SET MEDIATYPE=MIDDLETHICK<0A>"
+*MediaType Glossy/Glossy: "@PJL SET MEDIATYPE=GLOSSY<0A>"
+*MediaType Envelope/Envelope: "@PJL SET MEDIATYPE=ENVELOPE<0A>"
+*CloseUI: *MediaType
+
+*JCLOpenUI *StapleLocation/Staple: PickOne
+*OrderDependency: 220 JCLSetup *StapleLocation
+*DefaultStapleLocation: None
+*StapleLocation None/Off: "@PJL SET STAPLE=OFF<0A>"
+*StapleLocation UpperLeft/Top left: "@PJL SET STAPLE=LEFTTOP<0A>"
+*StapleLocation UpperRight/Top right: "@PJL SET STAPLE=RIGHTTOP<0A>"
+*StapleLocation LeftW/2 at left: "@PJL SET STAPLE=LEFT2PORT<0A>"
+*StapleLocation RightW/2 at right: "@PJL SET STAPLE=RIGHT2PORT<0A>"
+*StapleLocation UpperW/2 at top: "@PJL SET STAPLE=TOP2PORT<0A>"
+*StapleLocation CenterW/2 at center: "@PJL SET STAPLE=BOOKLET<0A>"
+*CloseUI: *StapleLocation
+
+*JCLOpenUI *RIPunch/Punch: PickOne
+*OrderDependency: 230 JCLSetup *RIPunch
+*DefaultRIPunch: None
+*RIPunch None/Off: "@PJL SET PUNCH=OFF<0A>"
+*RIPunch LeftJP2/2 at left (Japan/Europe): "@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=JP2<0A>"
+*RIPunch LeftUS2/2 at left (North America): "@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=US2<0A>"
+*RIPunch LeftUS3/3 at left (North America): "@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=US3<0A>"
+*RIPunch LeftEU4/4 at left (Europe): "@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=EU4<0A>"
+*RIPunch LeftNEU4/4 at left (Northern Europe): "@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=NEU4<0A>"
+*RIPunch RightJP2/2 at right (Japan/Europe): "@PJL SET IMAGEDIRECTION=REVERSE<0A>@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=JP2<0A>"
+*RIPunch RightUS2/2 at right (North America): "@PJL SET IMAGEDIRECTION=REVERSE<0A>@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=US2<0A>"
+*RIPunch RightUS3/3 at right (North America): "@PJL SET IMAGEDIRECTION=REVERSE<0A>@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=US3<0A>"
+*RIPunch RightEU4/4 at right (Europe): "@PJL SET IMAGEDIRECTION=REVERSE<0A>@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=EU4<0A>"
+*RIPunch RightNEU4/4 at right (Northern Europe): "@PJL SET IMAGEDIRECTION=REVERSE<0A>@PJL SET PUNCH=LEFTPORT<0A>@PJL SET PUNCHHOLE=NEU4<0A>"
+*RIPunch UpperJP2/2 at top (Japan/Europe): "@PJL SET PUNCH=TOPPORT<0A>@PJL SET PUNCHHOLE=JP2<0A>"
+*RIPunch UpperUS2/2 at top (North America): "@PJL SET PUNCH=TOPPORT<0A>@PJL SET PUNCHHOLE=US2<0A>"
+*RIPunch UpperUS3/3 at top (North America): "@PJL SET PUNCH=TOPPORT<0A>@PJL SET PUNCHHOLE=US3<0A>"
+*RIPunch UpperEU4/4 at top (Europe): "@PJL SET PUNCH=TOPPORT<0A>@PJL SET PUNCHHOLE=EU4<0A>"
+*RIPunch UpperNEU4/4 at top (Northern Europe): "@PJL SET PUNCH=TOPPORT<0A>@PJL SET PUNCHHOLE=NEU4<0A>"
+*CloseUI: *RIPunch
+
+*JCLOpenUI *N-up/N-up: PickOne
+*OrderDependency: 240 JCLSetup *N-up
+*DefaultN-up: 1up
+*N-up 1up/Off: "@PJL SET NUP = <0A>"
+*N-up 2up/2-up: "@PJL SET NUP = 2<0A>"
+*N-up 4up/4-up: "@PJL SET NUP = 4<0A>"
+*N-up 6up/6-up: "@PJL SET NUP = 6<0A>"
+*N-up 9up/9-up: "@PJL SET NUP = 9<0A>"
+*N-up 16up/16-up: "@PJL SET NUP = 16<0A>"
+*CloseUI: *N-up
+
+*JCLOpenUI *NupPageOrder/N-up PageOrder: PickOne
+*OrderDependency: 240 JCLSetup *NupPageOrder
+*DefaultNupPageOrder: RightThenDown
+*NupPageOrder RightThenDown/Right then Down: "@PJL SET NUPPAGEORDER = <0A>"
+*NupPageOrder DownThenRight/Down then Right: "@PJL SET NUPPAGEORDER = DOWNTHENRIGHT<0A>"
+*NupPageOrder LeftThenDown/Left then Down: "@PJL SET NUPPAGEORDER = LEFTTHENDOWN<0A>"
+*NupPageOrder DownThenLeft/Down then Left: "@PJL SET NUPPAGEORDER = DOWNTHENLEFT<0A>"
+*CloseUI: *NupPageOrder
+
+*CloseGroup: General
+
+*%========== Font ==========
+*DefaultFont: Courier
+*Font AlbertusMT: Standard "(001.000)" Standard ROM
+*Font AlbertusMT-Italic: Standard "(001.000)" Standard ROM
+*Font AlbertusMT-Light: Standard "(001.000)" Standard ROM
+*Font AntiqueOlive-Bold: Standard "(501.009)" ExtendedRoman ROM
+*Font AntiqueOlive-Compact: Standard "(501.008)" ExtendedRoman ROM
+*Font AntiqueOlive-Italic: Standard "(501.010)" ExtendedRoman ROM
+*Font AntiqueOlive-Roman: Standard "(501.008)" ExtendedRoman ROM
+*Font Apple-Chancery: Standard "(001.001)" ExtendedRoman ROM
+*Font ArialMT: Standard "(501.009)" ExtendedRoman ROM
+*Font Arial-BoldMT: Standard "(501.009)" ExtendedRoman ROM
+*Font Arial-BoldItalicMT: Standard "(501.009)" ExtendedRoman ROM
+*Font Arial-ItalicMT: Standard "(501.012)" ExtendedRoman ROM
+*Font AvantGarde-Book: Standard "(501.009)" ExtendedRoman ROM
+*Font AvantGarde-BookOblique: Standard "(501.009)" ExtendedRoman ROM
+*Font AvantGarde-Demi: Standard "(501.010)" ExtendedRoman ROM
+*Font AvantGarde-DemiOblique: Standard "(501.010)" ExtendedRoman ROM
+*Font Bodoni: Standard "(501.008)" ExtendedRoman ROM
+*Font Bodoni-Bold: Standard "(501.006)" ExtendedRoman ROM
+*Font Bodoni-BoldItalic: Standard "(501.007)" ExtendedRoman ROM
+*Font Bodoni-Italic: Standard "(501.007)" ExtendedRoman ROM
+*Font Bodoni-Poster: Standard "(501.009)" ExtendedRoman ROM
+*Font Bodoni-PosterCompressed: Standard "(501.007)" ExtendedRoman ROM
+*Font Bookman-Demi: Standard "(501.007)" ExtendedRoman ROM
+*Font Bookman-DemiItalic: Standard "(501.008)" ExtendedRoman ROM
+*Font Bookman-Light: Standard "(501.006)" ExtendedRoman ROM
+*Font Bookman-LightItalic: Standard "(501.007)" ExtendedRoman ROM
+*Font Carta: Special "(001.001)" Special ROM
+*Font Chicago: Standard "(501.011)" ExtendedRoman ROM
+*Font Clarendon-Bold: Standard "(501.008)" ExtendedRoman ROM
+*Font Clarendon-Light: Standard "(501.009)" ExtendedRoman ROM
+*Font Clarendon: Standard "(501.009)" ExtendedRoman ROM
+*Font CooperBlack-Italic: Standard "(001.003)" Standard ROM
+*Font CooperBlack: Standard "(001.003)" Standard ROM
+*Font Copperplate-ThirtyThreeBC: Standard "(001.002)" Standard ROM
+*Font Copperplate-ThirtyTwoBC: Standard "(001.002)" Standard ROM
+*Font Coronet-Regular: Standard "(001.000)" ExtendedRoman ROM
+*Font Courier-Bold: Standard "(501.010)" ExtendedRoman ROM
+*Font Courier-BoldOblique: Standard "(501.010)" ExtendedRoman ROM
+*Font Courier-Oblique: Standard "(501.010)" ExtendedRoman ROM
+*Font Courier: Standard "(501.010)" ExtendedRoman ROM
+*Font Eurostile-Bold: Standard "(501.008)" ExtendedRoman ROM
+*Font Eurostile-BoldExtendedTwo: Standard "(501.008)" ExtendedRoman ROM
+*Font Eurostile-ExtendedTwo: Standard "(501.010)" ExtendedRoman ROM
+*Font Eurostile: Standard "(501.008)" ExtendedRoman ROM
+*Font Geneva: Standard "(501.007)" ExtendedRoman ROM
+*Font GillSans: Standard "(501.009)" ExtendedRoman ROM
+*Font GillSans-Bold: Standard "(501.007)" ExtendedRoman ROM
+*Font GillSans-BoldCondensed: Standard "(501.006)" ExtendedRoman ROM
+*Font GillSans-BoldItalic: Standard "(501.008)" ExtendedRoman ROM
+*Font GillSans-Condensed: Standard "(501.007)" ExtendedRoman ROM
+*Font GillSans-ExtraBold: Standard "(501.008)" ExtendedRoman ROM
+*Font GillSans-Italic: Standard "(501.008)" ExtendedRoman ROM
+*Font GillSans-Light: Standard "(501.009)" ExtendedRoman ROM
+*Font GillSans-LightItalic: Standard "(501.009)" ExtendedRoman ROM
+*Font Goudy: Standard "(001.003)" Standard ROM
+*Font Goudy-Bold: Standard "(001.002)" Standard ROM
+*Font Goudy-BoldItalic: Standard "(001.002)" Standard ROM
+*Font Goudy-ExtraBold: Standard "(001.001)" Standard ROM
+*Font Goudy-Italic: Standard "(001.002)" Standard ROM
+*Font Helvetica: Standard "(501.008)" ExtendedRoman ROM
+*Font Helvetica-Bold: Standard "(501.010)" ExtendedRoman ROM
+*Font Helvetica-BoldOblique: Standard "(501.010)" ExtendedRoman ROM
+*Font Helvetica-Condensed-Bold: Standard "(501.009)" ExtendedRoman ROM
+*Font Helvetica-Condensed-BoldObl: Standard "(501.009)" ExtendedRoman ROM
+*Font Helvetica-Condensed-Oblique: Standard "(501.010)" ExtendedRoman ROM
+*Font Helvetica-Condensed: Standard "(501.010)" ExtendedRoman ROM
+*Font Helvetica-Narrow-Bold: Standard "(501.010)" ExtendedRoman ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(501.010)" ExtendedRoman ROM
+*Font Helvetica-Narrow-Oblique: Standard "(501.008)" ExtendedRoman ROM
+*Font Helvetica-Narrow: Standard "(501.008)" ExtendedRoman ROM
+*Font Helvetica-Oblique: Standard "(501.008)" ExtendedRoman ROM
+*Font HoeflerText-Black: Standard "(501.008)" ExtendedRoman ROM
+*Font HoeflerText-BlackItalic: Standard "(501.009)" ExtendedRoman ROM
+*Font HoeflerText-Italic: Standard "(501.010)" ExtendedRoman ROM
+*Font HoeflerText-Ornaments: Special "(001.001)" Special ROM
+*Font HoeflerText-Regular: Standard "(501.009)" ExtendedRoman ROM
+*Font JoannaMT: Standard "(501.009)" ExtendedRoman ROM
+*Font JoannaMT-Bold: Standard "(501.008)" ExtendedRoman ROM
+*Font JoannaMT-BoldItalic: Standard "(501.008)" ExtendedRoman ROM
+*Font JoannaMT-Italic: Standard "(501.008)" ExtendedRoman ROM
+*Font LetterGothic: Standard "(501.009)" ExtendedRoman ROM
+*Font LetterGothic-Bold: Standard "(501.010)" ExtendedRoman ROM
+*Font LetterGothic-BoldSlanted: Standard "(501.010)" ExtendedRoman ROM
+*Font LetterGothic-Slanted: Standard "(501.010)" ExtendedRoman ROM
+*Font LubalinGraph-Book: Standard "(501.009)" ExtendedRoman ROM
+*Font LubalinGraph-BookOblique: Standard "(501.009)" ExtendedRoman ROM
+*Font LubalinGraph-Demi: Standard "(501.009)" ExtendedRoman ROM
+*Font LubalinGraph-DemiOblique: Standard "(501.009)" ExtendedRoman ROM
+*Font Marigold: Standard "(001.000)" Standard ROM
+*Font MonaLisa-Recut: Standard "(001.000)" Standard ROM
+*Font Monaco: Standard "(501.012)" ExtendedRoman ROM
+*Font NewCenturySchlbk-Bold: Standard "(501.008)" ExtendedRoman ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(501.009)" ExtendedRoman ROM
+*Font NewCenturySchlbk-Italic: Standard "(501.011)" ExtendedRoman ROM
+*Font NewCenturySchlbk-Roman: Standard "(501.008)" ExtendedRoman ROM
+*Font NewYork: Standard "(501.013)" ExtendedRoman ROM
+*Font Optima-Bold: Standard "(501.008)" ExtendedRoman ROM
+*Font Optima-BoldItalic: Standard "(501.009)" ExtendedRoman ROM
+*Font Optima-Italic: Standard "(501.010)" ExtendedRoman ROM
+*Font Optima: Standard "(501.010)" ExtendedRoman ROM
+*Font Oxford: Standard "(001.000)" Standard ROM
+*Font Palatino-Bold: Standard "(501.008)" ExtendedRoman ROM
+*Font Palatino-BoldItalic: Standard "(501.007)" ExtendedRoman ROM
+*Font Palatino-Italic: Standard "(501.008)" ExtendedRoman ROM
+*Font Palatino-Roman: Standard "(501.006)" ExtendedRoman ROM
+*Font StempelGaramond-Bold: Standard "(501.007)" ExtendedRoman ROM
+*Font StempelGaramond-BoldItalic: Standard "(501.012)" ExtendedRoman ROM
+*Font StempelGaramond-Italic: Standard "(501.009)" ExtendedRoman ROM
+*Font StempelGaramond-Roman: Standard "(501.011)" ExtendedRoman ROM
+*Font Symbol: Special "(001.008)" Special ROM
+*Font Tekton: Standard "(001.001)" Standard ROM
+*Font Times-Bold: Standard "(501.009)" ExtendedRoman ROM
+*Font Times-BoldItalic: Standard "(501.009)" ExtendedRoman ROM
+*Font Times-Italic: Standard "(501.010)" ExtendedRoman ROM
+*Font Times-Roman: Standard "(501.010)" ExtendedRoman ROM
+*Font TimesNewRomanPS-BoldItalicMT: Standard "(501.011)" ExtendedRoman ROM
+*Font TimesNewRomanPS-BoldMT: Standard "(501.009)" ExtendedRoman ROM
+*Font TimesNewRomanPS-ItalicMT: Standard "(501.011)" ExtendedRoman ROM
+*Font TimesNewRomanPSMT: Standard "(501.010)" ExtendedRoman ROM
+*Font Univers: Standard "(501.009)" ExtendedRoman ROM
+*Font Univers-Bold: Standard "(501.008)" ExtendedRoman ROM
+*Font Univers-BoldExt: Standard "(501.010)" ExtendedRoman ROM
+*Font Univers-BoldExtObl: Standard "(501.010)" ExtendedRoman ROM
+*Font Univers-BoldOblique: Standard "(501.008)" ExtendedRoman ROM
+*Font Univers-Condensed: Standard "(501.011)" ExtendedRoman ROM
+*Font Univers-CondensedBold: Standard "(501.009)" ExtendedRoman ROM
+*Font Univers-CondensedBoldOblique: Standard "(501.009)" ExtendedRoman ROM
+*Font Univers-CondensedOblique: Standard "(501.011)" ExtendedRoman ROM
+*Font Univers-Extended: Standard "(501.009)" ExtendedRoman ROM
+*Font Univers-ExtendedObl: Standard "(501.009)" ExtendedRoman ROM
+*Font Univers-Light: Standard "(501.009)" ExtendedRoman ROM
+*Font Univers-LightOblique: Standard "(501.009)" ExtendedRoman ROM
+*Font Univers-Oblique: Standard "(501.009)" ExtendedRoman ROM
+*Font Wingdings-Regular: Special "(001.001)" Special ROM
+*Font ZapfChancery-MediumItalic: Standard "(002.000)" ExtendedRoman ROM
+*Font ZapfDingbats: Special "(001.005S)" Special ROM
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.67/utils/cups-browsed.c new/cups-filters-1.0.68/utils/cups-browsed.c
--- old/cups-filters-1.0.67/utils/cups-browsed.c 2015-03-11 15:56:23.000000000 +0100
+++ new/cups-filters-1.0.68/utils/cups-browsed.c 2015-03-28 17:27:43.000000000 +0100
@@ -182,7 +182,7 @@
static int autoshutdown = 0;
static int autoshutdown_avahi = 0;
static int autoshutdown_timeout = 30;
-static guint autoshutdown_exec_id = 0;
+static guint autoshutdown_exec_id = -1;
static int debug = 0;
@@ -191,12 +191,20 @@
http_t *conn);
static gboolean browse_poll_get_notifications (browsepoll_t *context,
http_t *conn);
-char *_ppdCreateFromIPP(char *buffer, size_t bufsize, ipp_t *response);
#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
#define HAVE_CUPS_1_6 1
#endif
+#ifdef HAVE_CUPS_1_6
+/* The following function uses a lot of CUPS >= 1.6 specific stuff.
+ The following function is only called in create_local_queue()
+ to set up local queues for non-CUPS printer broadcasts
+ that is disabled in create_local_queue() for older CUPS <= 1.5.4.
+ Accordingly the following function is also disabled here for CUPS < 1.6. */
+char *_ppdCreateFromIPP(char *buffer, size_t bufsize, ipp_t *response);
+#endif /* HAVE_CUPS_1_6 */
+
/*
* CUPS 1.6 makes various structures private and
* introduces these ippGet and ippSet functions
@@ -738,6 +746,14 @@
p->name, q->host);
}
} else {
+#ifndef HAVE_CUPS_1_6
+ /* The following code uses a lot of CUPS >= 1.6 specific stuff.
+ For older CUPS <= 1.5.4 the following functionality is skipped
+ which means for CUPS <= 1.5.4 only for CUPS printer broadcasts
+ there are local queues created which should be sufficient
+ on systems where traditional CUPS <= 1.5.4 is used. */
+ goto fail;
+#else /* HAVE_CUPS_1_6 */
/* Non-CUPS printer broadcasts are most probably from printers
directly connected to the network and using the IPP protocol.
We check whether we can set them up without a device-specific
@@ -841,6 +857,7 @@
/*p->ifscript = "/usr/lib/cups/filter/pdftoippprinter-wrapper";
debug_printf("cups-browsed: System V Interface script for %s: %s\n", p->name, p->ifscript);*/
+#endif /* HAVE_CUPS_1_6 */
}
/* Add the new remote printer entry */
@@ -848,11 +865,11 @@
/* If auto shutdown is active we have perhaps scheduled a timer to shut down
due to not having queues any more to maintain, kill the timer now */
- if (autoshutdown && autoshutdown_exec_id &&
+ if (autoshutdown && autoshutdown_exec_id > 0 &&
cupsArrayCount(remote_printers) > 0) {
debug_printf ("cups-browsed: New printers there to make available, killing auto shutdown timer.\n");
g_source_remove(autoshutdown_exec_id);
- autoshutdown_exec_id = 0;
+ autoshutdown_exec_id = -1;
}
return p;
@@ -1083,7 +1100,7 @@
/* If auto shutdown is active and all printers we have set up got removed
again, schedule the shutdown in autoshutdown_timeout seconds */
- if (autoshutdown && !autoshutdown_exec_id &&
+ if (autoshutdown && autoshutdown_exec_id <= 0 &&
cupsArrayCount(remote_printers) == 0) {
debug_printf ("cups-browsed: No printers there any more to make available, shutting down in %d sec...\n", autoshutdown_timeout);
autoshutdown_exec_id =
@@ -1228,7 +1245,7 @@
} else if (timeout == (time_t) -1 || p->timeout - now < timeout)
timeout = p->timeout - now;
- if (queues_timer_id != (guint) -1)
+ if (queues_timer_id > 0)
g_source_remove (queues_timer_id);
if (timeout != (time_t) -1) {
@@ -1757,7 +1774,7 @@
debug_printf("cups-browsed: Avahi server disappeared, switching to auto shutdown mode ...\n");
/* If there are no printers schedule the shutdown in autoshutdown_timeout
seconds */
- if (!autoshutdown_exec_id &&
+ if (autoshutdown_exec_id <= 0 &&
cupsArrayCount(remote_printers) == 0) {
debug_printf ("cups-browsed: We entered auto shutdown mode and no printers are there to make available, shutting down in %d sec...\n", autoshutdown_timeout);
autoshutdown_exec_id =
@@ -1820,7 +1837,7 @@
if (autoshutdown_exec_id > 0) {
debug_printf ("cups-browsed: We have left auto shutdown mode, killing auto shutdown timer.\n");
g_source_remove(autoshutdown_exec_id);
- autoshutdown_exec_id = 0;
+ autoshutdown_exec_id = -1;
}
}
@@ -2682,7 +2699,7 @@
if (autoshutdown_exec_id > 0) {
debug_printf ("cups-browsed: We have left auto shutdown mode, killing auto shutdown timer.\n");
g_source_remove(autoshutdown_exec_id);
- autoshutdown_exec_id = 0;
+ autoshutdown_exec_id = -1;
}
}
@@ -2695,7 +2712,7 @@
debug_printf("cups-browsed: Caught signal %d, switching to auto shutdown mode ...\n", sig);
/* If there are no printers schedule the shutdown in autoshutdown_timeout
seconds */
- if (!autoshutdown_exec_id &&
+ if (autoshutdown_exec_id <= 0 &&
cupsArrayCount(remote_printers) == 0) {
debug_printf ("cups-browsed: We entered auto shutdown mode and no printers are there to make available, shutting down in %d sec...\n", autoshutdown_timeout);
autoshutdown_exec_id =
@@ -2912,7 +2929,7 @@
static void
defer_update_netifs (void)
{
- if (update_netifs_sourceid != -1)
+ if (update_netifs_sourceid > 0)
g_source_remove (update_netifs_sourceid);
update_netifs_sourceid = g_timeout_add_seconds (10, update_netifs, NULL);
@@ -3236,7 +3253,7 @@
/* If auto shutdown is active and we do not find any printers initially,
schedule the shutdown in autoshutdown_timeout seconds */
- if (autoshutdown && !autoshutdown_exec_id &&
+ if (autoshutdown && autoshutdown_exec_id <= 0 &&
cupsArrayCount(remote_printers) == 0) {
debug_printf ("cups-browsed: No printers found to make available, shutting down in %d sec...\n", autoshutdown_timeout);
autoshutdown_exec_id =
@@ -3307,6 +3324,12 @@
return ret;
}
+#ifdef HAVE_CUPS_1_6
+/* The following code uses a lot of CUPS >= 1.6 specific stuff.
+ The following code is only needed for create_local_queue()
+ to set up local queues for non-CUPS printer broadcasts
+ that is disabled in create_local_queue() for older CUPS <= 1.5.4.
+ Accordingly the following code is also disabled here for CUPS < 1.6. */
/*
* The code below is borrowed from the CUPS 2.1.x upstream repository
@@ -4279,5 +4302,6 @@
snprintf(name, namesize, "%dx%ddpi", *xres, *yres);
}
}
+#endif /* HAVE_CUPS_1_6 */