Merge changes from CUPS 1.6svn-r10267.

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

3 files changed, 36 insertions, 38 deletions

diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index 9d43ccaf8..9beac1b39 100644
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -1,34 +1,28 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-lpc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
-lpc.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
-lpc.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpc.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
-lpc.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
-lpc.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
-lpc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-lpc.o: ../cups/transcode.h ../cups/thread-private.h
-lpq.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
-lpq.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
-lpq.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpq.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
-lpq.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
-lpq.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
-lpq.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-lpq.o: ../cups/transcode.h ../cups/thread-private.h
-lpr.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
-lpr.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
-lpr.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpr.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
-lpr.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
-lpr.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
-lpr.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-lpr.o: ../cups/transcode.h ../cups/thread-private.h
-lprm.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
-lprm.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
-lprm.o: ../cups/language.h ../cups/string-private.h ../config.h
-lprm.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
-lprm.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
-lprm.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
-lprm.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-lprm.o: ../cups/transcode.h ../cups/thread-private.h
+lpc.o: lpc.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/thread-private.h
+lpq.o: lpq.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/thread-private.h
+lpr.o: lpr.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/thread-private.h
+lprm.o: lprm.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
+  ../cups/language.h ../cups/string-private.h ../config.h \
+  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
+  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
+  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/thread-private.h
diff --git a/berkeley/Makefile b/berkeley/Makefile
index 9c60400d6..8a154c504 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -3,7 +3,7 @@
 #
 #   Berkeley commands makefile for CUPS.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -54,7 +54,7 @@ clean:
 #
 
 depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
+	$(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
 
 
 #
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index b71f54fed..27d73c55c 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -3,7 +3,7 @@
  *
  *   "lpr" command for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -377,7 +377,6 @@ main(int  argc,				/* I - Number of command-line arguments */
     const char		*format;	/* Document format */
     ssize_t		bytes;		/* Bytes read */
 
-
     if (cupsGetOption("raw", num_options, options))
       format = CUPS_FORMAT_RAW;
     else if ((format = cupsGetOption("document-format", num_options,
@@ -395,11 +394,16 @@ main(int  argc,				/* I - Number of command-line arguments */
     {
       _cupsLangPrintf(stderr, _("%s: Error - unable to queue from stdin - %s."),
 		      argv[0], httpStatus(status));
+      cupsFinishDocument(CUPS_HTTP_DEFAULT, printer);
+      cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
       return (1);
     }
 
     if (cupsFinishDocument(CUPS_HTTP_DEFAULT, printer) != IPP_OK)
+    {
+      cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
       job_id = 0;
+    }
   }
 
   if (job_id < 1)