Update upstream source from tag 'upstream/2.0.1+repack'

Update to upstream version '2.0.1+repack'
with Debian dir 6edb5dd2df9aca152662fc4a8f72bd6d86f8552e

5 files changed, 384 insertions, 384 deletions

diff --git a/usb/ArgyllCMS.cat b/usb/ArgyllCMS.cat
index d905b40..e0a2d35 100755
--- a/usb/ArgyllCMS.cat
+++ b/usb/ArgyllCMS.cat
diff --git a/usb/ArgyllCMS.inf b/usb/ArgyllCMS.inf
index c1865cf..e4d702f 100755
--- a/usb/ArgyllCMS.inf
+++ b/usb/ArgyllCMS.inf
@@ -1,232 +1,232 @@
-;--------------------------------------------------------------------------
-; Copyright 2012 Graeme W. Gill.
-; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
-; of this file, to deal
-; in this file without restriction, including without limitation the rights
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-; copies of this file, and to permit persons to whom this file is
-; furnished to do so, subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be included in
-; all copies or substantial portions of this file.
-; 
-; THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN
-; THIS FILE.
-;--------------------------------------------------------------------------
-
-; ==== Strings ====
-
-[Strings]
-
-DeviceGUID          = {247e32a0-32f9-11df-aacc-0002a5d5c51b}
-
-Date                = "01/17/2012"		; MM/DD/YYYY
-libusb0ver          = "1.2.6.0"
-
-Libusb_ClassName    = "Argyll LibUSB-win32 devices"
-Libusb_DiskName     = "LibUSB-win32 Device Install Disk"
-
-libusb0_SvcDesc     = "LibUSB-win32 libusb0 - Kernel Driver 2012/1/17, 1.2.6.0"
-
-; ==== Version ====
-
-[Version]
-Signature = "$Windows NT$"
-DriverVer = %Date%,%libusb0ver%
-Provider  = "ArgyllCMS"
-
-; (Note the ClassGuid must not be quoted or a string substitution to work on Win2K)
-Class               = %Libusb_ClassName%
-ClassGuid           = {817cffe0-328b-11df-9b9f-0002a5d5c51b}	; LibUSB-win32 ClassGUID
-CatalogFile         = "ArgyllCMS.cat"
-CatalogFile.NTAMD64 = "ArgyllCMS_x64.cat"
-
-[ClassInstall32]
-AddReg=class_install_add_reg
-
-[class_install_add_reg]
-HKR,,,,%Libusb_ClassName%
-HKR,,Icon,,"-20"	; -20 is for the USB icon
-
-; ==== Files Sources and Destinations ====
-
-[SourceDisksNames]
-1 = %Libusb_DiskName%
-
-[SourceDisksFiles]
-libusb0.sys = 1,\bin\x86,
-
-[SourceDisksFiles.amd64]
-libusb0.sys = 1,\bin\amd64,
-
-[DestinationDirs]
-libusb0_files_sys = 10,system32\drivers
-
-; ==== libusb0 Device driver ====
-
-[libusb0_files_sys]
-libusb0.sys,libusb0.sys
-
-; For each one of these, there must be one for Services !!!
-[LIBUSB0_DEV]
-CopyFiles = Libusb0_files_sys
-
-[LIBUSB0_DEV.HW]
-AddReg = libusb0_add_reg_hw
-
-[libusb0_add_reg]
-HKR,,DevLoader,,*ntkern
-HKR,,NTMPDriver,,libusb0.sys
-
-[libusb0_add_reg_hw]
-HKR,,DeviceInterfaceGUIDs,0x10000,%DeviceGUID%
-HKR,,SurpriseRemovalOK,0x00010001,1				; Device properties
-
-[LIBUSB0_DEV.Services]
-AddService = libusb0, 0x00000002, libusb0_add_service
-
-[libusb0_add_service]
-DisplayName    = %libusb0_SvcDesc%
-ServiceType    = 1
-StartType      = 3
-ErrorControl   = 0
-ServiceBinary  = %12%\libusb0.sys
-
-; ==== Manufacturers ====
-
-[Manufacturer]
-"HCFR Association"=HCFR_Devices,NTx86,NTamd64
-"Sequel Imaging"=Sequel_Devices,NTx86,NTamd64
-"X-Rite"=X_Rite_Devices,NTx86,NTamd64
-"ColorVision"=ColorVision_Devices,NTx86,NTamd64
-"Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64
-"Hughski Ltd"=Hughski_Devices,NTx86,NTamd64
-"Image Engineering"=ImageEngineering_Devices,NTx86,NTamd64
-
-; ==== Devices ====
-
-[HCFR_Devices]
-"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B
-"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17
-
-[Sequel_Devices]
-"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001
-
-[X_Rite_Devices]
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010
-"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020
-"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003
-"i1 Studio (Argyll)"            = LIBUSB0_DEV, USB\VID_0765&PID_6008
-"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020
-"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092
-"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094
-
-[ColorVision_Devices]
-"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100
-"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200
-"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300
-"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400
-"Spyder5 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0500
-
-[GM_X_Rite_Devices]
-"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000
-"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001
-"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003
-"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005
-"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007
-
-[Hughski_Devices]
-"ColorHug 2 (Argyll)"           = LIBUSB0_DEV, USB\VID_273F&PID_1004
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA
-
-[ImageEngineering_Devices]
-"EX1 (Argyll)"                  = LIBUSB0_DEV, USB\VID_2457&PID_4000
-
-
-[HCFR_Devices.NTx86]
-"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B
-"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17
-
-[Sequel_Devices.NTx86]
-"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001
-
-[X_Rite_Devices.NTx86]
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010
-"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020
-"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003
-"i1 Studio (Argyll)"            = LIBUSB0_DEV, USB\VID_0765&PID_6008
-"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020
-"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092
-"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094
-
-[ColorVision_Devices.NTx86]
-"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100
-"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200
-"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300
-"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400
-"Spyder5 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0500
-
-[GM_X_Rite_Devices.NTx86]
-"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000
-"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001
-"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003
-"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005
-"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007
-
-[Hughski_Devices.NTx86]
-"ColorHug 2 (Argyll)"           = LIBUSB0_DEV, USB\VID_273F&PID_1004
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA
-
-[ImageEngineering_Devices.NTx86]
-"EX1 (Argyll)"                  = LIBUSB0_DEV, USB\VID_2457&PID_4000
-
-
-[HCFR_Devices.NTamd64]
-"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B
-"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17
-
-[Sequel_Devices.NTamd64]
-"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001
-
-[X_Rite_Devices.NTamd64]
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010
-"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020
-"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003
-"i1 Studio (Argyll)"            = LIBUSB0_DEV, USB\VID_0765&PID_6008
-"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020
-"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092
-"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094
-
-[ColorVision_Devices.NTamd64]
-"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100
-"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200
-"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300
-"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400
-"Spyder5 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0500
-
-[GM_X_Rite_Devices.NTamd64]
-"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000
-"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001
-"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003
-"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005
-"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007
-
-[Hughski_Devices.NTamd64]
-"ColorHug 2 (Argyll)"           = LIBUSB0_DEV, USB\VID_273F&PID_1004
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA
-
-[ImageEngineering_Devices.NTamd64]
-"EX1 (Argyll)"                  = LIBUSB0_DEV, USB\VID_2457&PID_4000
-
+;--------------------------------------------------------------------------

+; Copyright 2012 Graeme W. Gill.

+; 

+; Permission is hereby granted, free of charge, to any person obtaining a copy

+; of this file, to deal

+; in this file without restriction, including without limitation the rights

+; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+; copies of this file, and to permit persons to whom this file is

+; furnished to do so, subject to the following conditions:

+; 

+; The above copyright notice and this permission notice shall be included in

+; all copies or substantial portions of this file.

+; 

+; THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+; OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN

+; THIS FILE.

+;--------------------------------------------------------------------------

+

+; ==== Strings ====

+

+[Strings]

+

+DeviceGUID          = {247e32a0-32f9-11df-aacc-0002a5d5c51b}

+

+Date                = "01/17/2012"		; MM/DD/YYYY

+libusb0ver          = "1.2.6.0"

+

+Libusb_ClassName    = "Argyll LibUSB-win32 devices"

+Libusb_DiskName     = "LibUSB-win32 Device Install Disk"

+

+libusb0_SvcDesc     = "LibUSB-win32 libusb0 - Kernel Driver 2012/1/17, 1.2.6.0"

+

+; ==== Version ====

+

+[Version]

+Signature = "$Windows NT$"

+DriverVer = %Date%,%libusb0ver%

+Provider  = "ArgyllCMS"

+

+; (Note the ClassGuid must not be quoted or a string substitution to work on Win2K)

+Class               = %Libusb_ClassName%

+ClassGuid           = {817cffe0-328b-11df-9b9f-0002a5d5c51b}	; LibUSB-win32 ClassGUID

+CatalogFile         = "ArgyllCMS.cat"

+CatalogFile.NTAMD64 = "ArgyllCMS_x64.cat"

+

+[ClassInstall32]

+AddReg=class_install_add_reg

+

+[class_install_add_reg]

+HKR,,,,%Libusb_ClassName%

+HKR,,Icon,,"-20"	; -20 is for the USB icon

+

+; ==== Files Sources and Destinations ====

+

+[SourceDisksNames]

+1 = %Libusb_DiskName%

+

+[SourceDisksFiles]

+libusb0.sys = 1,\bin\x86,

+

+[SourceDisksFiles.amd64]

+libusb0.sys = 1,\bin\amd64,

+

+[DestinationDirs]

+libusb0_files_sys = 10,system32\drivers

+

+; ==== libusb0 Device driver ====

+

+[libusb0_files_sys]

+libusb0.sys,libusb0.sys

+

+; For each one of these, there must be one for Services !!!

+[LIBUSB0_DEV]

+CopyFiles = Libusb0_files_sys

+

+[LIBUSB0_DEV.HW]

+AddReg = libusb0_add_reg_hw

+

+[libusb0_add_reg]

+HKR,,DevLoader,,*ntkern

+HKR,,NTMPDriver,,libusb0.sys

+

+[libusb0_add_reg_hw]

+HKR,,DeviceInterfaceGUIDs,0x10000,%DeviceGUID%

+HKR,,SurpriseRemovalOK,0x00010001,1				; Device properties

+

+[LIBUSB0_DEV.Services]

+AddService = libusb0, 0x00000002, libusb0_add_service

+

+[libusb0_add_service]

+DisplayName    = %libusb0_SvcDesc%

+ServiceType    = 1

+StartType      = 3

+ErrorControl   = 0

+ServiceBinary  = %12%\libusb0.sys

+

+; ==== Manufacturers ====

+

+[Manufacturer]

+"HCFR Association"=HCFR_Devices,NTx86,NTamd64

+"Sequel Imaging"=Sequel_Devices,NTx86,NTamd64

+"X-Rite"=X_Rite_Devices,NTx86,NTamd64

+"ColorVision"=ColorVision_Devices,NTx86,NTamd64

+"Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64

+"Hughski Ltd"=Hughski_Devices,NTx86,NTamd64

+"Image Engineering"=ImageEngineering_Devices,NTx86,NTamd64

+

+; ==== Devices ====

+

+[HCFR_Devices]

+"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B

+"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17

+

+[Sequel_Devices]

+"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001

+

+[X_Rite_Devices]

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010

+"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020

+"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003

+"i1 Studio (Argyll)"            = LIBUSB0_DEV, USB\VID_0765&PID_6008

+"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020

+"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092

+"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094

+

+[ColorVision_Devices]

+"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100

+"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200

+"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300

+"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400

+"Spyder5 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0500

+

+[GM_X_Rite_Devices]

+"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000

+"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001

+"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003

+"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005

+"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007

+

+[Hughski_Devices]

+"ColorHug 2 (Argyll)"           = LIBUSB0_DEV, USB\VID_273F&PID_1004

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA

+

+[ImageEngineering_Devices]

+"EX1 (Argyll)"                  = LIBUSB0_DEV, USB\VID_2457&PID_4000

+

+

+[HCFR_Devices.NTx86]

+"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B

+"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17

+

+[Sequel_Devices.NTx86]

+"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001

+

+[X_Rite_Devices.NTx86]

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010

+"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020

+"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003

+"i1 Studio (Argyll)"            = LIBUSB0_DEV, USB\VID_0765&PID_6008

+"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020

+"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092

+"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094

+

+[ColorVision_Devices.NTx86]

+"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100

+"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200

+"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300

+"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400

+"Spyder5 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0500

+

+[GM_X_Rite_Devices.NTx86]

+"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000

+"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001

+"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003

+"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005

+"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007

+

+[Hughski_Devices.NTx86]

+"ColorHug 2 (Argyll)"           = LIBUSB0_DEV, USB\VID_273F&PID_1004

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA

+

+[ImageEngineering_Devices.NTx86]

+"EX1 (Argyll)"                  = LIBUSB0_DEV, USB\VID_2457&PID_4000

+

+

+[HCFR_Devices.NTamd64]

+"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B

+"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17

+

+[Sequel_Devices.NTamd64]

+"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001

+

+[X_Rite_Devices.NTamd64]

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010

+"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020

+"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003

+"i1 Studio (Argyll)"            = LIBUSB0_DEV, USB\VID_0765&PID_6008

+"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020

+"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092

+"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094

+

+[ColorVision_Devices.NTamd64]

+"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100

+"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200

+"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300

+"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400

+"Spyder5 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0500

+

+[GM_X_Rite_Devices.NTamd64]

+"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000

+"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001

+"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003

+"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005

+"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007

+

+[Hughski_Devices.NTamd64]

+"ColorHug 2 (Argyll)"           = LIBUSB0_DEV, USB\VID_273F&PID_1004

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA

+

+[ImageEngineering_Devices.NTamd64]

+"EX1 (Argyll)"                  = LIBUSB0_DEV, USB\VID_2457&PID_4000

+

diff --git a/usb/ArgyllCMS.inf.d b/usb/ArgyllCMS.inf.d
index 225eb9c..9cb0292 100755
--- a/usb/ArgyllCMS.inf.d
+++ b/usb/ArgyllCMS.inf.d
@@ -1,40 +1,40 @@
-
-[HCFR_Devices#PLAT#]
-"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B
-"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17
-
-[Sequel_Devices#PLAT#]
-"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001
-
-[X_Rite_Devices#PLAT#]
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010
-"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020
-"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003
-"i1 Studio (Argyll)"            = LIBUSB0_DEV, USB\VID_0765&PID_6008
-"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020
-"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092
-"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094
-
-[ColorVision_Devices#PLAT#]
-"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100
-"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200
-"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300
-"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400
-"Spyder5 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0500
-
-[GM_X_Rite_Devices#PLAT#]
-"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000
-"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001
-"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003
-"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005
-"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007
-
-[Hughski_Devices#PLAT#]
-"ColorHug 2 (Argyll)"           = LIBUSB0_DEV, USB\VID_273F&PID_1004
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA
-
-[ImageEngineering_Devices#PLAT#]
-"EX1 (Argyll)"                  = LIBUSB0_DEV, USB\VID_2457&PID_4000
-
+

+[HCFR_Devices#PLAT#]

+"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B

+"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17

+

+[Sequel_Devices#PLAT#]

+"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001

+

+[X_Rite_Devices#PLAT#]

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010

+"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020

+"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003

+"i1 Studio (Argyll)"            = LIBUSB0_DEV, USB\VID_0765&PID_6008

+"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020

+"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092

+"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094

+

+[ColorVision_Devices#PLAT#]

+"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100

+"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200

+"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300

+"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400

+"Spyder5 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0500

+

+[GM_X_Rite_Devices#PLAT#]

+"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000

+"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001

+"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003

+"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005

+"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007

+

+[Hughski_Devices#PLAT#]

+"ColorHug 2 (Argyll)"           = LIBUSB0_DEV, USB\VID_273F&PID_1004

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA

+

+[ImageEngineering_Devices#PLAT#]

+"EX1 (Argyll)"                  = LIBUSB0_DEV, USB\VID_2457&PID_4000

+

diff --git a/usb/ArgyllCMS.inf.t b/usb/ArgyllCMS.inf.t
index a185d03..635d9ef 100755
--- a/usb/ArgyllCMS.inf.t
+++ b/usb/ArgyllCMS.inf.t
@@ -1,112 +1,112 @@
-;--------------------------------------------------------------------------
-; Copyright 2012 Graeme W. Gill.
-; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
-; of this file, to deal
-; in this file without restriction, including without limitation the rights
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-; copies of this file, and to permit persons to whom this file is
-; furnished to do so, subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be included in
-; all copies or substantial portions of this file.
-; 
-; THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN
-; THIS FILE.
-;--------------------------------------------------------------------------
-
-; ==== Strings ====
-
-[Strings]
-
-DeviceGUID          = {247e32a0-32f9-11df-aacc-0002a5d5c51b}
-
-Date                = "01/17/2012"		; MM/DD/YYYY
-libusb0ver          = "1.2.6.0"
-
-Libusb_ClassName    = "Argyll LibUSB-win32 devices"
-Libusb_DiskName     = "LibUSB-win32 Device Install Disk"
-
-libusb0_SvcDesc     = "LibUSB-win32 libusb0 - Kernel Driver 2012/1/17, 1.2.6.0"
-
-; ==== Version ====
-
-[Version]
-Signature = "$Windows NT$"
-DriverVer = %Date%,%libusb0ver%
-Provider  = "ArgyllCMS"
-
-; (Note the ClassGuid must not be quoted or a string substitution to work on Win2K)
-Class               = %Libusb_ClassName%
-ClassGuid           = {817cffe0-328b-11df-9b9f-0002a5d5c51b}	; LibUSB-win32 ClassGUID
-CatalogFile         = "ArgyllCMS.cat"
-CatalogFile.NTAMD64 = "ArgyllCMS_x64.cat"
-
-[ClassInstall32]
-AddReg=class_install_add_reg
-
-[class_install_add_reg]
-HKR,,,,%Libusb_ClassName%
-HKR,,Icon,,"-20"	; -20 is for the USB icon
-
-; ==== Files Sources and Destinations ====
-
-[SourceDisksNames]
-1 = %Libusb_DiskName%
-
-[SourceDisksFiles]
-libusb0.sys = 1,\bin\x86,
-
-[SourceDisksFiles.amd64]
-libusb0.sys = 1,\bin\amd64,
-
-[DestinationDirs]
-libusb0_files_sys = 10,system32\drivers
-
-; ==== libusb0 Device driver ====
-
-[libusb0_files_sys]
-libusb0.sys,libusb0.sys
-
-; For each one of these, there must be one for Services !!!
-[LIBUSB0_DEV]
-CopyFiles = Libusb0_files_sys
-
-[LIBUSB0_DEV.HW]
-AddReg = libusb0_add_reg_hw
-
-[libusb0_add_reg]
-HKR,,DevLoader,,*ntkern
-HKR,,NTMPDriver,,libusb0.sys
-
-[libusb0_add_reg_hw]
-HKR,,DeviceInterfaceGUIDs,0x10000,%DeviceGUID%
-HKR,,SurpriseRemovalOK,0x00010001,1				; Device properties
-
-[LIBUSB0_DEV.Services]
-AddService = libusb0, 0x00000002, libusb0_add_service
-
-[libusb0_add_service]
-DisplayName    = %libusb0_SvcDesc%
-ServiceType    = 1
-StartType      = 3
-ErrorControl   = 0
-ServiceBinary  = %12%\libusb0.sys
-
-; ==== Manufacturers ====
-
-[Manufacturer]
-"HCFR Association"=HCFR_Devices,NTx86,NTamd64
-"Sequel Imaging"=Sequel_Devices,NTx86,NTamd64
-"X-Rite"=X_Rite_Devices,NTx86,NTamd64
-"ColorVision"=ColorVision_Devices,NTx86,NTamd64
-"Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64
-"Hughski Ltd"=Hughski_Devices,NTx86,NTamd64
-"Image Engineering"=ImageEngineering_Devices,NTx86,NTamd64
-
-; ==== Devices ====
+;--------------------------------------------------------------------------

+; Copyright 2012 Graeme W. Gill.

+; 

+; Permission is hereby granted, free of charge, to any person obtaining a copy

+; of this file, to deal

+; in this file without restriction, including without limitation the rights

+; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+; copies of this file, and to permit persons to whom this file is

+; furnished to do so, subject to the following conditions:

+; 

+; The above copyright notice and this permission notice shall be included in

+; all copies or substantial portions of this file.

+; 

+; THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+; OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN

+; THIS FILE.

+;--------------------------------------------------------------------------

+

+; ==== Strings ====

+

+[Strings]

+

+DeviceGUID          = {247e32a0-32f9-11df-aacc-0002a5d5c51b}

+

+Date                = "01/17/2012"		; MM/DD/YYYY

+libusb0ver          = "1.2.6.0"

+

+Libusb_ClassName    = "Argyll LibUSB-win32 devices"

+Libusb_DiskName     = "LibUSB-win32 Device Install Disk"

+

+libusb0_SvcDesc     = "LibUSB-win32 libusb0 - Kernel Driver 2012/1/17, 1.2.6.0"

+

+; ==== Version ====

+

+[Version]

+Signature = "$Windows NT$"

+DriverVer = %Date%,%libusb0ver%

+Provider  = "ArgyllCMS"

+

+; (Note the ClassGuid must not be quoted or a string substitution to work on Win2K)

+Class               = %Libusb_ClassName%

+ClassGuid           = {817cffe0-328b-11df-9b9f-0002a5d5c51b}	; LibUSB-win32 ClassGUID

+CatalogFile         = "ArgyllCMS.cat"

+CatalogFile.NTAMD64 = "ArgyllCMS_x64.cat"

+

+[ClassInstall32]

+AddReg=class_install_add_reg

+

+[class_install_add_reg]

+HKR,,,,%Libusb_ClassName%

+HKR,,Icon,,"-20"	; -20 is for the USB icon

+

+; ==== Files Sources and Destinations ====

+

+[SourceDisksNames]

+1 = %Libusb_DiskName%

+

+[SourceDisksFiles]

+libusb0.sys = 1,\bin\x86,

+

+[SourceDisksFiles.amd64]

+libusb0.sys = 1,\bin\amd64,

+

+[DestinationDirs]

+libusb0_files_sys = 10,system32\drivers

+

+; ==== libusb0 Device driver ====

+

+[libusb0_files_sys]

+libusb0.sys,libusb0.sys

+

+; For each one of these, there must be one for Services !!!

+[LIBUSB0_DEV]

+CopyFiles = Libusb0_files_sys

+

+[LIBUSB0_DEV.HW]

+AddReg = libusb0_add_reg_hw

+

+[libusb0_add_reg]

+HKR,,DevLoader,,*ntkern

+HKR,,NTMPDriver,,libusb0.sys

+

+[libusb0_add_reg_hw]

+HKR,,DeviceInterfaceGUIDs,0x10000,%DeviceGUID%

+HKR,,SurpriseRemovalOK,0x00010001,1				; Device properties

+

+[LIBUSB0_DEV.Services]

+AddService = libusb0, 0x00000002, libusb0_add_service

+

+[libusb0_add_service]

+DisplayName    = %libusb0_SvcDesc%

+ServiceType    = 1

+StartType      = 3

+ErrorControl   = 0

+ServiceBinary  = %12%\libusb0.sys

+

+; ==== Manufacturers ====

+

+[Manufacturer]

+"HCFR Association"=HCFR_Devices,NTx86,NTamd64

+"Sequel Imaging"=Sequel_Devices,NTx86,NTamd64

+"X-Rite"=X_Rite_Devices,NTx86,NTamd64

+"ColorVision"=ColorVision_Devices,NTx86,NTamd64

+"Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64

+"Hughski Ltd"=Hughski_Devices,NTx86,NTamd64

+"Image Engineering"=ImageEngineering_Devices,NTx86,NTamd64

+

+; ==== Devices ====

diff --git a/usb/ArgyllCMS_x64.cat b/usb/ArgyllCMS_x64.cat
index f734475..e3c213f 100755
--- a/usb/ArgyllCMS_x64.cat
+++ b/usb/ArgyllCMS_x64.cat