Load cups into easysw/current.

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

6 files changed, 14 insertions, 16 deletions

diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index 767d33e1c..d8db9344a 100644
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -2,15 +2,13 @@
 
 lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 lpc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lpc.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h ../cups/string.h
-lpc.o: ../config.h
+lpc.o: ../cups/i18n.h ../cups/debug.h ../cups/string.h ../config.h
 lpq.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
 lpq.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-lpq.o: ../cups/debug.h
+lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/debug.h
 lpr.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
 lpr.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
 lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
 lprm.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lprm.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+lprm.o: ../cups/i18n.h ../cups/string.h ../config.h
diff --git a/berkeley/Makefile b/berkeley/Makefile
index a7c87d59f..eb16d025c 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $"
+# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
@@ -121,5 +121,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $".
+# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
 #
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index 81353b09a..271d60477 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpc.c 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id: lpc.c 5023 2006-01-29 14:39:44Z mike $"
  *
  *   "lpc" command for the Common UNIX Printing System (CUPS).
  *
@@ -518,5 +518,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpc.c 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: lpc.c 5023 2006-01-29 14:39:44Z mike $".
  */
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index dbdcbab13..43f01c620 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpq.c 181 2006-06-22 20:01:18Z jlovell $"
+ * "$Id: lpq.c 5638 2006-06-06 20:08:13Z mike $"
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
@@ -675,5 +675,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpq.c 181 2006-06-22 20:01:18Z jlovell $".
+ * End of "$Id: lpq.c 5638 2006-06-06 20:08:13Z mike $".
  */
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index 36369f382..f6b5fb3b7 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpr.c 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id: lpr.c 5235 2006-03-06 13:02:23Z mike $"
  *
  *   "lpr" command for the Common UNIX Printing System (CUPS).
  *
@@ -529,5 +529,5 @@ sighandler(int s)			/* I - Signal number */
 
 
 /*
- * End of "$Id: lpr.c 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: lpr.c 5235 2006-03-06 13:02:23Z mike $".
  */
diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index 2abf68c16..67479b5a3 100644
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lprm.c 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id: lprm.c 5023 2006-01-29 14:39:44Z mike $"
  *
  *   "lprm" command for the Common UNIX Printing System (CUPS).
  *
@@ -283,5 +283,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: lprm.c 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: lprm.c 5023 2006-01-29 14:39:44Z mike $".
  */