Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4214 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 5ce62f118f5ab56d97c282c8a6461a9418007c22..cdb1de09050ff0d3efc2de32cba0c59da36432eb 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,7 @@ CHANGES-1.1.txt
 
 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 bc00b4c8bb6a40309096b5cd0090c39a4d45fbe2..432bf1fdb65a19595781b57ab3bbd6d0e54b147e 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.25.2.8 2003/01/07 18:26:14 mike Exp $"
+# "$Id: Makefile,v 1.25.2.9 2004/06/29 03:46:29 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
 #
@@ -163,5 +163,5 @@ include Dependencies
 
   
 #
-# End of "$Id: Makefile,v 1.25.2.8 2003/01/07 18:26:14 mike Exp $".
+# End of "$Id: Makefile,v 1.25.2.9 2004/06/29 03:46:29 mike Exp $".
 #

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 14cbe28424a43c789e836f71a148a5e3e97a9ce3..4c311bb101719f5df4b0436c449631a4c73be718 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.13.2.4 2003/01/07 18:26:16 mike Exp $"
+# "$Id: Makefile,v 1.13.2.5 2004/06/29 03:46:29 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.13.2.4 2003/01/07 18:26:16 mike Exp $".
+# End of "$Id: Makefile,v 1.13.2.5 2004/06/29 03:46:29 mike Exp $".
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 8521f330deb0b5566df8a7ae9cb130a97d019aa8..3190f4b13d5791b3ecab4c46a83b9afbc7e82887 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.15.2.5 2003/01/07 18:26:18 mike Exp $"
+# "$Id: Makefile,v 1.15.2.6 2004/06/29 03:46:29 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.15.2.5 2003/01/07 18:26:18 mike Exp $".
+# End of "$Id: Makefile,v 1.15.2.6 2004/06/29 03:46:29 mike Exp $".
 #

diff --git a/conf/Makefile b/conf/Makefile
index ff77ad7e402fd9bf22fec9af92b2a5e195ef0ebe..2811a26936e846d2e3a7b2f0545f44cd5f70a924 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.10.2.5 2004/02/26 16:59:02 mike Exp $"
+# "$Id: Makefile,v 1.10.2.6 2004/06/29 03:46:29 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.10.2.5 2004/02/26 16:59:02 mike Exp $".
+# End of "$Id: Makefile,v 1.10.2.6 2004/06/29 03:46:29 mike Exp $".
 #

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index f061eed2953e8aca98b3cdb6c743efe91dc298f1..0fca70cef7560c8e3004dda606ec665c7b6a1717 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.12.2.20 2004/06/29 02:45:24 mike Exp $"
+dnl "$Id: cups-common.m4,v 1.12.2.21 2004/06/29 03:46:29 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
@@ -213,5 +213,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4,v 1.12.2.20 2004/06/29 02:45:24 mike Exp $".
+dnl End of "$Id: cups-common.m4,v 1.12.2.21 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index cd2fc457b643b97229714553fd0eb18d45eefd9c..690ac6b57e1a3eaade92d79b22e2e114482f43e0 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.9.2.17 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-compiler.m4,v 1.9.2.18 2004/06/29 03:46:29 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.9.2.17 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-compiler.m4,v 1.9.2.18 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index 40dbae44163306ea43a51c8abbc820fdba439933..99e59fb99f917125c7039206b874b5323afb0d91 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.5.2.7 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-directories.m4,v 1.5.2.8 2004/06/29 03:46:29 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.5.2.7 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-directories.m4,v 1.5.2.8 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-image.m4 b/config-scripts/cups-image.m4
index f8edcd77c8e60aff3d3f2e7c39b636e37fecb4d2..a8bea466aef1e2cb8bcc6f2e1a1138698ffb1e0c 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.2.2.4 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-image.m4,v 1.2.2.5 2004/06/29 03:46:29 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.2.2.4 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-image.m4,v 1.2.2.5 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index 7d441e6aa7814c51a98da60b80d1917c64db1b29..e417abb417edfd616fa847b60b34bb324ac1b836 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.2.2.5 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-libtool.m4,v 1.2.2.6 2004/06/29 03:46:29 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.2.2.5 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-libtool.m4,v 1.2.2.6 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 6023c83cf4498a4aa7c16995683715efcf883b18..21b74049d577a4de5797a069b1fdeccb00aaf229 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.5.2.4 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-manpages.m4,v 1.5.2.5 2004/06/29 03:46:29 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.5.2.4 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-manpages.m4,v 1.5.2.5 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index ddf18df984e3bfe24d59d6a5eb275287462801ec..2a17c434f8039cb0c28ecd33b2569b2786093ae3 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.1.2.11 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-network.m4,v 1.1.2.12 2004/06/29 03:46:29 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.1.2.11 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-network.m4,v 1.1.2.12 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-openslp.m4 b/config-scripts/cups-openslp.m4
index d0df5b3eee0c35e5a107377a0d60734549c2f8b6..4b431025d94f6f80f9905814de4c86b77772e396 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.2.2.7 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-openslp.m4,v 1.2.2.8 2004/06/29 03:46:29 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.2.2.7 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-openslp.m4,v 1.2.2.8 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-openssl.m4 b/config-scripts/cups-openssl.m4
index 6eca771417151ab56639256c42964481c1ea9935..9a6c52a560b6a197f4b5b4a64404472bc339359e 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.4.2.11 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-openssl.m4,v 1.4.2.12 2004/06/29 03:46:29 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.4.2.11 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-openssl.m4,v 1.4.2.12 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index 8bafe1a383586a0a906a3dca0f24b22fc628f2e8..052ef052ad02fa4a6fd92920ae4a2535fcbe65c3 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.5.2.7 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-opsys.m4,v 1.5.2.8 2004/06/29 03:46:29 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.5.2.7 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-opsys.m4,v 1.5.2.8 2004/06/29 03:46:29 mike Exp $"
 dnl

diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index 18d40cfb133f5ce79838718daf8f243e28a77aac..83c2022956da48e29bf4cfbeb8b55e2f8517a60b 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.2.2.8 2004/05/27 15:37:47 mike Exp $"
+dnl "$Id: cups-pam.m4,v 1.2.2.9 2004/06/29 03:46:29 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.2.2.8 2004/05/27 15:37:47 mike Exp $".
+dnl End of "$Id: cups-pam.m4,v 1.2.2.9 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index 3ffdfec61155188a01e15e56eba6a1e8bf3fca45..93f7c37f42c9cf3366b5124fbe0bf64c4fc4cd39 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.1.2.2 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-scripting.m4,v 1.1.2.3 2004/06/29 03:46:29 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.1.2.2 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-scripting.m4,v 1.1.2.3 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 55bdd34b64f4fb889ea5d0e6b89758333234292b..4f40dcc8271da96f9bf5ff08534c80b8b1c3e987 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.6.2.17 2004/02/26 16:59:02 mike Exp $"
+dnl "$Id: cups-sharedlibs.m4,v 1.6.2.18 2004/06/29 03:46:29 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.6.2.17 2004/02/26 16:59:02 mike Exp $".
+dnl End of "$Id: cups-sharedlibs.m4,v 1.6.2.18 2004/06/29 03:46:29 mike Exp $".
 dnl

diff --git a/cups/Makefile b/cups/Makefile
index 9278931cc6b2b23b6100116a5a8e63a388bd3a19..a640f6677a635cb5196b1108b694a77fd7f1dac6 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.53.2.27 2004/01/08 03:07:36 mike Exp $"
+# "$Id: Makefile,v 1.53.2.28 2004/06/29 03:46:29 mike Exp $"
 #
 #   API 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
 #
@@ -95,8 +95,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
@@ -124,7 +124,7 @@ libcups.2.dylib:    $(LIBOBJS)
        echo Linking $@...
        $(DSO) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/libcups.dylib \
-               -current_version 2.6.0 \
+               -current_version 2.7.0 \
                -compatibility_version 2.0.0 \
                $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
        $(RM) libcups.dylib
@@ -150,8 +150,8 @@ libcups_s.a:        $(LIBOBJS)
 
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-               -version-info 2:5 $(SSLLIBS) $(COMMONLIBS)
+       $(CC) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+               -version-info 2:7 $(SSLLIBS) $(COMMONLIBS)
 
 
 #
@@ -233,5 +233,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.53.2.27 2004/01/08 03:07:36 mike Exp $".
+# End of "$Id: Makefile,v 1.53.2.28 2004/06/29 03:46:29 mike Exp $".
 #

diff --git a/cups/attr.c b/cups/attr.c
index f9ed670eb0c14719086b036cc48e943106fa1a68..9ad5c4bb775d489942a530ea323762cc1969540c 100644 (file)
--- a/cups/attr.c
+++ b/cups/attr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: attr.c,v 1.1.2.4 2003/02/28 21:07:32 mike Exp $"
+ * "$Id: attr.c,v 1.1.2.5 2004/06/29 03:46:29 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.1.2.4 2003/02/28 21:07:32 mike Exp $".
+ * End of "$Id: attr.c,v 1.1.2.5 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/auth.c b/cups/auth.c
index ac5b0c710e47c857a76ebb421ad7f502b621129d..25692baf50be87ea69cf7ecb9cf0a8db89590109 100644 (file)
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c,v 1.1.2.7 2004/06/29 01:04:30 mike Exp $"
+ * "$Id: auth.c,v 1.1.2.8 2004/06/29 03:46:29 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.1.2.7 2004/06/29 01:04:30 mike Exp $".
+ * End of "$Id: auth.c,v 1.1.2.8 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/cups.h b/cups/cups.h
index ba03b58c42feb47a952656019bc8f1539eac7903..515703a5f3d5d1d4fc6a284bec6a00d0585a12c8 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h,v 1.32.2.15 2004/06/29 01:04:30 mike Exp $"
+ * "$Id: cups.h,v 1.32.2.16 2004/06/29 03:46:29 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.32.2.15 2004/06/29 01:04:30 mike Exp $".
+ * End of "$Id: cups.h,v 1.32.2.16 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/debug.h b/cups/debug.h
index 57960a3bd7e8c9c7b1d73dcd51c3c73e7f96fefc..0e173b47fa092b8302b51bf3ddc711b0b62b3471 100644 (file)
--- a/cups/debug.h
+++ b/cups/debug.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: debug.h,v 1.4.2.4 2003/01/07 18:26:23 mike Exp $"
+ * "$Id: debug.h,v 1.4.2.5 2004/06/29 03:46:29 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 /* !_IPP_DEBUG_H_ */
 
 /*
- * End of "$Id: debug.h,v 1.4.2.4 2003/01/07 18:26:23 mike Exp $".
+ * End of "$Id: debug.h,v 1.4.2.5 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/dest.c b/cups/dest.c
index 0dadb78eec7414713b3ae1ec30d58aea1d2f25ab..8ab899c65a530781231f159f80bb9f3d8fd80a59 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest.c,v 1.18.2.16 2004/06/29 01:04:30 mike Exp $"
+ * "$Id: dest.c,v 1.18.2.17 2004/06/29 03:46:29 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.18.2.16 2004/06/29 01:04:30 mike Exp $".
+ * End of "$Id: dest.c,v 1.18.2.17 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/emit.c b/cups/emit.c
index 8f19cb9ad1fc1223566c5b2ce9b211e4d68fb0a3..cff22b69a278ef510ef3630436a74d202032fc06 100644 (file)
--- a/cups/emit.c
+++ b/cups/emit.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: emit.c,v 1.23.2.13 2004/02/03 04:08:18 mike Exp $"
+ * "$Id: emit.c,v 1.23.2.14 2004/06/29 03:46:29 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
  *
@@ -719,5 +719,5 @@ ppd_sort(ppd_choice_t **c1, /* I - First choice */
 
 
 /*
- * End of "$Id: emit.c,v 1.23.2.13 2004/02/03 04:08:18 mike Exp $".
+ * End of "$Id: emit.c,v 1.23.2.14 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/encode.c b/cups/encode.c
index fa908bd06450052ca40e2dab5a00177a71f85d40..882ff86e7485579ccbdf670f0fafa992ba535203 100644 (file)
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: encode.c,v 1.1.2.14 2003/08/08 20:49:24 mike Exp $"
+ * "$Id: encode.c,v 1.1.2.15 2004/06/29 03:46:29 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.1.2.14 2003/08/08 20:49:24 mike Exp $".
+ * End of "$Id: encode.c,v 1.1.2.15 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/getputfile.c b/cups/getputfile.c
index d530012faa2c411092a820df77f7eb6dddc0b0f4..83a09f07295e76919c01cc0f0589160f48720363 100644 (file)
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: getputfile.c,v 1.1.2.4 2004/02/05 20:54:44 mike Exp $"
+ * "$Id: getputfile.c,v 1.1.2.5 2004/06/29 03:46:29 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.1.2.4 2004/02/05 20:54:44 mike Exp $".
+ * End of "$Id: getputfile.c,v 1.1.2.5 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/http-addr.c b/cups/http-addr.c
index 537a885928ac93d3b03b4b72bfc703152a627a6b..1658b8b249c5370ebf3704f62cf3d4236bf1c301 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-addr.c,v 1.1.2.13 2004/03/19 11:55:52 mike Exp $"
+ * "$Id: http-addr.c,v 1.1.2.14 2004/06/29 03:46:29 mike Exp $"
  *
  *   HTTP 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
  *
@@ -303,5 +303,5 @@ httpGetHostByName(const char *name) /* I - Hostname or IP address */
 
 
 /*
- * End of "$Id: http-addr.c,v 1.1.2.13 2004/03/19 11:55:52 mike Exp $".
+ * End of "$Id: http-addr.c,v 1.1.2.14 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/http-private.h b/cups/http-private.h
index a0c0781384eeaea8ffb2d1a5c71ce9f9bde24c78..acdcc943a00a9cb2cb432be225b822a82ceec04e 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h,v 1.1.2.5 2003/11/24 15:39:04 mike Exp $"
+ * "$Id: http-private.h,v 1.1.2.6 2004/06/29 03:46:29 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.1.2.5 2003/11/24 15:39:04 mike Exp $".
+ * End of "$Id: http-private.h,v 1.1.2.6 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/http-support.c b/cups/http-support.c
index f41a1fce07ea84f145d7f27a2f4a23a775ac8f14..b8ca6e4f2dee6f1647e3af840dcb93ba4056636b 100644 (file)
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-support.c,v 1.1.2.6 2004/02/25 16:58:32 mike Exp $"
+ * "$Id: http-support.c,v 1.1.2.7 2004/06/29 03:46:29 mike Exp $"
  *
  *   HTTP support routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -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.1.2.6 2004/02/25 16:58:32 mike Exp $".
+ * End of "$Id: http-support.c,v 1.1.2.7 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/http.c b/cups/http.c
index 96f16ab91af71a207d694243cea5b66e16deb970..981b684c5b4e074ea32c3fcfb6a8c1e4c409fd9e 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c,v 1.82.2.50 2004/06/29 01:04:30 mike Exp $"
+ * "$Id: http.c,v 1.82.2.51 2004/06/29 03:46:29 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.82.2.50 2004/06/29 01:04:30 mike Exp $".
+ * End of "$Id: http.c,v 1.82.2.51 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/http.h b/cups/http.h
index 466110905d7699f970cb9ecf94865abdd0a9afea..49654115cc4d1efd5e26f43591f7794cd8b922bc 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.h,v 1.33.2.20 2003/08/29 23:58:38 mike Exp $"
+ * "$Id: http.h,v 1.33.2.21 2004/06/29 03:46:29 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
  *
@@ -416,5 +416,5 @@ extern char         *httpAddrString(const http_addr_t *addr,
 #endif /* !_IPP_HTTP_H_ */
 
 /*
- * End of "$Id: http.h,v 1.33.2.20 2003/08/29 23:58:38 mike Exp $".
+ * End of "$Id: http.h,v 1.33.2.21 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index fc1e9b529ffb18b318cc30b3f84617f2e01c02f0..38b7b4ab3003fcc97ba9f57cb4fa3c0e0ed445a2 100644 (file)
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-support.c,v 1.2.2.3 2003/01/24 20:45:12 mike Exp $"
+ * "$Id: ipp-support.c,v 1.2.2.4 2004/06/29 03:46:29 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.2.2.3 2003/01/24 20:45:12 mike Exp $".
+ * End of "$Id: ipp-support.c,v 1.2.2.4 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/ipp.c b/cups/ipp.c
index 25e9dfb515febe99e2371d2abe675cde3561732b..19ebf805a99f34cd34ecb5b453f0b94362be3a5e 100644 (file)
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c,v 1.55.2.39 2004/02/25 16:58:32 mike Exp $"
+ * "$Id: ipp.c,v 1.55.2.40 2004/06/29 03:46:29 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
  *
@@ -2553,5 +2553,5 @@ ipp_write_file(int         *fd,                   /* I - File descriptor */
 
 
 /*
- * End of "$Id: ipp.c,v 1.55.2.39 2004/02/25 16:58:32 mike Exp $".
+ * End of "$Id: ipp.c,v 1.55.2.40 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/ipp.h b/cups/ipp.h
index 0f96c482d38a7750c00db99967ff3ddb89e9e649..483037c0c2515f7ffccf78b6826bdc42e66490b9 100644 (file)
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.h,v 1.36.2.15 2003/03/14 22:14:33 mike Exp $"
+ * "$Id: ipp.h,v 1.36.2.16 2004/06/29 03:46:29 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.36.2.15 2003/03/14 22:14:33 mike Exp $".
+ * End of "$Id: ipp.h,v 1.36.2.16 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/language.c b/cups/language.c
index 958a53a8717e3747cee3d571b73f4d5d6cfc86d9..7edfbe2888a9c8831dc504189064718ab30837e4 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c,v 1.20.2.29 2004/02/25 16:58:32 mike Exp $"
+ * "$Id: language.c,v 1.20.2.30 2004/06/29 03:46:29 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
  *
@@ -995,5 +995,5 @@ cups_cache_lookup(const char      *name,/* I - Name of locale */
 
 
 /*
- * End of "$Id: language.c,v 1.20.2.29 2004/02/25 16:58:32 mike Exp $".
+ * End of "$Id: language.c,v 1.20.2.30 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/language.h b/cups/language.h
index 99f5ca1dbefd35623c4b425046dd523ca77851ee..9fe442f7e9e7a0da9299f94127faa74e0248d3ee 100644 (file)
--- a/cups/language.h
+++ b/cups/language.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.h,v 1.18.2.17 2003/10/31 23:10:56 mike Exp $"
+ * "$Id: language.h,v 1.18.2.18 2004/06/29 03:46:29 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
  *
@@ -295,5 +295,5 @@ extern char         *_cupsSaveLocale(int category, const char *locale);
 #endif /* !_CUPS_LANGUAGE_H_ */
 
 /*
- * End of "$Id: language.h,v 1.18.2.17 2003/10/31 23:10:56 mike Exp $".
+ * End of "$Id: language.h,v 1.18.2.18 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/mark.c b/cups/mark.c
index 50b6a4211e195611b6d09f32ca7720a65b663157..4b875a25a8405a3a61bd448c664ebace000bc4f4 100644 (file)
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c,v 1.24.2.5 2003/01/07 18:26:27 mike Exp $"
+ * "$Id: mark.c,v 1.24.2.6 2004/06/29 03:46:29 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.24.2.5 2003/01/07 18:26:27 mike Exp $".
+ * End of "$Id: mark.c,v 1.24.2.6 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index 82896bb986fb079df54d0712595d9abeb82a008c..57520e52798904a308e745b41be8e032a7bb5adb 100644 (file)
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: md5passwd.c,v 1.5.2.7 2003/01/24 20:45:14 mike Exp $"
+ * "$Id: md5passwd.c,v 1.5.2.8 2004/06/29 03:46:29 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.5.2.7 2003/01/24 20:45:14 mike Exp $".
+ * End of "$Id: md5passwd.c,v 1.5.2.8 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/options.c b/cups/options.c
index dc02f093c98c526ca9a16d186e95e3b4b6afe42f..641a6890f53281bfc85e4099eb8d2eb50d0a08c1 100644 (file)
--- a/cups/options.c
+++ b/cups/options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: options.c,v 1.21.2.11 2004/02/25 16:58:32 mike Exp $"
+ * "$Id: options.c,v 1.21.2.12 2004/06/29 03:46:29 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.21.2.11 2004/02/25 16:58:32 mike Exp $".
+ * End of "$Id: options.c,v 1.21.2.12 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/page.c b/cups/page.c
index 1e30bc1a2abbd2980c496a879a252d710774b68f..9aa5b4feb210ef73ac2161f1aa8e4bd2eb19bb05 100644 (file)
--- a/cups/page.c
+++ b/cups/page.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: page.c,v 1.12.2.3 2003/01/07 18:26:28 mike Exp $"
+ * "$Id: page.c,v 1.12.2.4 2004/06/29 03:46:29 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.12.2.3 2003/01/07 18:26:28 mike Exp $".
+ * End of "$Id: page.c,v 1.12.2.4 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/ppd.c b/cups/ppd.c
index 6e769c2fe4aa28f04d93f0de0997d3ac9ca19944..ef2b0c718d5a722cde602097e0e45063fed8c588 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c,v 1.51.2.63 2004/02/25 16:58:32 mike Exp $"
+ * "$Id: ppd.c,v 1.51.2.64 2004/06/29 03:46:29 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
  *
@@ -3025,5 +3025,5 @@ ppd_read(FILE *fp,                        /* I - File to read from */
 
 
 /*
- * End of "$Id: ppd.c,v 1.51.2.63 2004/02/25 16:58:32 mike Exp $".
+ * End of "$Id: ppd.c,v 1.51.2.64 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/ppd.h b/cups/ppd.h
index c45e55e79c221a648e144a13104e6430088c1b33..f1b6a7dd6a0477cb89ea92be657d4dfa494a03cb 100644 (file)
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.h,v 1.24.2.19 2004/01/08 03:07:36 mike Exp $"
+ * "$Id: ppd.h,v 1.24.2.20 2004/06/29 03:46:29 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
  *
@@ -433,5 +433,5 @@ extern int          ppdSaveFile(ppd_file_t *ppd, const char *filename);
 #endif /* !_CUPS_PPD_H_ */
 
 /*
- * End of "$Id: ppd.h,v 1.24.2.19 2004/01/08 03:07:36 mike Exp $".
+ * End of "$Id: ppd.h,v 1.24.2.20 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/snprintf.c b/cups/snprintf.c
index c4dba0e7dde638f072b9f995ab456d0db3d1ef12..d35b128cdbd78e28c3c0edc2e90efd4b645a711d 100644 (file)
--- a/cups/snprintf.c
+++ b/cups/snprintf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snprintf.c,v 1.4.2.8 2004/02/25 16:58:32 mike Exp $"
+ * "$Id: snprintf.c,v 1.4.2.9 2004/06/29 03:46:29 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
  *
@@ -301,6 +301,6 @@ cups_snprintf(char       *buffer,   /* O - Output buffer */
 
 
 /*
- * End of "$Id: snprintf.c,v 1.4.2.8 2004/02/25 16:58:32 mike Exp $".
+ * End of "$Id: snprintf.c,v 1.4.2.9 2004/06/29 03:46:29 mike Exp $".
  */
 

diff --git a/cups/string.c b/cups/string.c
index 98b03cb3cf8141162200ebb73641e6b12afe752f..186499b028c536e39fa6d1add4478d35e06ede43 100644 (file)
--- a/cups/string.c
+++ b/cups/string.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: string.c,v 1.5.2.9 2004/02/25 16:58:32 mike Exp $"
+ * "$Id: string.c,v 1.5.2.10 2004/06/29 03:46:29 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.5.2.9 2004/02/25 16:58:32 mike Exp $".
+ * End of "$Id: string.c,v 1.5.2.10 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/string.h b/cups/string.h
index ce01fecccc87ff44f28a9eb9a6f0fab556b69312..aa5aa4447a88344b9ccbb9a133714091993af054 100644 (file)
--- a/cups/string.h
+++ b/cups/string.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: string.h,v 1.7.2.11 2003/07/20 12:51:43 mike Exp $"
+ * "$Id: string.h,v 1.7.2.12 2004/06/29 03:46:29 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.7.2.11 2003/07/20 12:51:43 mike Exp $".
+ * End of "$Id: string.h,v 1.7.2.12 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/tempfile.c b/cups/tempfile.c
index d58e899c338ebd935bb4207c77d9aaff13c6cadf..39e379cd1fbb35cd98ff5bc259a3d9173ea306b2 100644 (file)
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tempfile.c,v 1.1.2.9 2003/01/24 20:45:14 mike Exp $"
+ * "$Id: tempfile.c,v 1.1.2.10 2004/06/29 03:46:29 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.1.2.9 2003/01/24 20:45:14 mike Exp $".
+ * End of "$Id: tempfile.c,v 1.1.2.10 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/testhttp.c b/cups/testhttp.c
index 808553f0189c5e8582f0ab6f7071ab6430731ec3..4bcaf3c1047d19e08b90b2e90eafdc643f032302 100644 (file)
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testhttp.c,v 1.11.2.6 2003/03/13 05:45:30 mike Exp $"
+ * "$Id: testhttp.c,v 1.11.2.7 2004/06/29 03:46:29 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.11.2.6 2003/03/13 05:45:30 mike Exp $".
+ * End of "$Id: testhttp.c,v 1.11.2.7 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/testipp.c b/cups/testipp.c
index 75bfa3b1cb49c99fb13384063e8594c9563fd1a5..e631940fd1a5a07078a6baace26c334cd553a476 100644 (file)
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testipp.c,v 1.1.2.5 2003/04/14 18:33:41 mike Exp $"
+ * "$Id: testipp.c,v 1.1.2.6 2004/06/29 03:46:29 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.1.2.5 2003/04/14 18:33:41 mike Exp $".
+ * End of "$Id: testipp.c,v 1.1.2.6 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/testlang.c b/cups/testlang.c
index d4820bb4a1faa4c4147a1bd7fcc006f3ebc70909..20a050015809b8e63b08c784c6ce1d1e92b93663 100644 (file)
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testlang.c,v 1.1.2.4 2003/10/30 15:45:29 mike Exp $"
+ * "$Id: testlang.c,v 1.1.2.5 2004/06/29 03:46:29 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.1.2.4 2003/10/30 15:45:29 mike Exp $".
+ * End of "$Id: testlang.c,v 1.1.2.5 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/usersys.c b/cups/usersys.c
index fe2f9592079b55b691cf9cdbaecbd030e0ebc748..a02fd0e7a9684b2ea96d2f0e66c902f9036f150e 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usersys.c,v 1.14.2.8 2004/02/25 16:58:32 mike Exp $"
+ * "$Id: usersys.c,v 1.14.2.9 2004/06/29 03:46:29 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.14.2.8 2004/02/25 16:58:32 mike Exp $".
+ * End of "$Id: usersys.c,v 1.14.2.9 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/cups/util.c b/cups/util.c
index 9eceef9c696bfe3916be2acf76adedfa735bd491..c53f637bfc35056be152397854db777e70d8ab0f 100644 (file)
--- a/cups/util.c
+++ b/cups/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c,v 1.81.2.34 2004/06/29 01:04:30 mike Exp $"
+ * "$Id: util.c,v 1.81.2.35 2004/06/29 03:46:29 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.81.2.34 2004/06/29 01:04:30 mike Exp $".
+ * End of "$Id: util.c,v 1.81.2.35 2004/06/29 03:46:29 mike Exp $".
  */

diff --git a/data/Makefile b/data/Makefile
index db73d7457c4e251509419259f85d31128334252f..40d61aafbaf9b33b0650de8db8ffda6ad672af6e 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile,v 1.12.2.7 2003/01/07 18:26:32 mike Exp $"
+# "$Id: Makefile,v 1.12.2.8 2004/06/29 03:46:29 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
 #
@@ -156,5 +156,5 @@ install:
 
 
 #
-# End of "$Id: Makefile,v 1.12.2.7 2003/01/07 18:26:32 mike Exp $".
+# End of "$Id: Makefile,v 1.12.2.8 2004/06/29 03:46:29 mike Exp $".
 #

diff --git a/doc/Makefile b/doc/Makefile
index 9244a4e563f546b2194d6b541bfd4c07be797355..60e13c8ca8978fb45cd436897e52cd4e51ccf052 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.33.2.7 2004/02/26 16:36:14 mike Exp $"
+# "$Id: Makefile,v 1.33.2.8 2004/06/29 03:46:30 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 b745c9145ef2f05010b230f90ee08198bef0c736..c68af5b501c3967703a8ec3f1cf2aed54e302e80 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.41.2.27 2004/04/05 16:19:16 mike Exp $"
+# "$Id: Makefile,v 1.41.2.28 2004/06/29 03:46:30 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
 #
@@ -47,7 +47,7 @@ OBJS  =       $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
 # Make all targets...
 #
 
-all:   $(TARGETS) libcupsimage.a
+all:   $(TARGETS) $(LIBCUPSIMAGE) libcupsimage.a
 
 
 #
@@ -89,8 +89,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
@@ -288,5 +288,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.41.2.27 2004/04/05 16:19:16 mike Exp $".
+# End of "$Id: Makefile,v 1.41.2.28 2004/06/29 03:46:30 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 1257e0ca85b9bb85e0d701581ade5f4c2e01fa2c..a04077119ae7720f7dbaeb0e1ef442b829c76b77 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.8.2.7 2003/04/18 13:37:37 mike Exp $"
+# "$Id: Makefile,v 1.8.2.8 2004/06/29 03:46:30 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.8.2.7 2003/04/18 13:37:37 mike Exp $".
+# End of "$Id: Makefile,v 1.8.2.8 2004/06/29 03:46:30 mike Exp $".
 #

diff --git a/man/Makefile b/man/Makefile
index ae6ef38e9acc0d4d6c11a5c4ddd1fa42781b4e5f..c17faab4e8dd960a765b8f8188c2dc1f4bcdb94f 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile,v 1.12.2.7 2004/06/17 14:09:00 mike Exp $"
+# "$Id: Makefile,v 1.12.2.8 2004/06/29 03:46:30 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.12.2.7 2004/06/17 14:09:00 mike Exp $".
+# End of "$Id: Makefile,v 1.12.2.8 2004/06/29 03:46:30 mike Exp $".
 #

diff --git a/pdftops/Makefile b/pdftops/Makefile
index 90def21ed7d140bf86e36cf290b8b8d3e7ad80cf..e9ff3ab627550affc6d8de634e08614a76ad5db5 100644 (file)
--- a/pdftops/Makefile
+++ b/pdftops/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile,v 1.6.2.11 2003/07/20 00:40:03 mike Exp $"
+# "$Id: Makefile,v 1.6.2.12 2004/06/29 03:46:30 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.6.2.11 2003/07/20 00:40:03 mike Exp $".
+# End of "$Id: Makefile,v 1.6.2.12 2004/06/29 03:46:30 mike Exp $".
 #

diff --git a/ppd/Makefile b/ppd/Makefile
index 3cd6c6f0af40bbede7b3904c0a97e36eda500589..d4dd7daf774e6e2053ad1f99668392ac5bfb049e 100644 (file)
--- a/ppd/Makefile
+++ b/ppd/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile,v 1.8.2.4 2003/01/07 18:27:13 mike Exp $"
+# "$Id: Makefile,v 1.8.2.5 2004/06/29 03:46:30 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.8.2.4 2003/01/07 18:27:13 mike Exp $".
+# End of "$Id: Makefile,v 1.8.2.5 2004/06/29 03:46:30 mike Exp $".
 #

diff --git a/scheduler/Makefile b/scheduler/Makefile
index c670543f72091f85407bba2f4f1a02c7694b916a..c1cca0aafc79b42561c1ecd27c7c2ce262434316 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.36.2.11 2003/04/10 16:12:48 mike Exp $"
+# "$Id: Makefile,v 1.36.2.12 2004/06/29 03:46:30 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.36.2.11 2003/04/10 16:12:48 mike Exp $".
+# End of "$Id: Makefile,v 1.36.2.12 2004/06/29 03:46:30 mike Exp $".
 #

diff --git a/systemv/Makefile b/systemv/Makefile
index c6e4612703396d25457b3e087151da07c058afc3..49898ad8544c0d2af546bf2eecc824dda6bb8ead 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.23.2.6 2003/01/07 18:27:28 mike Exp $"
+# "$Id: Makefile,v 1.23.2.7 2004/06/29 03:46:30 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
 #
@@ -191,5 +191,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.23.2.6 2003/01/07 18:27:28 mike Exp $".
+# End of "$Id: Makefile,v 1.23.2.7 2004/06/29 03:46:30 mike Exp $".
 #

diff --git a/test/Makefile b/test/Makefile
index 6d1b2fc2828d46680f5d04caeb8da29a644ddec1..08d7ffe9247b05591e798dbfb35dd7dbee63a77a 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.2.2.4 2003/01/07 18:27:33 mike Exp $"
+# "$Id: Makefile,v 1.2.2.5 2004/06/29 03:46:30 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
 #
@@ -68,5 +68,5 @@ purify:       ipptest.o ../cups/$(LIBCUPS)
 
 
 #
-# End of "$Id: Makefile,v 1.2.2.4 2003/01/07 18:27:33 mike Exp $".
+# End of "$Id: Makefile,v 1.2.2.5 2004/06/29 03:46:30 mike Exp $".
 #