Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@342 a1ca3aef-8c08-0410-bb20-df032aa958be

4 files changed, 28 insertions, 56 deletions

diff --git a/monitor/Dependencies b/monitor/Dependencies
index 251caa2e7..fed36ed6b 100644
--- a/monitor/Dependencies
+++ b/monitor/Dependencies
@@ -1,8 +1,7 @@
-# DO NOT DELETE
-
-bcp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-bcp.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-bcp.o: ../cups/language.h
-tbcp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-tbcp.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-tbcp.o: ../cups/language.h
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+bcp.o: bcp.c ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h \
+  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+  ../cups/language.h
+tbcp.o: tbcp.c ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h \
+  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+  ../cups/language.h
diff --git a/monitor/Makefile b/monitor/Makefile
index 085e9d889..1b3def600 100644
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -1,25 +1,16 @@
 #
-# "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
 #
 #   Port monitor makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 #   This file is subject to the Apple OS-Developed Software exception.
 #
@@ -109,5 +100,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
 #
diff --git a/monitor/bcp.c b/monitor/bcp.c
index 7b19e4b84..16054d90b 100644
--- a/monitor/bcp.c
+++ b/monitor/bcp.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: bcp.c 5087 2006-02-07 03:43:29Z mike $"
+ * "$Id: bcp.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   TBCP port monitor for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -282,5 +273,5 @@ pswrite(const char *buf,		/* I - Buffer to write */
 
 
 /*
- * End of "$Id: bcp.c 5087 2006-02-07 03:43:29Z mike $".
+ * End of "$Id: bcp.c 6649 2007-07-11 21:46:42Z mike $".
  */
diff --git a/monitor/tbcp.c b/monitor/tbcp.c
index 400e1ce0b..55039e4c2 100644
--- a/monitor/tbcp.c
+++ b/monitor/tbcp.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: tbcp.c 5087 2006-02-07 03:43:29Z mike $"
+ * "$Id: tbcp.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   TBCP port monitor for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -279,5 +270,5 @@ pswrite(const char *buf,		/* I - Buffer to write */
 
 
 /*
- * End of "$Id: tbcp.c 5087 2006-02-07 03:43:29Z mike $".
+ * End of "$Id: tbcp.c 6649 2007-07-11 21:46:42Z mike $".
  */