Load cups into easysw/current.

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

5 files changed, 18 insertions, 16 deletions

diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index d8db9344a..767d33e1c 100644
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -2,13 +2,15 @@
 
 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/debug.h ../cups/string.h ../config.h
+lpc.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h ../cups/string.h
+lpc.o: ../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/debug.h
+lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lpq.o: ../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
+lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.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/string.h ../config.h
+lprm.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index c00a23a7a..96aca4b00 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpc.c 5833 2006-08-16 20:05:58Z mike $"
+ * "$Id: lpc.c 5926 2006-09-05 20:45:47Z mike $"
  *
  *   "lpc" command for the Common UNIX Printing System (CUPS).
  *
@@ -65,7 +65,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 		*params;		/* Pointer to parameters */
 
 
-  _cupsSetLocale();
+  _cupsSetLocale(argv);
 
  /*
   * Connect to the scheduler...
@@ -520,5 +520,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpc.c 5833 2006-08-16 20:05:58Z mike $".
+ * End of "$Id: lpc.c 5926 2006-09-05 20:45:47Z mike $".
  */
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 78387fd5d..1feacaaf4 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpq.c 5838 2006-08-17 14:41:42Z mike $"
+ * "$Id: lpq.c 5926 2006-09-05 20:45:47Z mike $"
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
@@ -78,7 +78,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   cups_dest_t	*dests;			/* Destinations */
 
 
-  _cupsSetLocale();
+  _cupsSetLocale(argv);
 
  /*
   * Check for command-line options...
@@ -676,5 +676,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpq.c 5838 2006-08-17 14:41:42Z mike $".
+ * End of "$Id: lpq.c 5926 2006-09-05 20:45:47Z mike $".
  */
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index 90b73bf4d..1597aef2f 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpr.c 5838 2006-08-17 14:41:42Z mike $"
+ * "$Id: lpr.c 5926 2006-09-05 20:45:47Z mike $"
  *
  *   "lpr" command for the Common UNIX Printing System (CUPS).
  *
@@ -93,7 +93,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
-  _cupsSetLocale();
+  _cupsSetLocale(argv);
 
   deletefile  = 0;
   printer     = NULL;
@@ -529,5 +529,5 @@ sighandler(int s)			/* I - Signal number */
 
 
 /*
- * End of "$Id: lpr.c 5838 2006-08-17 14:41:42Z mike $".
+ * End of "$Id: lpr.c 5926 2006-09-05 20:45:47Z mike $".
  */
diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index 574f26507..0551dbbd4 100644
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lprm.c 5878 2006-08-24 15:55:42Z mike $"
+ * "$Id: lprm.c 5926 2006-09-05 20:45:47Z mike $"
  *
  *   "lprm" command for the Common UNIX Printing System (CUPS).
  *
@@ -61,7 +61,7 @@ main(int  argc,			/* I - Number of command-line arguments */
   http_encryption_t encryption;	/* Encryption? */
 
 
-  _cupsSetLocale();
+  _cupsSetLocale(argv);
 
  /*
   * Setup to cancel individual print jobs...
@@ -294,5 +294,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: lprm.c 5878 2006-08-24 15:55:42Z mike $".
+ * End of "$Id: lprm.c 5926 2006-09-05 20:45:47Z mike $".
  */