Miscellaneous build fixes for NetBSD (STR #788)

Copyright/address/phone number updates.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4213 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 36b68a95353741765b52a99022324e2fdd2a7688..9f01378208ae15469aa1cbfb2556e94d65b00b32 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ CHANGES.txt - 06/28/2004
 
 CHANGES IN CUPS V1.1.21rc2
 
+       - Miscellaneous build fixes for NetBSD (STR #788)
        - Added support for quoted system group names (STR #784)
        - Added "version" option to IPP backend to workaround
          serious bug in Linksys's IPP implementation (STR #767)

diff --git a/backend/Makefile b/backend/Makefile
index 926d2ac1003443ad643aa0846b8dfeff0e95048a..53e79dc5a31656a95c50f6034db556076ab24f87 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.39 2004/02/25 20:14:50 mike Exp $"
+# "$Id: Makefile,v 1.40 2004/06/29 03:44:52 mike Exp $"
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -151,5 +151,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.39 2004/02/25 20:14:50 mike Exp $".
+# End of "$Id: Makefile,v 1.40 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 81586a7066feccb9cbdd1841ed2b744faaed45e4..c3e4091e17b4665051ccf97a14f0adfef79d5401 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19 2004/02/25 20:14:50 mike Exp $"
+# "$Id: Makefile,v 1.20 2004/06/29 03:44:52 mike Exp $"
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -108,5 +108,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.19 2004/02/25 20:14:50 mike Exp $".
+# End of "$Id: Makefile,v 1.20 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 6c666379047fc78301e9c60d040c703578defc0f..1a1785b58d82e7b841870437c8d33af1e4fd842b 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.21 2004/02/25 20:14:51 mike Exp $"
+# "$Id: Makefile,v 1.22 2004/06/29 03:44:52 mike Exp $"
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -119,5 +119,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.21 2004/02/25 20:14:51 mike Exp $".
+# End of "$Id: Makefile,v 1.22 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/conf/Makefile b/conf/Makefile
index 0b933b8562cd5b42c3d1ae2978e9af8af99f225b..940c47b4436a3e0520ed321e75a5ff9a04e9d827 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.16 2004/02/26 16:51:59 mike Exp $"
+# "$Id: Makefile,v 1.17 2004/06/29 03:44:52 mike Exp $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -72,5 +72,5 @@ install:
 
 
 #
-# End of "$Id: Makefile,v 1.16 2004/02/26 16:51:59 mike Exp $".
+# End of "$Id: Makefile,v 1.17 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index c8ed381319a102f23e96b9d9db8b4ed639d06f6e..f2de46892b096a2f96fc381b065bdc25b2b6b469 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4,v 1.43 2004/06/29 02:44:47 mike Exp $"
+dnl "$Id: cups-common.m4,v 1.44 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -205,5 +205,5 @@ AC_SUBST(BACKLIBS)
 AC_SUBST(COMMONLIBS)
 
 dnl
-dnl End of "$Id: cups-common.m4,v 1.43 2004/06/29 02:44:47 mike Exp $".
+dnl End of "$Id: cups-common.m4,v 1.44 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 60ead8f9f16d60c4f44f7cac0c966719f9250551..a7f3dfa7f6415c44b3b6f87edd437e72ab4871c5 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4,v 1.26 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-compiler.m4,v 1.27 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -202,5 +202,5 @@ if test $uname = HP-UX; then
 fi
 
 dnl
-dnl End of "$Id: cups-compiler.m4,v 1.26 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-compiler.m4,v 1.27 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index b8f137670f78ebea812b3cc872cd552e15553cb6..f876da84b8f512c084b63b40e404f33b7dc69ce9 100644 (file)
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4,v 1.11 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-directories.m4,v 1.12 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -238,5 +238,5 @@ AC_SUBST(CUPS_FONTPATH)
 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
 
 dnl
-dnl End of "$Id: cups-directories.m4,v 1.11 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-directories.m4,v 1.12 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-image.m4 b/config-scripts/cups-image.m4
index 404732472455aec69e9844d4b00a98f67e2a0a29..d60b8b134541cbff1b05e70066ca9dcba655e45c 100644 (file)
--- a/config-scripts/cups-image.m4
+++ b/config-scripts/cups-image.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-image.m4,v 1.6 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-image.m4,v 1.7 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Image library stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -78,5 +78,5 @@ AC_SUBST(EXPORT_LIBZ)
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
 
 dnl
-dnl End of "$Id: cups-image.m4,v 1.6 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-image.m4,v 1.7 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index e7f6d4daa14cdb1cd07df50f46b32e34f3f7de2a..ab66824e995cd93a1358d959b2fc8dc1e6dc16d7 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-libtool.m4,v 1.6 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-libtool.m4,v 1.7 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -45,5 +45,5 @@ if test x$LIBTOOL != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-libtool.m4,v 1.6 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-libtool.m4,v 1.7 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 390c3c8e4409ac304452e861ca492ac6a8836cf6..8105cd3ac7a4c0ed630492d8321cb4e4c4f7ae68 100644 (file)
--- a/config-scripts/cups-manpages.m4
+++ b/config-scripts/cups-manpages.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-manpages.m4,v 1.8 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-manpages.m4,v 1.9 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -100,5 +100,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
 
 dnl
-dnl End of "$Id: cups-manpages.m4,v 1.8 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-manpages.m4,v 1.9 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index dec34c56e2b676480567ff74f68519460fe644e8..d1dc577f3b31f7ae66733553da0903a1f8fb13dc 100644 (file)
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-network.m4,v 1.11 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-network.m4,v 1.12 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -55,5 +55,5 @@ AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file desc
 AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
 
 dnl
-dnl End of "$Id: cups-network.m4,v 1.11 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-network.m4,v 1.12 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-openslp.m4 b/config-scripts/cups-openslp.m4
index 91a03556f6e158c1eb3e539e18011d9f534fb9e3..6dfbaca579af162a57a7aa5070c732334381b58e 100644 (file)
--- a/config-scripts/cups-openslp.m4
+++ b/config-scripts/cups-openslp.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-openslp.m4,v 1.8 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-openslp.m4,v 1.9 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -44,5 +44,5 @@ AC_SUBST(LIBSLP)
 
 
 dnl
-dnl End of "$Id: cups-openslp.m4,v 1.8 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-openslp.m4,v 1.9 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-openssl.m4 b/config-scripts/cups-openssl.m4
index a65fe7f06abe4efe1092f8f4a162f3db0c4aa1df..178d71c92cd537a017fa7b3253ea75073642bd18 100644 (file)
--- a/config-scripts/cups-openssl.m4
+++ b/config-scripts/cups-openssl.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-openssl.m4,v 1.15 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-openssl.m4,v 1.16 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -108,5 +108,5 @@ AC_SUBST(EXPORT_SSLLIBS)
 
 
 dnl
-dnl End of "$Id: cups-openssl.m4,v 1.15 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-openssl.m4,v 1.16 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index 7177771d06ccd9a8f61a84f87b5bfedbc89b6db1..81f676b15e200e0a26787d7da2ef4a4c06b23b53 100644 (file)
--- a/config-scripts/cups-opsys.m4
+++ b/config-scripts/cups-opsys.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-opsys.m4,v 1.11 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-opsys.m4,v 1.12 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -87,5 +87,5 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
 
 dnl
-dnl "$Id: cups-opsys.m4,v 1.11 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-opsys.m4,v 1.12 2004/06/29 03:44:52 mike Exp $"
 dnl

diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index e08decf596179a135c048b1417729f85a855a081..9062266d1f78541d986352a7c7a2853e048e0c2f 100644 (file)
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pam.m4,v 1.9 2004/05/27 15:37:34 mike Exp $"
+dnl "$Id: cups-pam.m4,v 1.10 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -90,5 +90,5 @@ AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)
 
 dnl
-dnl End of "$Id: cups-pam.m4,v 1.9 2004/05/27 15:37:34 mike Exp $".
+dnl End of "$Id: cups-pam.m4,v 1.10 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index 51d8604dd455a27a3d14543596f939d8ff9e4e8b..bb1a370598d936d4b16556632d77d5a58f801ffb 100644 (file)
--- a/config-scripts/cups-scripting.m4
+++ b/config-scripts/cups-scripting.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-scripting.m4,v 1.2 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-scripting.m4,v 1.3 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -87,5 +87,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-scripting.m4,v 1.2 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-scripting.m4,v 1.3 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 87de285521ec7690b4054643e537ff88874ddd7a..b94f2d9c14f65d0901f2a59f7e3d1cb089b942ca 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4,v 1.23 2004/02/26 16:52:00 mike Exp $"
+dnl "$Id: cups-sharedlibs.m4,v 1.24 2004/06/29 03:44:52 mike Exp $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
@@ -15,9 +15,9 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
-dnl       Voice: (301) 373-9603
+dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
@@ -152,5 +152,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4,v 1.23 2004/02/26 16:52:00 mike Exp $".
+dnl End of "$Id: cups-sharedlibs.m4,v 1.24 2004/06/29 03:44:52 mike Exp $".
 dnl

diff --git a/cups/Makefile b/cups/Makefile
index b01eef2614dbfeae27c357aaafd9dcbf08aac536..edcb70c98182a67536643b793090b973286b207d 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.85 2004/02/25 20:14:51 mike Exp $"
+# "$Id: Makefile,v 1.86 2004/06/29 03:44:52 mike Exp $"
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -93,8 +93,8 @@ install:      all     installhdrs
        fi
        if test $(LIBCUPS) != "libcups.a"; then \
                $(INSTALL_LIB) libcups.a $(LIBDIR); \
+               $(RANLIB) $(LIBDIR)/libcups.a; \
        fi
-       $(RANLIB) $(LIBDIR)/libcups.a
 
 installhdrs:
        $(INSTALL_DIR) $(INCLUDEDIR)/cups
@@ -122,7 +122,7 @@ libcups.2.dylib:    $(LIBOBJS) ../Makedefs
        echo Linking $@...
        $(DSO) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
-               -current_version 2.5.0 \
+               -current_version 2.7.0 \
                -compatibility_version 2.0.0 \
                $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
        $(RM) libcups.dylib
@@ -149,7 +149,7 @@ libcups_s.a:        $(LIBOBJS) ../Makedefs
 libcups.la:    $(LIBOBJS) ../Makedefs
        echo Linking $@...
        $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-               -version-info 2:5 $(SSLLIBS) $(COMMONLIBS)
+               -version-info 2:7 $(SSLLIBS) $(COMMONLIBS)
 
 
 #
@@ -208,5 +208,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.85 2004/02/25 20:14:51 mike Exp $".
+# End of "$Id: Makefile,v 1.86 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/cups/attr.c b/cups/attr.c
index 5351353c904ed5868b34031e49c1cddbf6a55797..1151b02a39aa9f4a9d6900629ee74a066cc16ffa 100644 (file)
--- a/cups/attr.c
+++ b/cups/attr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: attr.c,v 1.5 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: attr.c,v 1.6 2004/06/29 03:44:52 mike Exp $"
  *
  *   PPD model-specific attribute routines for the Common UNIX Printing System
  *   (CUPS).
@@ -16,7 +16,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
  *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
@@ -176,5 +176,5 @@ ppdFindNextAttr(ppd_file_t *ppd,    /* I - PPD file data */
 
 
 /*
- * End of "$Id: attr.c,v 1.5 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: attr.c,v 1.6 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/auth.c b/cups/auth.c
index c9554ea217c62eae57bb7eb3a10f9cf97ed0eabd..7ad902320ee42522b4a45ee94e0b07f9f05789aa 100644 (file)
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c,v 1.9 2004/06/29 01:02:45 mike Exp $"
+ * "$Id: auth.c,v 1.10 2004/06/29 03:44:52 mike Exp $"
  *
  *   Authentication functions for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -245,5 +245,5 @@ cups_local_auth(http_t *http)               /* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: auth.c,v 1.9 2004/06/29 01:02:45 mike Exp $".
+ * End of "$Id: auth.c,v 1.10 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/cups.h b/cups/cups.h
index a7d8eff2e23142a0be5b2d85b3b9326e8511ac4c..e875cc01d1a4956dfc48f46dea0fd609bc8a15f0 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h,v 1.55 2004/06/29 01:02:45 mike Exp $"
+ * "$Id: cups.h,v 1.56 2004/06/29 03:44:52 mike Exp $"
  *
  *   API definitions for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -207,5 +207,5 @@ extern int          cupsSetDests2(http_t *http, int num_dests,
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h,v 1.55 2004/06/29 01:02:45 mike Exp $".
+ * End of "$Id: cups.h,v 1.56 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/debug.h b/cups/debug.h
index eb20a12d2683abc66208269644d7bb62952d06e5..0f2c3ef637c7b2b930bc0fdec6118bb41cd75fc8 100644 (file)
--- a/cups/debug.h
+++ b/cups/debug.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: debug.h,v 1.8 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: debug.h,v 1.9 2004/06/29 03:44:52 mike Exp $"
  *
  *   Debugging macros for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -55,5 +55,5 @@
 #endif /* !_CUPS_DEBUG_H_ */
 
 /*
- * End of "$Id: debug.h,v 1.8 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: debug.h,v 1.9 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/dest.c b/cups/dest.c
index bb2f83c1bcc5415a3f96997263eb13ff6e8ce918..eea0554472adacab826078afca02b3e7d0c14fba 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest.c,v 1.38 2004/06/29 01:02:45 mike Exp $"
+ * "$Id: dest.c,v 1.39 2004/06/29 03:44:52 mike Exp $"
  *
  *   User-defined destination (and option) support for the Common UNIX
  *   Printing System (CUPS).
@@ -16,9 +16,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -852,5 +852,5 @@ cups_get_sdests(http_t      *http,  /* I - HTTP connection */
 
 
 /*
- * End of "$Id: dest.c,v 1.38 2004/06/29 01:02:45 mike Exp $".
+ * End of "$Id: dest.c,v 1.39 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/emit.c b/cups/emit.c
index 4353bfd8a58a5ae952a60583416d87cfaebf3a48..cc38ea04caea9ef60ac1ac934cfe35fff7d953cf 100644 (file)
--- a/cups/emit.c
+++ b/cups/emit.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: emit.c,v 1.39 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: emit.c,v 1.40 2004/06/29 03:44:52 mike Exp $"
  *
  *   PPD code emission routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -734,5 +734,5 @@ ppd_sort(ppd_choice_t **c1, /* I - First choice */
 
 
 /*
- * End of "$Id: emit.c,v 1.39 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: emit.c,v 1.40 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/encode.c b/cups/encode.c
index 4f90abc322f9eddc0499024718a081c7428f288b..52d42fcfdce161c3e89f6c70f0d70a2858867b3f 100644 (file)
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: encode.c,v 1.16 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: encode.c,v 1.17 2004/06/29 03:44:52 mike Exp $"
  *
  *   Option encoding routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -384,5 +384,5 @@ cupsEncodeOptions(ipp_t         *ipp,               /* I - Request to add to */
 
 
 /*
- * End of "$Id: encode.c,v 1.16 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: encode.c,v 1.17 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/getputfile.c b/cups/getputfile.c
index 32fa534c9d947d157b8a794661c96a0e7c5e33ee..48423863253f76757f1bd236c745c58ad040e7da 100644 (file)
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: getputfile.c,v 1.5 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: getputfile.c,v 1.6 2004/06/29 03:44:52 mike Exp $"
  *
  *   Get/put file functions for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -415,5 +415,5 @@ cupsPutFile(http_t     *http,               /* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: getputfile.c,v 1.5 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: getputfile.c,v 1.6 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/http-addr.c b/cups/http-addr.c
index 9bb8cdae0bad98b9c52087bad1716f32bf538170..d03b324be0970606e29ef4286d3a536779620ede 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-addr.c,v 1.8 2004/03/19 11:55:44 mike Exp $"
+ * "$Id: http-addr.c,v 1.9 2004/06/29 03:44:52 mike Exp $"
  *
  *   HTTP host/address routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -118,5 +118,5 @@ httpGetHostByName(const char *name) /* I - Hostname or IP address */
 
 
 /*
- * End of "$Id: http-addr.c,v 1.8 2004/03/19 11:55:44 mike Exp $".
+ * End of "$Id: http-addr.c,v 1.9 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/http-private.h b/cups/http-private.h
index f3a008e4736f847ec4d8ea8bd7de2fe772dba341..f5d25fe83fad93956f43abd5e548f5a0c4fc23ac 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h,v 1.6 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: http-private.h,v 1.7 2004/06/29 03:44:52 mike Exp $"
  *
  *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -98,5 +98,5 @@ extern const char *hstrerror(int error);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h,v 1.6 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: http-private.h,v 1.7 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/http-support.c b/cups/http-support.c
index 4aa1ca578b169b129d8dd98f798d67c9fdc43b71..4d514bd2bde3d6039dc161e9842e45bd772c2c8d 100644 (file)
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-support.c,v 1.9 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: http-support.c,v 1.10 2004/06/29 03:44:52 mike Exp $"
  *
  *   HTTP support routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -341,5 +341,5 @@ cups_hstrerror(int error)           /* I - Error number */
 
 
 /*
- * End of "$Id: http-support.c,v 1.9 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: http-support.c,v 1.10 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/http.c b/cups/http.c
index bafda2f37d8bb775c07bd788c4ea8074ec491a9f..374e3bd54030d634182144c4fe4152afadec4baf 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c,v 1.138 2004/06/29 01:02:45 mike Exp $"
+ * "$Id: http.c,v 1.139 2004/06/29 03:44:52 mike Exp $"
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -2470,5 +2470,5 @@ CDSAWriteFunc(SSLConnectionRef connection,        /* I  - SSL/TLS connection */
 
 
 /*
- * End of "$Id: http.c,v 1.138 2004/06/29 01:02:45 mike Exp $".
+ * End of "$Id: http.c,v 1.139 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/http.h b/cups/http.h
index 0759c7e2d7810de833300abec96966e25fafb113..2efebf919e407e86a5c35a1482620e3258cd1a33 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.h,v 1.48 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: http.h,v 1.49 2004/06/29 03:44:52 mike Exp $"
  *
  *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -16,9 +16,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -365,5 +365,5 @@ extern int          httpWait(http_t *http, int msec);
 #endif /* !_CUPS_HTTP_H_ */
 
 /*
- * End of "$Id: http.h,v 1.48 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: http.h,v 1.49 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 92bb3c59e331b5438a3e91f4776f6f6e3b5e4cc0..c8d28de6c47c1f9c44de52beaf2548c4cfc52026 100644 (file)
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-support.c,v 1.4 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: ipp-support.c,v 1.5 2004/06/29 03:44:52 mike Exp $"
  *
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
@@ -16,9 +16,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -171,5 +171,5 @@ ippSetPort(int p)           /* I - Port number to use */
 
 
 /*
- * End of "$Id: ipp-support.c,v 1.4 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: ipp-support.c,v 1.5 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/ipp.c b/cups/ipp.c
index 38891d3dcc1cdba12e080e1b1c2a1c90d645df75..39fada5dfb5e1bd231ab94193c434fa4eaab91f4 100644 (file)
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c,v 1.96 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: ipp.c,v 1.97 2004/06/29 03:44:52 mike Exp $"
  *
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
@@ -16,9 +16,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -2557,5 +2557,5 @@ ipp_write_file(int         *fd,                   /* I - File descriptor */
 
 
 /*
- * End of "$Id: ipp.c,v 1.96 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: ipp.c,v 1.97 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/ipp.h b/cups/ipp.h
index 812fcbc9665428302eb8d406a32157dbf8b142b0..f5f1760818832aed8a43a4d7662a9a0632df932f 100644 (file)
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.h,v 1.48 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: ipp.h,v 1.49 2004/06/29 03:44:52 mike Exp $"
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -16,9 +16,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -463,5 +463,5 @@ extern void         _ipp_free_attr(ipp_attribute_t *);
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp.h,v 1.48 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: ipp.h,v 1.49 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/language.c b/cups/language.c
index 18a06f2ace1d6a51a241c946b1578a5dc0040fda..62b6fbad5fa8b45f2fc7ba5648b5faf9770621aa 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c,v 1.49 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: language.c,v 1.50 2004/06/29 03:44:52 mike Exp $"
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -927,5 +927,5 @@ cups_cache_lookup(const char      *name,/* I - Name of locale */
 
 
 /*
- * End of "$Id: language.c,v 1.49 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: language.c,v 1.50 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/language.h b/cups/language.h
index cd77159d90f12eda65c849455eb1bfc08c7822c4..2486338083577fdf85496ef1975dc05d3efbd090 100644 (file)
--- a/cups/language.h
+++ b/cups/language.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.h,v 1.32 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: language.h,v 1.33 2004/06/29 03:44:52 mike Exp $"
  *
  *   Multi-language support for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -224,5 +224,5 @@ extern char         *_cupsSaveLocale(int category, const char *locale);
 #endif /* !_CUPS_LANGUAGE_H_ */
 
 /*
- * End of "$Id: language.h,v 1.32 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: language.h,v 1.33 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/mark.c b/cups/mark.c
index 53ae3145fb5911f0d0051ff7ef1d1123dfc4a909..0613bc0308e5ba47e98a48f2c71211c097c85047 100644 (file)
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c,v 1.28 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: mark.c,v 1.29 2004/06/29 03:44:52 mike Exp $"
  *
  *   Option marking routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -439,5 +439,5 @@ ppd_defaults(ppd_file_t  *ppd,      /* I - PPD file */
 
 
 /*
- * End of "$Id: mark.c,v 1.28 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: mark.c,v 1.29 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index e366d4e0d5e6de644005be272a4283a1d975b806..d9eea6f85c939dd41cb6cfb3fc2b29906d3af9b3 100644 (file)
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: md5passwd.c,v 1.11 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: md5passwd.c,v 1.12 2004/06/29 03:44:52 mike Exp $"
  *
  *   MD5 password support for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -146,5 +146,5 @@ httpMD5String(const md5_byte_t *sum,        /* I - MD5 sum data */
 
 
 /*
- * End of "$Id: md5passwd.c,v 1.11 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: md5passwd.c,v 1.12 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/options.c b/cups/options.c
index 55159efb493b00129357467cd2f75c3ada35bb63..c537d9e398e44a462ee7f06f7498504855ed3859 100644 (file)
--- a/cups/options.c
+++ b/cups/options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: options.c,v 1.33 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: options.c,v 1.34 2004/06/29 03:44:52 mike Exp $"
  *
  *   Option routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -495,5 +495,5 @@ cupsMarkOptions(ppd_file_t    *ppd,         /* I - PPD file */
 
 
 /*
- * End of "$Id: options.c,v 1.33 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: options.c,v 1.34 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/page.c b/cups/page.c
index 275f7b7ce1c5665257a8fa921696612b10449fb4..6c380251eaa2b78e936b53fd78826ea4c2b91028 100644 (file)
--- a/cups/page.c
+++ b/cups/page.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: page.c,v 1.16 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: page.c,v 1.17 2004/06/29 03:44:52 mike Exp $"
  *
  *   Page size functions for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -187,5 +187,5 @@ ppdPageLength(ppd_file_t *ppd,      /* I - PPD file */
 
 
 /*
- * End of "$Id: page.c,v 1.16 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: page.c,v 1.17 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/ppd.c b/cups/ppd.c
index e2cce1916253b1f524d5490036d1afb106950deb..06b12c1897f88c88572537319379d18f572199be 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c,v 1.117 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: ppd.c,v 1.118 2004/06/29 03:44:52 mike Exp $"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -2655,5 +2655,5 @@ ppd_read(FILE *fp,                        /* I - File to read from */
 
 
 /*
- * End of "$Id: ppd.c,v 1.117 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: ppd.c,v 1.118 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/ppd.h b/cups/ppd.h
index e6f923ef53d1cd9f8ab4ef039d55a3c10a0f8f27..5d487e680d79378b3420eb00bc4fd7cdeb02afb6 100644 (file)
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.h,v 1.37 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: ppd.h,v 1.38 2004/06/29 03:44:52 mike Exp $"
  *
  *   PostScript Printer Description definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -16,9 +16,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -334,5 +334,5 @@ extern void         ppdSetConformance(ppd_conform_t c);
 #endif /* !_CUPS_PPD_H_ */
 
 /*
- * End of "$Id: ppd.h,v 1.37 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: ppd.h,v 1.38 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/snprintf.c b/cups/snprintf.c
index b2cf0e6668ee9e95c908029dffe72d06824048be..066532b95fd974ae543cf163e866adea87aa5391 100644 (file)
--- a/cups/snprintf.c
+++ b/cups/snprintf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snprintf.c,v 1.12 2004/04/11 17:06:22 mike Exp $"
+ * "$Id: snprintf.c,v 1.13 2004/06/29 03:44:52 mike Exp $"
  *
  *   snprintf functions for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -339,6 +339,6 @@ cups_snprintf(char       *buffer,   /* O - Output buffer */
 
 
 /*
- * End of "$Id: snprintf.c,v 1.12 2004/04/11 17:06:22 mike Exp $".
+ * End of "$Id: snprintf.c,v 1.13 2004/06/29 03:44:52 mike Exp $".
  */
 

diff --git a/cups/string.c b/cups/string.c
index 38bbf67633a9c19494d987ad9ba7a19cf4da745c..ed90729f96fed2e99c3a52f97cadb5138a816ab9 100644 (file)
--- a/cups/string.c
+++ b/cups/string.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: string.c,v 1.12 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: string.c,v 1.13 2004/06/29 03:44:52 mike Exp $"
  *
  *   String functions for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -222,5 +222,5 @@ cups_strlcpy(char       *dst,       /* O - Destination string */
 
 
 /*
- * End of "$Id: string.c,v 1.12 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: string.c,v 1.13 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/string.h b/cups/string.h
index db17a7853f84bcbdbfa4af6561aaaf0b52f2869a..b39479720a511b872997f5eda5498e6263c5ae1f 100644 (file)
--- a/cups/string.h
+++ b/cups/string.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: string.h,v 1.17 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: string.h,v 1.18 2004/06/29 03:44:52 mike Exp $"
  *
  *   String definitions for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -126,5 +126,5 @@ extern int  cups_vsnprintf(char *, size_t, const char *, va_list);
 #endif /* !_CUPS_STRING_H_ */
 
 /*
- * End of "$Id: string.h,v 1.17 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: string.h,v 1.18 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/tempfile.c b/cups/tempfile.c
index bbd26b41936e3a9f94d2a2facb5f16bb7d06d56f..a222f4cccb0a1fbe10592bfd223cf8b302ee02a8 100644 (file)
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tempfile.c,v 1.11 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: tempfile.c,v 1.12 2004/06/29 03:44:52 mike Exp $"
  *
  *   Temp file utilities for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -217,5 +217,5 @@ cupsTempFile(char *filename,                /* I - Pointer to buffer */
 
 
 /*
- * End of "$Id: tempfile.c,v 1.11 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: tempfile.c,v 1.12 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/testhttp.c b/cups/testhttp.c
index 616036bf8b9fe1db752f2b4f1c8cd19e8204704a..f1247fd83ed52f4c376b6ca4f3d8007c14938504 100644 (file)
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testhttp.c,v 1.16 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: testhttp.c,v 1.17 2004/06/29 03:44:52 mike Exp $"
  *
  *   HTTP test program for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -123,5 +123,5 @@ main(int  argc,                     /* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testhttp.c,v 1.16 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: testhttp.c,v 1.17 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/testipp.c b/cups/testipp.c
index 5625bea21886fd2962ea85d5353ed137d47b7a2a..301e5ee68fe00a2725c27f6c3ae1decc5d4b0b52 100644 (file)
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testipp.c,v 1.6 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: testipp.c,v 1.7 2004/06/29 03:44:52 mike Exp $"
  *
  *   IPP test program for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -517,5 +517,5 @@ write_cb(void        *data,         /* I - Data */
 
 
 /*
- * End of "$Id: testipp.c,v 1.6 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: testipp.c,v 1.7 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/testlang.c b/cups/testlang.c
index db9bf99527f858837e440c183727050f761b7118..160c8593f22f0f21ab0d92d7338f01f803b635ef 100644 (file)
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testlang.c,v 1.5 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: testlang.c,v 1.6 2004/06/29 03:44:52 mike Exp $"
  *
  *   HTTP test program for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -102,5 +102,5 @@ main(int  argc,                             /* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testlang.c,v 1.5 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: testlang.c,v 1.6 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/usersys.c b/cups/usersys.c
index 0721934055a63e3a1202b15690902c9d273dea81..52d1025dc2aa8ba92baf011d8a1ee26ecdebd29f 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usersys.c,v 1.23 2004/02/25 20:14:51 mike Exp $"
+ * "$Id: usersys.c,v 1.24 2004/06/29 03:44:52 mike Exp $"
  *
  *   User, system, and password routines for the Common UNIX Printing
  *   System (CUPS).
@@ -16,9 +16,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -456,5 +456,5 @@ cups_get_line(char *buf,    /* I - Line buffer */
 
 
 /*
- * End of "$Id: usersys.c,v 1.23 2004/02/25 20:14:51 mike Exp $".
+ * End of "$Id: usersys.c,v 1.24 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/cups/util.c b/cups/util.c
index d96e6dfc9d333d36a4bee1f793ff7d40a8977697..deb997ba0842f843ad064cdafad8a3cded52a33a 100644 (file)
--- a/cups/util.c
+++ b/cups/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c,v 1.119 2004/06/29 01:02:45 mike Exp $"
+ * "$Id: util.c,v 1.120 2004/06/29 03:44:52 mike Exp $"
  *
  *   Printing utilities for the Common UNIX Printing System (CUPS).
  *
@@ -15,9 +15,9 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636-3142 USA
  *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  *
@@ -1703,5 +1703,5 @@ cups_connect(const char *name,            /* I - Destination (printer[@host]) */
 
 
 /*
- * End of "$Id: util.c,v 1.119 2004/06/29 01:02:45 mike Exp $".
+ * End of "$Id: util.c,v 1.120 2004/06/29 03:44:52 mike Exp $".
  */

diff --git a/data/Makefile b/data/Makefile
index a6eafa46b16338ebbd1801a7568753e79a1c5166..679cf390b2e9f0ecb2380a1bd3e6adc94b2dc532 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile,v 1.22 2003/01/15 20:41:37 mike Exp $"
+# "$Id: Makefile,v 1.23 2004/06/29 03:44:52 mike Exp $"
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2003 by Easy Software Products.
+#   Copyright 1993-2004 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -99,5 +99,5 @@ install:
 
 
 #
-# End of "$Id: Makefile,v 1.22 2003/01/15 20:41:37 mike Exp $".
+# End of "$Id: Makefile,v 1.23 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/doc/Makefile b/doc/Makefile
index 8a8f31bdc6ed6a3cc01012ecfb10c5e411f06919..a60ac77c0653db8e2b812b7a20c9b04ffb8dace8 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.52 2004/06/29 03:14:19 mike Exp $"
+# "$Id: Makefile,v 1.53 2004/06/29 03:44:52 mike Exp $"
 #
 #   Documentation makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,7 +15,7 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
 #       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org

diff --git a/filter/Makefile b/filter/Makefile
index 61e2afffd9c6c05ae8524c52a192f06b4cb8b166..47dc40878af22ffdeb12be37b3183c4f65d67831 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.76 2004/04/05 16:18:52 mike Exp $"
+# "$Id: Makefile,v 1.77 2004/06/29 03:44:52 mike Exp $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -46,7 +46,7 @@ OBJS  =       $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
 # Make all targets...
 #
 
-all:   $(TARGETS) libcupsimage.a
+all:   $(TARGETS) $(LIBCUPSIMAGE) libcupsimage.a
 
 
 #
@@ -88,8 +88,8 @@ install:      all installhdrs
        fi
        -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
                $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
+               $(RANLIB) $(LIBDIR)/libcupsimage.a; \
        fi
-       $(RANLIB) $(LIBDIR)/libcupsimage.a
 
 installhdrs:
        $(INSTALL_DIR) $(INCLUDEDIR)/cups
@@ -269,5 +269,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.76 2004/04/05 16:18:52 mike Exp $".
+# End of "$Id: Makefile,v 1.77 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/fonts/Makefile b/fonts/Makefile
index 7b76c95aeea080ec421ae2c4c5795a851d9f9c60..7e420533b25e84e4221c513e61cef57003925d4c 100644 (file)
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -3,7 +3,7 @@
 #
 #   Fonts makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2003 by Easy Software Products.
+#   Copyright 1993-2004 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #

diff --git a/locale/Makefile b/locale/Makefile
index e122b6f647dbfc334e1a69566a60d9be4b512f0c..4469477cd2faf5f201e7fa592b476103c5614a4f 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.16 2004/02/25 20:14:52 mike Exp $"
+# "$Id: Makefile,v 1.17 2004/06/29 03:44:52 mike Exp $"
 #
 #   Locale file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -72,5 +72,5 @@ translate.o:  ../cups/http.h
 
 
 #
-# End of "$Id: Makefile,v 1.16 2004/02/25 20:14:52 mike Exp $".
+# End of "$Id: Makefile,v 1.17 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/man/Makefile b/man/Makefile
index 6e9568fa8b7078fe45f93773372a459f20732640..49f6bcee80ca3f6ab386c935656d5c46bb1aa20f 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile,v 1.25 2004/06/17 14:08:51 mike Exp $"
+# "$Id: Makefile,v 1.26 2004/06/29 03:44:52 mike Exp $"
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2003 by Easy Software Products.
+#   Copyright 1993-2004 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -117,5 +117,5 @@ install:    all
 
 
 #
-# End of "$Id: Makefile,v 1.25 2004/06/17 14:08:51 mike Exp $".
+# End of "$Id: Makefile,v 1.26 2004/06/29 03:44:52 mike Exp $".
 #

diff --git a/pdftops/Makefile b/pdftops/Makefile
index 0bec64d890f001a26b79e261b06710f638391e67..25e6d55c66ae4fd765ba3d335397b93bccb3feca 100644 (file)
--- a/pdftops/Makefile
+++ b/pdftops/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile,v 1.19 2003/05/14 20:03:03 mike Exp $"
+# "$Id: Makefile,v 1.20 2004/06/29 03:44:53 mike Exp $"
 #
 #   pdftops filter Makefile for the Common UNIX Printing System (CUPS).
 #
-#   CUPS filter changes Copyright 1997-2003 by Easy Software Products.
+#   CUPS filter changes Copyright 1997-2004 by Easy Software Products.
 #   Xpdf code Copyright 1996-1999 by Derek B. Noonburg
 #
 
@@ -123,5 +123,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.19 2003/05/14 20:03:03 mike Exp $".
+# End of "$Id: Makefile,v 1.20 2004/06/29 03:44:53 mike Exp $".
 #

diff --git a/ppd/Makefile b/ppd/Makefile
index 5dcf9ed9f908de9535035ca83e86e6048e6dacbb..29df93d3669a898cd90089ec24a3ccf36d7cfbee 100644 (file)
--- a/ppd/Makefile
+++ b/ppd/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile,v 1.16 2004/05/11 20:13:30 mike Exp $"
+# "$Id: Makefile,v 1.17 2004/06/29 03:44:53 mike Exp $"
 #
 #   PPD file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2003 by Easy Software Products.
+#   Copyright 1993-2004 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -59,5 +59,5 @@ install:
 
 
 #
-# End of "$Id: Makefile,v 1.16 2004/05/11 20:13:30 mike Exp $".
+# End of "$Id: Makefile,v 1.17 2004/06/29 03:44:53 mike Exp $".
 #

diff --git a/scheduler/Makefile b/scheduler/Makefile
index e8af3457ae2dac3180321699350cbbb327f01776..21773143aa73aa20ceedc9387e57e89d921cb6b3 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.51 2004/02/25 20:14:53 mike Exp $"
+# "$Id: Makefile,v 1.52 2004/06/29 03:44:53 mike Exp $"
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -140,5 +140,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.51 2004/02/25 20:14:53 mike Exp $".
+# End of "$Id: Makefile,v 1.52 2004/06/29 03:44:53 mike Exp $".
 #

diff --git a/systemv/Makefile b/systemv/Makefile
index 4d507a5af280d7f3c55a22cb1725b31a7e6e0177..cfcc8a23ffcff70c6414e4f8ede2aaf959d219aa 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.37 2004/02/25 20:14:53 mike Exp $"
+# "$Id: Makefile,v 1.38 2004/06/29 03:44:53 mike Exp $"
 #
 #   System V commands makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -192,5 +192,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.37 2004/02/25 20:14:53 mike Exp $".
+# End of "$Id: Makefile,v 1.38 2004/06/29 03:44:53 mike Exp $".
 #

diff --git a/test/Makefile b/test/Makefile
index 1461b97d64d7086c2a5dda4d39bfa43415c7ff35..71888eb12acf38baa9b5dc41371acb7307333e81 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.8 2004/02/25 20:14:54 mike Exp $"
+# "$Id: Makefile,v 1.9 2004/06/29 03:44:53 mike Exp $"
 #
 #   IPP test makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
-#       Voice: (301) 373-9603
+#       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -81,5 +81,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.8 2004/02/25 20:14:54 mike Exp $".
+# End of "$Id: Makefile,v 1.9 2004/06/29 03:44:53 mike Exp $".
 #