From: msweet Date: Mon, 9 Mar 2009 21:13:04 +0000 (+0000) Subject: Merge trademark/logo changes from CUPS 1.4svn-r8418. X-Git-Tag: release-1.6.3~112 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7871c8c7f9667f783d4313a282b4d8a4d8f529e;p=thirdparty%2Fcups.git Merge trademark/logo changes from CUPS 1.4svn-r8418. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1283 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/LICENSE.txt b/LICENSE.txt index bff03673da..69a499d6e7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ Common UNIX Printing System License Agreement - Copyright 2007 by Apple Inc. + Copyright 2007-2009 by Apple Inc. 1 Infinite Loop Cupertino, CA 95014 USA @@ -137,12 +137,11 @@ redistribute it freely, subject to the following restrictions: TRADEMARKS -Apple Inc. has trademarked the Common UNIX Printing System, CUPS, -and CUPS logo. You may use these names and logos in any direct port -or binary distribution of CUPS. Please contact Apple Inc. for written -permission to use them in derivative products. Our intention is to -protect the value of these trademarks and ensure that any derivative -product meets the same high-quality standards as the original. +CUPS and the CUPS logo are trademarks of Apple Inc. You may use the name +and logo in any direct port or binary distribution of CUPS. Please contact +Apple Inc. for written permission to use them in derivative products. Our +intention is to protect the value of these trademarks and ensure that any +derivative product meets the same high-quality standards as the original. GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/README.txt b/README.txt index 2535148646..98012921b8 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README - CUPS v1.4b2 - 2009-01-07 +README - CUPS v1.4b3 - 2009-03-09 --------------------------------- ********************************************************************** @@ -163,8 +163,8 @@ PRINTING FILES LEGAL STUFF - CUPS is Copyright 2007-2009 by Apple Inc. CUPS, the CUPS logo, and the - Common UNIX Printing System are trademarks of Apple Inc. + CUPS is Copyright 2007-2009 by Apple Inc. CUPS and the CUPS logo are + trademarks of Apple Inc. The MD5 Digest code is Copyright 1999 Aladdin Enterprises. diff --git a/desktop/cups-128.png b/desktop/cups-128.png index 3ab11f6361..5c0f6ff20b 100644 Binary files a/desktop/cups-128.png and b/desktop/cups-128.png differ diff --git a/desktop/cups-16.png b/desktop/cups-16.png index dccb02d462..90614fed15 100644 Binary files a/desktop/cups-16.png and b/desktop/cups-16.png differ diff --git a/desktop/cups-256.png b/desktop/cups-256.png index 7eac9b77ff..755dc2f373 100644 Binary files a/desktop/cups-256.png and b/desktop/cups-256.png differ diff --git a/desktop/cups-32.png b/desktop/cups-32.png index d77f3c8f69..823c6d4aac 100644 Binary files a/desktop/cups-32.png and b/desktop/cups-32.png differ diff --git a/desktop/cups-512.png b/desktop/cups-512.png index d0ed97fec0..54a1b3bdcf 100644 Binary files a/desktop/cups-512.png and b/desktop/cups-512.png differ diff --git a/desktop/cups-64.png b/desktop/cups-64.png index 358ff8ac1c..21d19cc280 100644 Binary files a/desktop/cups-64.png and b/desktop/cups-64.png differ diff --git a/desktop/cups.icns b/desktop/cups.icns index 2dd1997a47..0fd7a35d57 100644 Binary files a/desktop/cups.icns and b/desktop/cups.icns differ diff --git a/desktop/cups.svg b/desktop/cups.svg index 212363d9f2..8d19c358cb 100644 --- a/desktop/cups.svg +++ b/desktop/cups.svg @@ -18,9 +18,9 @@ sodipodi:docbase="/home/mike/c/cups-trunk/desktop" sodipodi:docname="cups.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/Users/mike/c/cups-trunk/desktop/cups-16.png" - inkscape:export-xdpi="14.4" - inkscape:export-ydpi="14.4"> + inkscape:export-filename="/Users/msweet/c/cups-trunk/desktop/cups-512.png" + inkscape:export-xdpi="460.79999" + inkscape:export-ydpi="460.79999"> - - - @@ -525,40 +517,9 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> - - - + transform="matrix(1.1282649,0,0,1.1259993,-5.472226,-6.4135954)"> - - diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 128ee8a384..773fb5a0a0 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -99,7 +99,7 @@ HEIGHT="128" ALT="CUPS">   -Common UNIX Printing System, CUPS, y el logo de CUPS son +CUPS y el logo de CUPS son marcas registradas de Apple Inc. Los derechos de copia de CUPS 2007-2009 son de Apple Inc. Todos los derechos reservados. diff --git a/doc/help/license.html b/doc/help/license.html index e80df0bb9c..56f2dd5cea 100644 --- a/doc/help/license.html +++ b/doc/help/license.html @@ -5,7 +5,7 @@ -

Copyright 2007 by Apple Inc.
+

Copyright 2007-2009 by Apple Inc.
1 Infinite Loop
Cupertino, CA 95014 USA

@@ -172,13 +172,12 @@ restrictions:

Trademarks

-

Apple Inc. has trademarked the Common UNIX -Printing System, CUPS, and CUPS logo. You may use these names and -logos in any direct port or binary distribution of CUPS. Please -contact Apple Inc. for written permission to use them -in derivative products. Our intention is to protect the value of -these trademarks and ensure that any derivative product meets the -same high-quality standards as the original.

+

CUPS and the CUPS logo are trademarks of Apple Inc. You may use the name and +logo in any direct port or binary distribution of CUPS. Please contact Apple +Inc. for written permission to use them in derivative products. Our intention is +to protect the value of these trademarks and ensure that any derivative product +meets the same high-quality standards as the original.

+

GNU GENERAL PUBLIC LICENSE

diff --git a/doc/images/cups-icon.png b/doc/images/cups-icon.png index 3ab11f6361..5c0f6ff20b 100644 Binary files a/doc/images/cups-icon.png and b/doc/images/cups-icon.png differ diff --git a/doc/images/cups.png b/doc/images/cups.png index 3ab11f6361..5c0f6ff20b 100644 Binary files a/doc/images/cups.png and b/doc/images/cups.png differ diff --git a/doc/images/cups.svg b/doc/images/cups.svg index 212363d9f2..8d19c358cb 100644 --- a/doc/images/cups.svg +++ b/doc/images/cups.svg @@ -18,9 +18,9 @@ sodipodi:docbase="/home/mike/c/cups-trunk/desktop" sodipodi:docname="cups.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/Users/mike/c/cups-trunk/desktop/cups-16.png" - inkscape:export-xdpi="14.4" - inkscape:export-ydpi="14.4"> + inkscape:export-filename="/Users/msweet/c/cups-trunk/desktop/cups-512.png" + inkscape:export-xdpi="460.79999" + inkscape:export-ydpi="460.79999"> - - - @@ -525,40 +517,9 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> - - - + transform="matrix(1.1282649,0,0,1.1259993,-5.472226,-6.4135954)"> - - diff --git a/doc/images/left.gif b/doc/images/left.gif index 608920d8d9..e82004257b 100644 Binary files a/doc/images/left.gif and b/doc/images/left.gif differ diff --git a/doc/images/left.xcf.gz b/doc/images/left.xcf.gz index 912254d2ba..d403e78e5c 100644 Binary files a/doc/images/left.xcf.gz and b/doc/images/left.xcf.gz differ diff --git a/doc/index.html.in b/doc/index.html.in index ff8d3576a6..cd5337503a 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -99,9 +99,9 @@ HEIGHT="128" ALT="CUPS">   -The Common UNIX Printing System, CUPS, and the CUPS -logo are trademarks of Apple Inc. CUPS is -copyright 2007-2009 Apple Inc. All rights reserved. +CUPS and the CUPS logo are trademarks of +Apple Inc. CUPS is copyright 2007-2009 Apple +Inc. All rights reserved. diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index 7a81255b89..e1dfca7299 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -99,9 +99,9 @@ HEIGHT="128" ALT="CUPS">   -The Common UNIX Printing System, CUPS, and the CUPS -logo are trademarks of Apple Inc. CUPS is -copyright 2007-2009 Apple Inc. All rights reserved. +CUPS and the CUPS logo are trademarks of +Apple Inc. CUPS is copyright 2007-2009 Apple +Inc. All rights reserved. diff --git a/doc/pl/index.html.in b/doc/pl/index.html.in index 5cb99e8dd3..13b2d30cde 100644 --- a/doc/pl/index.html.in +++ b/doc/pl/index.html.in @@ -99,7 +99,7 @@ HEIGHT="128" ALT="CUPS">   -Wspólny uniksowy system drukowania, CUPS i logo CUPS +CUPS i logo CUPS są znakami handlowymi Apple Inc. CUPS copyright 2007-2009 Apple Inc. Wszystkie prawa zastrzeżone. diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index d5a45ecb4d..6de75cd1fc 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -97,7 +97,7 @@ HEIGHT="128" ALT="CUPS">   -The Common UNIX Printing System, CUPS, а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2009) компании Apple Inc. Все права защищены. +CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2009) компании Apple Inc. Все права защищены. diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index 8da2d96169..f71225b077 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -193,6 +193,7 @@ VAR PSQUpdateQuotaProcPtr PSQUpdateQuotaProc * Prototypes... */ +extern void cupsdCheckProcess(void); extern void cupsdClearString(char **s); extern void cupsdHoldSignals(void); extern void cupsdReleaseSignals(void); diff --git a/scheduler/job.c b/scheduler/job.c index cd185c4739..5adf0e050e 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -4004,10 +4004,24 @@ update_job(cupsd_job_t *job) /* I - Job to check */ for (i = 0; job->filters[i] < 0; i ++); if (job->filters[i]) + { + /* + * EOF but we haven't collected the exit status of all filters... + */ + + cupsdCheckProcess(); return; + } if (job->current_file >= job->num_files && job->backend > 0) + { + /* + * EOF but we haven't collected the exit status of the backend... + */ + + cupsdCheckProcess(); return; + } /* * Handle the end of job stuff... diff --git a/scheduler/main.c b/scheduler/main.c index ccc3952114..d78280f98c 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -147,7 +147,8 @@ main(int argc, /* I - Number of command-line args */ #ifdef __APPLE__ int run_as_child = 0, /* Needed for Mac OS X fork/exec */ - use_sysman = 1; /* Use system management functions? */ + use_sysman = !getuid(); + /* Use system management functions? */ #else time_t netif_time = 0; /* Time since last network update */ #endif /* __APPLE__ */ @@ -1213,6 +1214,21 @@ main(int argc, /* I - Number of command-line args */ } +/* + * 'cupsdCheckProcess()' - Tell the main loop to check for dead children. + */ + +void +cupsdCheckProcess(void) +{ + /* + * Flag that we have dead children... + */ + + dead_children = 1; +} + + /* * 'cupsdClosePipe()' - Close a pipe as necessary. */ diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl index 448f65fc5a..4e99fb61c6 100644 --- a/templates/es/trailer.tmpl +++ b/templates/es/trailer.tmpl @@ -1,9 +1,8 @@   -Common UNIX Printing System, CUPS, y el logo de CUPS son -marcas registradas de Apple, Inc. Los -derechos de copia de CUPS 2007-2009 son de Apple Inc. -Todos los derechos reservados. +CUPS y el logo de CUPS son marcas registradas de +Apple, Inc. Los derechos de copia de CUPS +2007-2009 son de Apple Inc. Todos los derechos reservados. diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl index 9c98c54590..d46b6646c6 100644 --- a/templates/ja/trailer.tmpl +++ b/templates/ja/trailer.tmpl @@ -1,8 +1,8 @@   -The Common UNIX Printing System, CUPS, and the CUPS -logo are trademarks of Apple Inc. CUPS is -copyright 2007-2009 Apple Inc. All rights reserved. +CUPS and the CUPS logo are trademarks of +Apple Inc. CUPS is copyright 2007-2009 Apple +Inc. All rights reserved. diff --git a/templates/pl/trailer.tmpl b/templates/pl/trailer.tmpl index 4d59f7ee49..dc214e47ff 100644 --- a/templates/pl/trailer.tmpl +++ b/templates/pl/trailer.tmpl @@ -1,6 +1,6 @@   -Wspólny uniksowy system drukowania, CUPS i logo CUPS +CUPS i logo CUPS są znakami handlowymi Apple Inc. CUPS copyright 2007-2009 Apple Inc. Wszystkie prawa zastrzeżone. diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl index 75bd9c7d1a..7bfc8b29dd 100644 --- a/templates/ru/trailer.tmpl +++ b/templates/ru/trailer.tmpl @@ -1,6 +1,6 @@   -The Common UNIX Printing System, CUPS, а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2009) компании Apple Inc. Все права защищены. +CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2009) компании Apple Inc. Все права защищены. diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl index 9c98c54590..d46b6646c6 100644 --- a/templates/trailer.tmpl +++ b/templates/trailer.tmpl @@ -1,8 +1,8 @@   -The Common UNIX Printing System, CUPS, and the CUPS -logo are trademarks of Apple Inc. CUPS is -copyright 2007-2009 Apple Inc. All rights reserved. +CUPS and the CUPS logo are trademarks of +Apple Inc. CUPS is copyright 2007-2009 Apple +Inc. All rights reserved.