diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-01-17 23:54:15 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-01-17 23:54:15 +0000 |
| commit | 0268488e2f31bbec0c6b02ff7b7594b3191e6177 (patch) | |
| tree | 23495e9caedd80740ae4d956554c014d339da456 /ppdc | |
| parent | c779abb06a2a4c102b65b3f9f65e4ca6a792fff7 (diff) | |
| download | cups-0268488e2f31bbec0c6b02ff7b7594b3191e6177.tar.gz | |
Merge changes from CUPS 1.5svn-r9491.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2949 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'ppdc')
| -rw-r--r-- | ppdc/Makefile | 4 | ||||
| -rw-r--r-- | ppdc/sample.drv | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ppdc/Makefile b/ppdc/Makefile index 9f9e19932..ea03fd581 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -3,7 +3,7 @@ # # Makefile for the CUPS PPD Compiler. # -# Copyright 2007-2010 by Apple Inc. +# Copyright 2007-2011 by Apple Inc. # Copyright 2002-2006 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -294,7 +294,7 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) ./ppdc-static -I ../data sample.drv ./ppdi-static -I ../data -o sample-import.drv ppd/* ./ppdc-static -I ../data -d ppd2 sample-import.drv - if diff -qr ppd ppd2; then \ + if diff -r ppd ppd2 >/dev/null; then \ echo PPD import OK; \ else \ echo PPD import FAILED; \ diff --git a/ppdc/sample.drv b/ppdc/sample.drv index 29787997d..3a57bd211 100644 --- a/ppdc/sample.drv +++ b/ppdc/sample.drv @@ -364,7 +364,7 @@ Version "1.5" Attribute NickName "" "Generic PostScript Printer" PCFileName "generic.ppd" Throughput 8 - ColorDevice No + ColorDevice Yes Attribute PSVersion "" "(2016.0) 0" Attribute LanguageLevel "" 2 @@ -387,7 +387,7 @@ Version "1.5" Option "InputSlot/Media Source" PickOne AnySetup 10 *Choice "Default/Printer Default" "" - Choice "Tray1/Tray 1" "<</ManualFeed false>>setpagedevice" + Choice "Upper/Cassette" "<</ManualFeed false>>setpagedevice" Choice "Manual/Manual Feed" "<</ManualFeed true>>setpagedevice" Duplex Yes |