Fix some code comments in tls-xxx.c.

Update USB quirks for MX310 and MX320 (STR #4482)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12159 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index b7a2eb637db3bed77dd91d7ff1d9c199d54c577b..7aefded880a02faf7a4de3c729f4dd3ba1f5fcd9 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,12 @@
-CHANGES.txt - 2.0rc2 - 2014-09-03
----------------------------------
+CHANGES.txt - 2.0?? - 2014-09-23
+--------------------------------
 
-CHANGES IN CUPS V2.0rc2
+CHANGES IN CUPS V2.0??
 
        - The scheduler did not preserve listener sockets from launchd or
          systemd after a restart (<rdar://problem/18112848>)
+       - Added some USB quirk rules for the libusb-based USB backend
+         (STR #4482)
 
 
 CHANGES IN CUPS V2.0rc1

diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 5a7b2e09a1c5be3cef6b7810453c7b3f6814b7cf..aecb9ea6965dae2bafe3d9a87f01aafacac40c60 100644 (file)
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -215,3 +215,9 @@
 
 # Lexmark E238 (STR #4448)
 0x043d 0x009a no-reattach
+
+# Canon MX310 (STR #4482)
+0x04a9 0x1728 unidir
+
+# Canon MX320 (STR #4482)
+0x04A9 0x1736 unidir

diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index fefd6d104cf46e075160b512f76796479c7d5f08..8d2cbb2627b07a4154445db7ddcf3e3591413246 100644 (file)
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -15,7 +15,7 @@
  * This file is subject to the Apple OS-Developed Software exception.
  */
 
-/**** This file is included from http.c ****/
+/**** This file is included from tls.c ****/
 
 /*
  * Include necessary headers...

diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
index 343ab9f064724b4c40a6d1283f3076ff898d9512..0900f4fe3180e6a728306b8d11d6d196f48e36d9 100644 (file)
--- a/cups/tls-gnutls.c
+++ b/cups/tls-gnutls.c
@@ -15,6 +15,7 @@
  * This file is subject to the Apple OS-Developed Software exception.
  */
 
+/**** This file is included from tls.c ****/
 
 /*
  * Include necessary headers...

diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c
index e3a8e1fb12e4fabea46a6d7266eb2edaa69e7ce1..0911c683b2f899ed6e3e1f6a5e0c9573e70be609 100644 (file)
--- a/cups/tls-sspi.c
+++ b/cups/tls-sspi.c
@@ -14,6 +14,8 @@
  * This file is subject to the Apple OS-Developed Software exception.
  */
 
+/**** This file is included from tls.c ****/
+
 /*
  * Include necessary headers...
  */

diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
index 9d658ffedab435d990e45d55fc26c19077626905..908e485686900a8729478a2e3b0008dcd25876a3 100644 (file)
--- a/xcode/CUPS.xcodeproj/project.pbxproj
+++ b/xcode/CUPS.xcodeproj/project.pbxproj
@@ -1560,6 +1560,7 @@
                72F75A691336FA8A004BB496 /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = error.c; path = ../filter/error.c; sourceTree = "<group>"; };
                72F75A6A1336FA8A004BB496 /* interpret.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = interpret.c; path = ../filter/interpret.c; sourceTree = "<group>"; };
                72F75A6B1336FA8A004BB496 /* raster.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster.c; path = ../filter/raster.c; sourceTree = "<group>"; };
+               72F7F1D719D1C0CC00870B09 /* org.cups.usb-quirks */ = {isa = PBXFileReference; lastKnownFileType = text; name = "org.cups.usb-quirks"; path = "../backend/org.cups.usb-quirks"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2247,6 +2248,7 @@
                724378F71333E3CE009631B9 /* backends */ = {
                        isa = PBXGroup;
                        children = (
+                               72F7F1D719D1C0CC00870B09 /* org.cups.usb-quirks */,
                                724379091333E4E3009631B9 /* backend-private.h */,
                                724379501333FEBB009631B9 /* dnssd.c */,
                                724379CA1334000E009631B9 /* ieee1284.c */,