From: Michael R Sweet Date: Mon, 16 Jan 2017 14:31:01 +0000 (-0500) Subject: Fix source file header text duplication text duplication. X-Git-Tag: v2.2.2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57b7b66b58a66426494ec13ffb18f730afeab8b5;p=thirdparty%2Fcups.git Fix source file header text duplication text duplication. Bump copyright to 2017 in web interface and README files. --- diff --git a/CHANGES.txt b/CHANGES.txt index 915acb3b4f..dc25152fd0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2.2.2 - 2017-01-13 +CHANGES.txt - 2.2.2 - 2017-01-16 -------------------------------- CHANGES IN CUPS V2.2.2 diff --git a/Makedefs.in b/Makedefs.in index 332a127420..dae0e7d322 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # # diff --git a/Makefile b/Makefile index 264dc1b4de..20cd313c19 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include Makedefs diff --git a/README.txt b/README.txt index 9cea07f534..a24db56d6f 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README - CUPS v2.2.1 - 2016-10-03 +README - CUPS v2.2.2 - 2017-01-16 --------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... @@ -140,7 +140,7 @@ PRINTING FILES LEGAL STUFF - CUPS is Copyright 2007-2016 by Apple Inc. CUPS and the CUPS logo are + CUPS is Copyright 2007-2017 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/backend/Makefile b/backend/Makefile index ae08947fb9..4c6a11b4dd 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # # This file is subject to the Apple OS-Developed Software exception. # diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index c48c6ecb58..7fc95c27ed 100644 --- a/backend/usb-libusb.c +++ b/backend/usb-libusb.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/berkeley/Makefile b/berkeley/Makefile index 688efedb08..5e0f22f670 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/berkeley/lpc.c b/berkeley/lpc.c index 93e029fa7f..6eb70b4a1d 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/berkeley/lpq.c b/berkeley/lpq.c index f01168ca5b..fb6d12139e 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 418ef4b554..e83f52e0b6 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/berkeley/lprm.c b/berkeley/lprm.c index 2271d48720..bd190bb3e5 100644 --- a/berkeley/lprm.c +++ b/berkeley/lprm.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index 6bc1dbaebf..27d75f28ff 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index c44a42706c..576fac0bc7 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h index 3bae75046c..e824471d48 100644 --- a/cgi-bin/cgi-private.h +++ b/cgi-bin/cgi-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h index 9604f97a21..0c360cb18a 100644 --- a/cgi-bin/cgi.h +++ b/cgi-bin/cgi.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_CGI_H_ diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c index ae76a0c9fc..82750d0387 100644 --- a/cgi-bin/classes.c +++ b/cgi-bin/classes.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index 60cda8754d..cb27164db7 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h index 5fb1ac1f5b..1882f9b7ed 100644 --- a/cgi-bin/help-index.h +++ b/cgi-bin/help-index.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_HELP_INDEX_H_ diff --git a/cgi-bin/help.c b/cgi-bin/help.c index 314be87e82..07f6f27209 100644 --- a/cgi-bin/help.c +++ b/cgi-bin/help.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/html.c b/cgi-bin/html.c index e10e2d6a66..1ddeb6a20c 100644 --- a/cgi-bin/html.c +++ b/cgi-bin/html.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -91,7 +91,7 @@ cgiFormEncode(char *dst, /* I - Destination string */ for (dstptr = dst; *src && dstptr < dstend;) { switch (*src) - { + { case ' ' : /* * Encode spaces with a "+"... diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index 877d37c28d..92f1501146 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c index a0d7c4b222..b0a409c102 100644 --- a/cgi-bin/jobs.c +++ b/cgi-bin/jobs.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c index 97e130fc67..5a72177998 100644 --- a/cgi-bin/makedocset.c +++ b/cgi-bin/makedocset.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * Usage: * diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c index 932c699954..ea7a5771ae 100644 --- a/cgi-bin/printers.c +++ b/cgi-bin/printers.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/search.c b/cgi-bin/search.c index 95efb36321..3d1a18df18 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/template.c b/cgi-bin/template.c index c7d2144f8c..5570bfb1af 100644 --- a/cgi-bin/template.c +++ b/cgi-bin/template.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #include "cgi-private.h" diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c index fe58bab8a2..3d6b4d9ba7 100644 --- a/cgi-bin/testcgi.c +++ b/cgi-bin/testcgi.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c index 1fbe9063b7..2340c94a50 100644 --- a/cgi-bin/testhi.c +++ b/cgi-bin/testhi.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c index 046af47d95..9ac260a444 100644 --- a/cgi-bin/testtemplate.c +++ b/cgi-bin/testtemplate.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cgi-bin/var.c b/cgi-bin/var.c index 6d02e10794..c50833cbd8 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/conf/Makefile b/conf/Makefile index bc1f3f944e..e8f88ec882 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index be9a362444..b5075fd06e 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl dnl Set the name of the config header file... diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 4e71f0c3ce..d9490a7a16 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl dnl Clear the debugging and non-shared library options unless the user asks diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 4471e3c7ca..c29d58748f 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl dnl Default languages... diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 30e45d93f8..2ba0174033 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_PREFIX_DEFAULT(/) diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 0b6ba582ae..dc9cf81e77 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -7,7 +7,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(avahi, [ --disable-avahi disable DNS Service Discovery support using Avahi]) diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index e540bfcce8..f2687f6b62 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -11,7 +11,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(gssapi, [ --disable-gssapi disable GSSAPI support]) diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4 index 1f0c5388c0..835ac7de4d 100644 --- a/config-scripts/cups-largefile.m4 +++ b/config-scripts/cups-largefile.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl dnl Check for largefile support... diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index 805e806d36..429ce0ba35 100644 --- a/config-scripts/cups-libtool.m4 +++ b/config-scripts/cups-libtool.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index bbdb0a1713..00a8c76cc7 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl dnl Fix "mandir" variable... diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 7a219be2c8..d295368b0b 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H),,[ diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index 3cf6fb113c..655a95dc74 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl dnl Get the operating system, version number, and architecture... diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index e3c6aa6e8f..00ada06d2f 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(pam, [ --disable-pam disable PAM support]) diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4 index 96361969c6..6dd8d95876 100644 --- a/config-scripts/cups-poll.m4 +++ b/config-scripts/cups-poll.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL)) diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 index 10b4541850..bff3e9a050 100644 --- a/config-scripts/cups-scripting.m4 +++ b/config-scripts/cups-scripting.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl dnl Do we have Java? diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index 33bb30f53d..2362e388a6 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl PICFLAG=1 diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index d9d8581092..1604900f81 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(ssl, [ --disable-ssl disable SSL/TLS support]) diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index 0ab61ec452..04fc87d7d5 100644 --- a/config-scripts/cups-startup.m4 +++ b/config-scripts/cups-startup.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl ONDEMANDFLAGS="" diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index 017b910089..d4e3f01bad 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(threads, [ --disable-threads disable multi-threading support]) diff --git a/configure b/configure index aeb5f49748..1788f33119 100755 --- a/configure +++ b/configure @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.2.2. +# Generated by GNU Autoconf 2.68 for CUPS 2.2.2. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" +test x\$exitcode = x0 || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -238,25 +214,21 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -359,14 +331,6 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -488,10 +452,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -526,16 +486,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -547,8 +507,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1381,6 +1361,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1708,9 +1690,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF CUPS configure 2.2.2 -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1861,7 +1843,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -2172,7 +2154,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by CUPS $as_me 2.2.2, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2591,7 +2573,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2639,7 +2621,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2683,7 +2665,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3127,7 +3109,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -struct stat; +#include +#include /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3377,7 +3360,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3421,7 +3404,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3623,7 +3606,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3663,7 +3646,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3716,7 +3699,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3756,7 +3739,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3796,7 +3779,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3836,7 +3819,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3876,7 +3859,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3916,7 +3899,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3956,7 +3939,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3996,7 +3979,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4036,7 +4019,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4076,7 +4059,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XDGOPEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4152,7 +4135,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4195,7 +4178,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4605,7 +4588,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4671,7 +4654,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -7633,7 +7616,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7676,7 +7659,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8228,7 +8211,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8271,7 +8254,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8326,7 +8309,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8369,7 +8352,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8928,8 +8911,6 @@ _ACEOF esac rm -rf conftest* fi - - fi @@ -9953,7 +9934,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10016,7 +9997,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10079,7 +10060,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHPCGI="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10120,7 +10101,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10188,7 +10169,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10656,16 +10637,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10725,16 +10706,28 @@ else as_mkdir_p=false fi - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -10756,7 +10749,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by CUPS $as_me 2.2.2, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10819,10 +10812,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ CUPS config.status 2.2.2 -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10911,7 +10904,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/configure.ac b/configure.ac index 1a6a5a69ab..7369e0f1ab 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl missing or damaged, see the license at "http://www.cups.org/". dnl dnl We need at least autoconf 2.60... diff --git a/cups/Makefile b/cups/Makefile index ba9bbed4bb..1df7d8552c 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # # This file is subject to the Apple OS-Developed Software exception. # diff --git a/cups/adminutil.c b/cups/adminutil.c index 1a6d6a7c7e..adb1f7ae32 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/adminutil.h b/cups/adminutil.h index cc119fc5b1..23f79788c6 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/array-private.h b/cups/array-private.h index c563e25df2..ff083e4cef 100644 --- a/cups/array-private.h +++ b/cups/array-private.h @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/array.c b/cups/array.c index b8bec274d0..dee4f5e46d 100644 --- a/cups/array.c +++ b/cups/array.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/array.h b/cups/array.h index c7478310c0..189c6e1da6 100644 --- a/cups/array.h +++ b/cups/array.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/auth.c b/cups/auth.c index 4cd79d382d..8348a2ccc0 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -11,7 +11,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/backchannel.c b/cups/backchannel.c index 13a956027b..e804d45b7e 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/backend.c b/cups/backend.c index a21ee387ad..f1646171fa 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/backend.h b/cups/backend.h index 709fd6eb5a..274bcd4310 100644 --- a/cups/backend.h +++ b/cups/backend.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/cups-private.h b/cups/cups-private.h index 03cd8df7eb..264fd01c8e 100644 --- a/cups/cups-private.h +++ b/cups/cups-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/cups.h b/cups/cups.h index 6127c17a72..ef9623a932 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/debug-private.h b/cups/debug-private.h index 8d9861cb43..23a0ae1795 100644 --- a/cups/debug-private.h +++ b/cups/debug-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/debug.c b/cups/debug.c index a25e4b1aeb..bd244fe72a 100644 --- a/cups/debug.c +++ b/cups/debug.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/dest-job.c b/cups/dest-job.c index 146887eead..b0d89b6e7b 100644 --- a/cups/dest-job.c +++ b/cups/dest-job.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/dest-localization.c b/cups/dest-localization.c index 6358b6dbbb..6d75a97203 100644 --- a/cups/dest-localization.c +++ b/cups/dest-localization.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/dest-options.c b/cups/dest-options.c index fc3fd35737..bf9020bac6 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/dest.c b/cups/dest.c index cd7529c008..b06a9ee154 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/dir.c b/cups/dir.c index 074e65942e..65b8c4f9c3 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -10,7 +10,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cups/dir.h b/cups/dir.h index 98a6767d4f..d0105441ec 100644 --- a/cups/dir.h +++ b/cups/dir.h @@ -10,7 +10,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_DIR_H_ diff --git a/cups/encode.c b/cups/encode.c index d26d86d368..e60aec0d25 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/file-private.h b/cups/file-private.h index 6ce11cf903..b8ca431fe4 100644 --- a/cups/file-private.h +++ b/cups/file-private.h @@ -13,7 +13,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/file.c b/cups/file.c index b81bfe88a8..a027df405e 100644 --- a/cups/file.c +++ b/cups/file.c @@ -13,7 +13,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/file.h b/cups/file.h index 8a4289f3eb..177c2e9058 100644 --- a/cups/file.h +++ b/cups/file.h @@ -13,7 +13,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/getdevices.c b/cups/getdevices.c index 13bebd2fff..0f303ba525 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/getputfile.c b/cups/getputfile.c index 76a309361e..ae33bc5993 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/globals.c b/cups/globals.c index 276bbcf5bf..8a05c3eb1f 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/hash.c b/cups/hash.c index d52807ef73..ede546167b 100644 --- a/cups/hash.c +++ b/cups/hash.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/http-addr.c b/cups/http-addr.c index 78d5ea83ed..12d13a6977 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index dd851d4d4b..723bf029cd 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/http-private.h b/cups/http-private.h index ec29707192..ec908a660a 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/http-support.c b/cups/http-support.c index 21776d70e1..1ca01b27e1 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/http.c b/cups/http.c index 762ec80343..7925513adb 100644 --- a/cups/http.c +++ b/cups/http.c @@ -11,7 +11,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/http.h b/cups/http.h index 00039ee51a..ccbf77ee71 100644 --- a/cups/http.h +++ b/cups/http.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/ipp-private.h b/cups/ipp-private.h index 0dbd97e1dd..4b1947c637 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 5cc80dd917..b3f38113e5 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/ipp.c b/cups/ipp.c index cd7e0cd88c..b2f8bb73ed 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/ipp.h b/cups/ipp.h index be50686fd4..54d9d4bd1e 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/langprintf.c b/cups/langprintf.c index 40a6688e3a..46b6be51d1 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/language-private.h b/cups/language-private.h index a597cd3f0a..291bf09154 100644 --- a/cups/language-private.h +++ b/cups/language-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/language.c b/cups/language.c index f1afeccd58..bf38d194ed 100644 --- a/cups/language.c +++ b/cups/language.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/language.h b/cups/language.h index c378e9863d..0a3da77990 100644 --- a/cups/language.h +++ b/cups/language.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/md5passwd.c b/cups/md5passwd.c index 9714aaaeae..a9817aaa22 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/notify.c b/cups/notify.c index 5f6e7fd54f..b58a136431 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/options.c b/cups/options.c index a3f57cfc09..aa70992853 100644 --- a/cups/options.c +++ b/cups/options.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/ppd-attr.c b/cups/ppd-attr.c index 6324e6e15b..da026373c6 100644 --- a/cups/ppd-attr.c +++ b/cups/ppd-attr.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c index 586d966b15..e8b05e43a4 100644 --- a/cups/ppd-cache.c +++ b/cups/ppd-cache.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c index 68e03b4dcd..8f875a57e3 100644 --- a/cups/ppd-conflicts.c +++ b/cups/ppd-conflicts.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/ppd-custom.c b/cups/ppd-custom.c index 6e4d3bd6e2..b7070fa2da 100644 --- a/cups/ppd-custom.c +++ b/cups/ppd-custom.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c index 0b4f1c9950..36e5bcaf48 100644 --- a/cups/ppd-emit.c +++ b/cups/ppd-emit.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/ppd-localize.c b/cups/ppd-localize.c index db93170909..e74147cd83 100644 --- a/cups/ppd-localize.c +++ b/cups/ppd-localize.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c index 08bc9931d2..9fdaf0bd8e 100644 --- a/cups/ppd-mark.c +++ b/cups/ppd-mark.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/ppd-page.c b/cups/ppd-page.c index f18e68d0d6..ccbf0527dd 100644 --- a/cups/ppd-page.c +++ b/cups/ppd-page.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/ppd-private.h b/cups/ppd-private.h index 83f048e298..6020190915 100644 --- a/cups/ppd-private.h +++ b/cups/ppd-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/ppd-util.c b/cups/ppd-util.c index af5bd20049..d0194c8034 100644 --- a/cups/ppd-util.c +++ b/cups/ppd-util.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/ppd.c b/cups/ppd.c index 44a22c5cb3..63d5dd2feb 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/ppd.h b/cups/ppd.h index eb9ab382b2..fb33c08bfd 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -12,7 +12,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 1bdf68e9ee..3e4540cb85 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/pwg-private.h b/cups/pwg-private.h index 25fb667ae1..e7715906c9 100644 --- a/cups/pwg-private.h +++ b/cups/pwg-private.h @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/pwg.h b/cups/pwg.h index f663246cad..2269dbe4df 100644 --- a/cups/pwg.h +++ b/cups/pwg.h @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/raster-private.h b/cups/raster-private.h index 7656b27962..38135815c1 100644 --- a/cups/raster-private.h +++ b/cups/raster-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/raster.h b/cups/raster.h index ecb94b9e6e..4067b3c329 100644 --- a/cups/raster.h +++ b/cups/raster.h @@ -10,7 +10,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/request.c b/cups/request.c index 8de44f7ed5..39cbe6ccdf 100644 --- a/cups/request.c +++ b/cups/request.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/sidechannel.c b/cups/sidechannel.c index 8070ea7420..a4cd960aa2 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index 3de45420a5..a82408f4cb 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/snprintf.c b/cups/snprintf.c index d586ce92ab..c5d8908c06 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/string-private.h b/cups/string-private.h index 8b1140bce3..e8448d17f1 100644 --- a/cups/string-private.h +++ b/cups/string-private.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/string.c b/cups/string.c index 23b04398ef..39a787f0ec 100644 --- a/cups/string.c +++ b/cups/string.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/tempfile.c b/cups/tempfile.c index d96ee7db12..da705a94ea 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testadmin.c b/cups/testadmin.c index f15c80815e..69b5efbf44 100644 --- a/cups/testadmin.c +++ b/cups/testadmin.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testarray.c b/cups/testarray.c index 5ae7315d29..6164ffc665 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testcache.c b/cups/testcache.c index 9025a0df16..e7816a36ee 100644 --- a/cups/testcache.c +++ b/cups/testcache.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testconflicts.c b/cups/testconflicts.c index d07b088ea2..973c5a0496 100644 --- a/cups/testconflicts.c +++ b/cups/testconflicts.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testcreds.c b/cups/testcreds.c index 8e3c878a15..bc17a2026a 100644 --- a/cups/testcreds.c +++ b/cups/testcreds.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testcups.c b/cups/testcups.c index b6bf78fa31..aa58766157 100644 --- a/cups/testcups.c +++ b/cups/testcups.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testdest.c b/cups/testdest.c index de6f1daa5c..945e3e11da 100644 --- a/cups/testdest.c +++ b/cups/testdest.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testfile.c b/cups/testfile.c index dae50fa238..b2ec8cd5fc 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testhttp.c b/cups/testhttp.c index 20c6625ae2..376d71f666 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testi18n.c b/cups/testi18n.c index a88f1e1f45..beaf236794 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testipp.c b/cups/testipp.c index 150abe0680..017ee9d6f2 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testlang.c b/cups/testlang.c index 6f0691e008..6aa49ab407 100644 --- a/cups/testlang.c +++ b/cups/testlang.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testoptions.c b/cups/testoptions.c index 44a3c71d91..f5ce2e2e31 100644 --- a/cups/testoptions.c +++ b/cups/testoptions.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testppd.c b/cups/testppd.c index 6d5065c66e..1f66ca342d 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testpwg.c b/cups/testpwg.c index 05aba45e33..d2332c2969 100644 --- a/cups/testpwg.c +++ b/cups/testpwg.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/testsnmp.c b/cups/testsnmp.c index 3ab48af24c..4026a28bc8 100644 --- a/cups/testsnmp.c +++ b/cups/testsnmp.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/thread-private.h b/cups/thread-private.h index 64897a350c..ca4ef4cb4b 100644 --- a/cups/thread-private.h +++ b/cups/thread-private.h @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/thread.c b/cups/thread.c index b389b153f5..77b44426e4 100644 --- a/cups/thread.c +++ b/cups/thread.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c index 383a20e909..e7ba786f9d 100644 --- a/cups/tls-darwin.c +++ b/cups/tls-darwin.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c index 9941e51e53..7193d79457 100644 --- a/cups/tls-gnutls.c +++ b/cups/tls-gnutls.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c index 8d88faf7c7..46f6e79095 100644 --- a/cups/tls-sspi.c +++ b/cups/tls-sspi.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/tls.c b/cups/tls.c index c1db80d295..36d484c387 100644 --- a/cups/tls.c +++ b/cups/tls.c @@ -11,7 +11,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/tlscheck.c b/cups/tlscheck.c index 919726102e..32cbcca170 100644 --- a/cups/tlscheck.c +++ b/cups/tlscheck.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/transcode.c b/cups/transcode.c index 2aa1a8bc3d..6f73a426d8 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/transcode.h b/cups/transcode.h index 20d13db0ee..cd12cb573e 100644 --- a/cups/transcode.h +++ b/cups/transcode.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/usersys.c b/cups/usersys.c index 9a23d74800..333d21e00d 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/util.c b/cups/util.c index abfb8d47aa..5db2fc6caa 100644 --- a/cups/util.c +++ b/cups/util.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/cups/versioning.h b/cups/versioning.h index ed68f82f97..2e92e6ba45 100644 --- a/cups/versioning.h +++ b/cups/versioning.h @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/data/Makefile b/data/Makefile index a3f9e36a9e..0c8dc78118 100644 --- a/data/Makefile +++ b/data/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/data/epson.h b/data/epson.h index f7d52ba01c..c2ed442927 100644 --- a/data/epson.h +++ b/data/epson.h @@ -9,7 +9,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #define EPSON_9PIN 0 /* 9-pin dot matrix */ diff --git a/data/hp.h b/data/hp.h index 6cae544b6d..221a5725a5 100644 --- a/data/hp.h +++ b/data/hp.h @@ -9,7 +9,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #define HP_LASERJET 0 /* HP LaserJet */ diff --git a/data/label.h b/data/label.h index c0d99034c5..6184443f3b 100644 --- a/data/label.h +++ b/data/label.h @@ -9,7 +9,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #define DYMO_3x0 0 /* Dymo Labelwriter 300/330/330 Turbo */ diff --git a/desktop/Makefile b/desktop/Makefile index 97f530d102..d5ec28e3d0 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/doc/Makefile b/doc/Makefile index de4a9f6b60..eb7ae6836d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/doc/de/index.html.in b/doc/de/index.html.in index e9170086a9..e98aa4a999 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -50,6 +50,6 @@ -
CUPS und das CUPS Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2015 Apple Inc. Alle Rechte vorbehalten.
+
CUPS und das CUPS Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2017 Apple Inc. Alle Rechte vorbehalten.
diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 7cc446da1b..7dacdadb22 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -50,6 +50,6 @@ -
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2015 Apple Inc. Todos los derechos reservados.
+
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2017 Apple Inc. Todos los derechos reservados.
diff --git a/doc/index.html.in b/doc/index.html.in index 719d96f3f5..f14021fb15 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -50,6 +50,6 @@ -
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2015 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2017 Apple Inc. All rights reserved.
diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index f68fe9ffd6..ad2f960a73 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -50,6 +50,6 @@ -
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2015 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2017 Apple Inc. All rights reserved.
diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in index 76ff92ca71..0f50244e57 100644 --- a/doc/pt_BR/index.html.in +++ b/doc/pt_BR/index.html.in @@ -51,6 +51,6 @@ -
CUPS e o logo do CUPS são marcas registradas da Apple Inc. Copyright © 2007-2015 Apple Inc. Todos os direitos reservados.
+
CUPS e o logo do CUPS são marcas registradas da Apple Inc. Copyright © 2007-2017 Apple Inc. Todos os direitos reservados.
diff --git a/examples/Makefile b/examples/Makefile index 47ba04c073..7932197bad 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # # diff --git a/examples/ppdx.c b/examples/ppdx.c index ec93d63acc..aa2c134c39 100644 --- a/examples/ppdx.c +++ b/examples/ppdx.c @@ -9,7 +9,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/examples/ppdx.h b/examples/ppdx.h index c503087391..2b70f8e9af 100644 --- a/examples/ppdx.h +++ b/examples/ppdx.h @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/examples/testppdx.c b/examples/testppdx.c index cbaaee29d7..6367af7c29 100644 --- a/examples/testppdx.c +++ b/examples/testppdx.c @@ -11,7 +11,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/Makefile b/filter/Makefile index 152bc90cf7..7da764d311 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # # This file is subject to the Apple OS-Developed Software exception. # diff --git a/filter/commandtops.c b/filter/commandtops.c index 65dcd35711..07979e03ab 100644 --- a/filter/commandtops.c +++ b/filter/commandtops.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/filter/common.c b/filter/common.c index bed4a53afe..86b5f8ec66 100644 --- a/filter/common.c +++ b/filter/common.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/common.h b/filter/common.h index 0dcb289f70..e72b27fb0a 100644 --- a/filter/common.h +++ b/filter/common.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/error.c b/filter/error.c index dfbb5c9070..3c552cb07c 100644 --- a/filter/error.c +++ b/filter/error.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/gziptoany.c b/filter/gziptoany.c index b3f5dffc25..0eae85ec95 100644 --- a/filter/gziptoany.c +++ b/filter/gziptoany.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/interpret.c b/filter/interpret.c index f811d1a090..031b1d5abb 100644 --- a/filter/interpret.c +++ b/filter/interpret.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/pstops.c b/filter/pstops.c index e9b4438938..072356e25c 100644 --- a/filter/pstops.c +++ b/filter/pstops.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/raster.c b/filter/raster.c index 905a6628bd..bacf5ba78f 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -10,7 +10,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/rasterbench.c b/filter/rasterbench.c index 010fd9dd31..8746f31e09 100644 --- a/filter/rasterbench.c +++ b/filter/rasterbench.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c index 74dc61c58d..4efe6692b9 100644 --- a/filter/rastertoepson.c +++ b/filter/rastertoepson.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/rastertohp.c b/filter/rastertohp.c index 2994b803ee..eb11c8c1f8 100644 --- a/filter/rastertohp.c +++ b/filter/rastertohp.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index cde27a0938..4e491811b9 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c index a25d59599c..5026f56543 100644 --- a/filter/rastertopwg.c +++ b/filter/rastertopwg.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright law. * Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/filter/testraster.c b/filter/testraster.c index d3482186dc..d5d63de2eb 100644 --- a/filter/testraster.c +++ b/filter/testraster.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/locale/Makefile b/locale/Makefile index 018fd84ba8..3fcbc1a56d 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/locale/checkpo.c b/locale/checkpo.c index 513af92ae9..825cdffc56 100644 --- a/locale/checkpo.c +++ b/locale/checkpo.c @@ -9,7 +9,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * Usage: * diff --git a/locale/po2strings.c b/locale/po2strings.c index 51e64f4225..1edf146835 100644 --- a/locale/po2strings.c +++ b/locale/po2strings.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * Usage: * diff --git a/locale/strings2po.c b/locale/strings2po.c index 6f912bb190..69da409317 100644 --- a/locale/strings2po.c +++ b/locale/strings2po.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * Usage: * diff --git a/man/Makefile b/man/Makefile index 8e75e8977a..60f76c84f3 100644 --- a/man/Makefile +++ b/man/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/man/mantohtml.c b/man/mantohtml.c index 0f46848311..8632de0f13 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/monitor/Makefile b/monitor/Makefile index 11c9ebaa4c..db8f2c035c 100644 --- a/monitor/Makefile +++ b/monitor/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # # This file is subject to the Apple OS-Developed Software exception. # diff --git a/monitor/bcp.c b/monitor/bcp.c index 0eef9a52d4..ba16258772 100644 --- a/monitor/bcp.c +++ b/monitor/bcp.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/monitor/tbcp.c b/monitor/tbcp.c index be7a788470..b708ec48f5 100644 --- a/monitor/tbcp.c +++ b/monitor/tbcp.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/notifier/Makefile b/notifier/Makefile index dd3e5c8600..c575c5173d 100644 --- a/notifier/Makefile +++ b/notifier/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/notifier/dbus.c b/notifier/dbus.c index 4eddf9758a..0edc728a24 100644 --- a/notifier/dbus.c +++ b/notifier/dbus.c @@ -10,7 +10,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/notifier/mailto.c b/notifier/mailto.c index ce55f18b0e..7b766f500d 100644 --- a/notifier/mailto.c +++ b/notifier/mailto.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/notifier/rss.c b/notifier/rss.c index be765d68ef..224c86a58f 100644 --- a/notifier/rss.c +++ b/notifier/rss.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/notifier/testnotify.c b/notifier/testnotify.c index cd01617cec..382e627b34 100644 --- a/notifier/testnotify.c +++ b/notifier/testnotify.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/ppdc/Makefile b/ppdc/Makefile index 49b93e92d2..4024244524 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # # diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx index 709b083c10..e2cf85acb4 100644 --- a/ppdc/genstrings.cxx +++ b/ppdc/genstrings.cxx @@ -11,7 +11,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // Usage: // diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx index d56b92a33d..2dd494490b 100644 --- a/ppdc/ppdc-array.cxx +++ b/ppdc/ppdc-array.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-attr.cxx b/ppdc/ppdc-attr.cxx index 996e986ab5..bbaf1b373f 100644 --- a/ppdc/ppdc-attr.cxx +++ b/ppdc/ppdc-attr.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx index 1ec051d73a..c791d30dc6 100644 --- a/ppdc/ppdc-catalog.cxx +++ b/ppdc/ppdc-catalog.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-choice.cxx b/ppdc/ppdc-choice.cxx index 80448cc9ed..90e328ca1d 100644 --- a/ppdc/ppdc-choice.cxx +++ b/ppdc/ppdc-choice.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx index 57fbe84284..477b00b980 100644 --- a/ppdc/ppdc-constraint.cxx +++ b/ppdc/ppdc-constraint.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx index 6d15963432..9420991151 100644 --- a/ppdc/ppdc-driver.cxx +++ b/ppdc/ppdc-driver.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx index 4bbe86dd33..984e6f4e60 100644 --- a/ppdc/ppdc-file.cxx +++ b/ppdc/ppdc-file.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-filter.cxx b/ppdc/ppdc-filter.cxx index ff3e8bc11c..1aa3ea3de1 100644 --- a/ppdc/ppdc-filter.cxx +++ b/ppdc/ppdc-filter.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-font.cxx b/ppdc/ppdc-font.cxx index 39e2552d51..2856b13be9 100644 --- a/ppdc/ppdc-font.cxx +++ b/ppdc/ppdc-font.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-group.cxx b/ppdc/ppdc-group.cxx index af9000a929..d664fa491b 100644 --- a/ppdc/ppdc-group.cxx +++ b/ppdc/ppdc-group.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx index 2b36c6bd78..26063e2872 100644 --- a/ppdc/ppdc-import.cxx +++ b/ppdc/ppdc-import.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-mediasize.cxx b/ppdc/ppdc-mediasize.cxx index bc07202654..67b8df55e9 100644 --- a/ppdc/ppdc-mediasize.cxx +++ b/ppdc/ppdc-mediasize.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-message.cxx b/ppdc/ppdc-message.cxx index 1e85d505d9..f65d954cad 100644 --- a/ppdc/ppdc-message.cxx +++ b/ppdc/ppdc-message.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx index 8f4d3c0edb..dcefd107b9 100644 --- a/ppdc/ppdc-option.cxx +++ b/ppdc/ppdc-option.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-private.h b/ppdc/ppdc-private.h index 92743ae6b5..3394b4db92 100644 --- a/ppdc/ppdc-private.h +++ b/ppdc/ppdc-private.h @@ -7,7 +7,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // #ifndef _PPDC_PRIVATE_H_ diff --git a/ppdc/ppdc-profile.cxx b/ppdc/ppdc-profile.cxx index 976caefc2f..379016f929 100644 --- a/ppdc/ppdc-profile.cxx +++ b/ppdc/ppdc-profile.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx index 934aeaa1bf..bb288786f6 100644 --- a/ppdc/ppdc-shared.cxx +++ b/ppdc/ppdc-shared.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx index 27f5c342dd..7b77c2ee7d 100644 --- a/ppdc/ppdc-source.cxx +++ b/ppdc/ppdc-source.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-string.cxx b/ppdc/ppdc-string.cxx index 156ea27cdf..d2335bf599 100644 --- a/ppdc/ppdc-string.cxx +++ b/ppdc/ppdc-string.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc-variable.cxx b/ppdc/ppdc-variable.cxx index 0208a6326c..50c0b93ae3 100644 --- a/ppdc/ppdc-variable.cxx +++ b/ppdc/ppdc-variable.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index 78752e5ec8..d96e7c496c 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h index b36ebbe821..6a69c6eb24 100644 --- a/ppdc/ppdc.h +++ b/ppdc/ppdc.h @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // #ifndef _PPDC_H_ diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx index 416ff2dbf0..1112b219fb 100644 --- a/ppdc/ppdhtml.cxx +++ b/ppdc/ppdhtml.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx index 8340340063..11f88f31c6 100644 --- a/ppdc/ppdi.cxx +++ b/ppdc/ppdi.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx index 397f1c3baa..3f6670f259 100644 --- a/ppdc/ppdmerge.cxx +++ b/ppdc/ppdmerge.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx index 5ebfeaf999..685e39df16 100644 --- a/ppdc/ppdpo.cxx +++ b/ppdc/ppdpo.cxx @@ -8,7 +8,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/ppdc/testcatalog.cxx b/ppdc/testcatalog.cxx index bf046dd3d1..71cbc36305 100644 --- a/ppdc/testcatalog.cxx +++ b/ppdc/testcatalog.cxx @@ -7,7 +7,7 @@ // property of Apple Inc. and are protected by Federal copyright // law. Distribution and use rights are outlined in the file "LICENSE.txt" // which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// missing or damaged, see the license at "http://www.cups.org/". // // diff --git a/scheduler/Makefile b/scheduler/Makefile index 715d88fdda..251f017e2f 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/scheduler/auth.c b/scheduler/auth.c index 6d573cc81f..14a07ae813 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -11,7 +11,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/auth.h b/scheduler/auth.h index f82253b909..7582f9df1c 100644 --- a/scheduler/auth.h +++ b/scheduler/auth.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/banners.c b/scheduler/banners.c index 33ed9dc8b0..171b015da4 100644 --- a/scheduler/banners.c +++ b/scheduler/banners.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/banners.h b/scheduler/banners.h index 9ae0fdaf9d..5e90f4784e 100644 --- a/scheduler/banners.h +++ b/scheduler/banners.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/cert.c b/scheduler/cert.c index eb34f67389..0ebd549478 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/cert.h b/scheduler/cert.h index a4e452995b..370bb5d720 100644 --- a/scheduler/cert.h +++ b/scheduler/cert.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/classes.c b/scheduler/classes.c index e3dc17b392..57f9a8f44f 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/classes.h b/scheduler/classes.h index 33f1e55520..f1e945002c 100644 --- a/scheduler/classes.h +++ b/scheduler/classes.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ diff --git a/scheduler/client.c b/scheduler/client.c index c0dc22a104..50e00be552 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -11,7 +11,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/client.h b/scheduler/client.h index d58d111481..b26d04cc26 100644 --- a/scheduler/client.h +++ b/scheduler/client.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifdef HAVE_AUTHORIZATION_H diff --git a/scheduler/colorman.c b/scheduler/colorman.c index 0f1fea0bb7..e6513e6dec 100644 --- a/scheduler/colorman.c +++ b/scheduler/colorman.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * Original DBUS/colord code is Copyright 2011 Red Hat, Inc. * diff --git a/scheduler/colorman.h b/scheduler/colorman.h index 6d1ef1a6a4..b297b4b67e 100644 --- a/scheduler/colorman.h +++ b/scheduler/colorman.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/conf.c b/scheduler/conf.c index f547749c60..3cde8bd298 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/conf.h b/scheduler/conf.h index 585ba92030..873c370e6c 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c index 94e69b4bfc..13efa54ffd 100644 --- a/scheduler/cups-deviced.c +++ b/scheduler/cups-deviced.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx index 9607169111..d7d017131a 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx @@ -12,7 +12,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/cups-exec.c b/scheduler/cups-exec.c index ee87edbaf8..aab43a797a 100644 --- a/scheduler/cups-exec.c +++ b/scheduler/cups-exec.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * Usage: * diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c index 50aae4fb25..8d2ea49171 100644 --- a/scheduler/cups-lpd.c +++ b/scheduler/cups-lpd.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index 5f08c5300f..596b491a4c 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 2e8303ec6f..fdbd7f1b38 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h index dfc8584977..5b2d23e8f9 100644 --- a/scheduler/dirsvc.h +++ b/scheduler/dirsvc.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/env.c b/scheduler/env.c index a2d0ffcebe..01676c317b 100644 --- a/scheduler/env.c +++ b/scheduler/env.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/filter.c b/scheduler/filter.c index 9a703abc9f..8ec2c42b12 100644 --- a/scheduler/filter.c +++ b/scheduler/filter.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -61,7 +61,7 @@ mimeAddFilter(mime_t *mime, /* I - MIME database */ src, src ? src->super : "???", src ? src->type : "???", dst, dst ? dst->super : "???", dst ? dst->type : "???", cost, filter)); - + /* * Range-check the input... */ diff --git a/scheduler/ipp.c b/scheduler/ipp.c index c2b67a08a6..2525e58c3b 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -11,7 +11,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/job.c b/scheduler/job.c index 0f1d648d56..1b12fe5a15 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/job.h b/scheduler/job.h index 658151c176..54f5092d67 100644 --- a/scheduler/job.h +++ b/scheduler/job.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/listen.c b/scheduler/listen.c index 1103b25103..61a27a3606 100644 --- a/scheduler/listen.c +++ b/scheduler/listen.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/log.c b/scheduler/log.c index 69b5b3b897..243742d172 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/mime-private.h b/scheduler/mime-private.h index 4631c94503..f8168de9d9 100644 --- a/scheduler/mime-private.h +++ b/scheduler/mime-private.h @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_MIME_PRIVATE_H_ diff --git a/scheduler/mime.c b/scheduler/mime.c index 5d2c198245..103e7e54b3 100644 --- a/scheduler/mime.c +++ b/scheduler/mime.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/mime.h b/scheduler/mime.h index f536a68e72..fec74ac589 100644 --- a/scheduler/mime.h +++ b/scheduler/mime.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_MIME_H_ diff --git a/scheduler/policy.c b/scheduler/policy.c index 9a68b1a97b..1c0a1be85a 100644 --- a/scheduler/policy.c +++ b/scheduler/policy.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/policy.h b/scheduler/policy.h index 3e4ad818c5..fd5b8b9cc3 100644 --- a/scheduler/policy.h +++ b/scheduler/policy.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ diff --git a/scheduler/printers.c b/scheduler/printers.c index 7aa7bd8f24..63ca80d676 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/printers.h b/scheduler/printers.h index 3a27544a84..c63b4711f0 100644 --- a/scheduler/printers.h +++ b/scheduler/printers.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifdef HAVE_DNSSD diff --git a/scheduler/process.c b/scheduler/process.c index aa1fe96c97..cf67e74f36 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/quotas.c b/scheduler/quotas.c index 21c41f6df7..a4048de1ea 100644 --- a/scheduler/quotas.c +++ b/scheduler/quotas.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/select.c b/scheduler/select.c index d8d7e19dc3..a0129d9cbb 100644 --- a/scheduler/select.c +++ b/scheduler/select.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/server.c b/scheduler/server.c index eb77dc96ae..04b26d64d2 100644 --- a/scheduler/server.c +++ b/scheduler/server.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c index 4ea37be9ef..d4b1308c44 100644 --- a/scheduler/statbuf.c +++ b/scheduler/statbuf.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h index 5bf6beaa47..98e5c6e06c 100644 --- a/scheduler/statbuf.h +++ b/scheduler/statbuf.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c index 52e12af169..b2abf14ee9 100644 --- a/scheduler/subscriptions.c +++ b/scheduler/subscriptions.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h index 159db2a09c..6ca6ac1924 100644 --- a/scheduler/subscriptions.h +++ b/scheduler/subscriptions.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -78,7 +78,7 @@ typedef struct cupsd_event_s /**** Event structure ****/ ipp_t *attrs; /* Notification message */ cupsd_printer_t *dest; /* Associated printer, if any */ cupsd_job_t *job; /* Associated job, if any */ -} cupsd_event_t; +} cupsd_event_t; typedef struct cupsd_subscription_s /**** Subscription structure ****/ { diff --git a/scheduler/sysman.c b/scheduler/sysman.c index 4eddd1aac2..1a46c30694 100644 --- a/scheduler/sysman.c +++ b/scheduler/sysman.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ diff --git a/scheduler/sysman.h b/scheduler/sysman.h index 651bc055d9..929ee73589 100644 --- a/scheduler/sysman.h +++ b/scheduler/sysman.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/testlpd.c b/scheduler/testlpd.c index 79b0ab0201..748f47962e 100644 --- a/scheduler/testlpd.c +++ b/scheduler/testlpd.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/testmime.c b/scheduler/testmime.c index c1f2b6029b..63a2417923 100644 --- a/scheduler/testmime.c +++ b/scheduler/testmime.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c index 2034016c84..c1863b2304 100644 --- a/scheduler/testspeed.c +++ b/scheduler/testspeed.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/testsub.c b/scheduler/testsub.c index 2475f347c5..755e9b362d 100644 --- a/scheduler/testsub.c +++ b/scheduler/testsub.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/type.c b/scheduler/type.c index 9cb0129920..d1b0a415bb 100644 --- a/scheduler/type.c +++ b/scheduler/type.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/util.c b/scheduler/util.c index ac078bd9c2..19ebf069bc 100644 --- a/scheduler/util.c +++ b/scheduler/util.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/scheduler/util.h b/scheduler/util.h index 241c1e8489..f6c1875b1d 100644 --- a/scheduler/util.h +++ b/scheduler/util.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPSD_UTIL_H_ diff --git a/systemv/Makefile b/systemv/Makefile index a27f38b0ba..7515d51146 100644 --- a/systemv/Makefile +++ b/systemv/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/systemv/cancel.c b/systemv/cancel.c index e72822abfc..3afeadd7e9 100644 --- a/systemv/cancel.c +++ b/systemv/cancel.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/systemv/cupsaccept.c b/systemv/cupsaccept.c index 27f379df3f..5e5c183883 100644 --- a/systemv/cupsaccept.c +++ b/systemv/cupsaccept.c @@ -9,7 +9,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -108,7 +108,7 @@ main(int argc, /* I - Number of command-line arguments */ cupsSetUser(argv[i]); } break; - + case 'c' : /* Cancel jobs */ cancel = 1; break; diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c index 7c28a370eb..0e63b9d802 100644 --- a/systemv/cupsaddsmb.c +++ b/systemv/cupsaddsmb.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c index c4e2763c5c..c9ab991778 100644 --- a/systemv/cupsctl.c +++ b/systemv/cupsctl.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c index a8420b8b29..84c4e987eb 100644 --- a/systemv/cupstestdsc.c +++ b/systemv/cupstestdsc.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 8c48d801f6..dbce718658 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * PostScript is a trademark of Adobe Systems, Inc. * diff --git a/systemv/lp.c b/systemv/lp.c index bc09b4b206..9672b080ae 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index 1344b596e2..f9a1970b5c 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c index 16bdf0f992..b250df5574 100644 --- a/systemv/lpinfo.c +++ b/systemv/lpinfo.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -221,7 +221,7 @@ main(int argc, /* I - Number of command-line arguments */ if (show_models(long_status, device_id, language, make_model, product, include_schemes, exclude_schemes)) return (1); break; - + case 'v' : /* Show available devices */ if (show_devices(long_status, timeout, include_schemes, exclude_schemes)) return (1); diff --git a/systemv/lpmove.c b/systemv/lpmove.c index a3c4f01827..391098d29f 100644 --- a/systemv/lpmove.c +++ b/systemv/lpmove.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c index 56b4f604eb..76a6d78086 100644 --- a/systemv/lpoptions.c +++ b/systemv/lpoptions.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/systemv/lpstat.c b/systemv/lpstat.c index c13739fc89..6feb00e599 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ /* diff --git a/templates/Makefile b/templates/Makefile index 90a7f3bb09..09c1892ece 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/templates/de/trailer.tmpl b/templates/de/trailer.tmpl index 5441b2d682..e3a12bf6da 100644 --- a/templates/de/trailer.tmpl +++ b/templates/de/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS und das CUPS-Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2015 Apple Inc. Alle Rechte vorbehalten.
+
CUPS und das CUPS-Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2017 Apple Inc. Alle Rechte vorbehalten.
diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl index 9bdd1a76cd..4baa71da46 100644 --- a/templates/es/trailer.tmpl +++ b/templates/es/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2015 Apple Inc. Todos los derechos reservados.
+
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2017 Apple Inc. Todos los derechos reservados.
diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl index 74447afd33..4f5ec0728a 100644 --- a/templates/ja/trailer.tmpl +++ b/templates/ja/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2015 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2017 Apple Inc. All rights reserved.
diff --git a/templates/pt_BR/trailer.tmpl b/templates/pt_BR/trailer.tmpl index b8ef41e8fd..c4b40fcb97 100644 --- a/templates/pt_BR/trailer.tmpl +++ b/templates/pt_BR/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS e sua logo são marcas registradas da Apple Inc. Copyright © 2007-2015 Apple Inc. Todos os direitos reservados.
+
CUPS e sua logo são marcas registradas da Apple Inc. Copyright © 2007-2017 Apple Inc. Todos os direitos reservados.
diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl index ef87fea0f8..985a4b045d 100644 --- a/templates/ru/trailer.tmpl +++ b/templates/ru/trailer.tmpl @@ -1,6 +1,6 @@
CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками -Apple Inc. Авторские права на CUPS принадлежат (2007-2014) компании Apple Inc. Все права защищены.
+Apple Inc. Авторские права на CUPS принадлежат (2007-2017) компании Apple Inc. Все права защищены. diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl index 74447afd33..4f5ec0728a 100644 --- a/templates/trailer.tmpl +++ b/templates/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2015 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2017 Apple Inc. All rights reserved.
diff --git a/test/Makefile b/test/Makefile index 905740aefc..481783db74 100644 --- a/test/Makefile +++ b/test/Makefile @@ -8,7 +8,7 @@ # property of Apple Inc. and are protected by Federal copyright # law. Distribution and use rights are outlined in the file "LICENSE.txt" # which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs diff --git a/test/ippfind.c b/test/ippfind.c index b4a0ce2912..e96f68d3ad 100644 --- a/test/ippfind.c +++ b/test/ippfind.c @@ -9,7 +9,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/test/ippserver.c b/test/ippserver.c index 8f58c9a712..0cca65a05b 100644 --- a/test/ippserver.c +++ b/test/ippserver.c @@ -7,7 +7,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/test/ipptool.c b/test/ipptool.c index 819ab74375..1699366ab7 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". * * This file is subject to the Apple OS-Developed Software exception. */ diff --git a/vcnet/config.h b/vcnet/config.h index 88da27f92a..63a0992dc4 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_CONFIG_H_ diff --git a/xcode/config.h b/xcode/config.h index 4e9a2fcd87..104dabb4d5 100644 --- a/xcode/config.h +++ b/xcode/config.h @@ -8,7 +8,7 @@ * property of Apple Inc. and are protected by Federal copyright * law. Distribution and use rights are outlined in the file "LICENSE.txt" * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_CONFIG_H_