Update upstream source from tag 'upstream/2.0.0'

Update to upstream version '2.0.0'
with Debian dir e866e6e75661017faaa5331becda76021407390b

52 files changed, 10 insertions, 0 deletions

diff --git a/usb/45-Argyll.rules b/usb/45-Argyll.rules
index beeda7c..7c7ab2a 100644..100755
--- a/usb/45-Argyll.rules
+++ b/usb/45-Argyll.rules
@@ -21,6 +21,9 @@ SYSFS{idVendor}=="0765", SYSFS{idProduct}=="5020", PROGRAM="/bin/sh -c 'K=%k; K=
 # ColorMunki Smile
 SYSFS{idVendor}=="0765", SYSFS{idProduct}=="6003", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord"
 
+# ColorMunki i1 Studio
+SYSFS{idVendor}=="0765", SYSFS{idProduct}=="6008", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord"
+
 # DTP20
 SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d020", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord"
 
diff --git a/usb/55-Argyll.rules b/usb/55-Argyll.rules
index 703d139..05fea85 100644..100755
--- a/usb/55-Argyll.rules
+++ b/usb/55-Argyll.rules
@@ -54,6 +54,9 @@ ATTRS{idVendor}=="0765", ATTRS{idProduct}=="5020", ENV{COLORD_SENSOR_KIND}="i1-d
 # ColorMunki Smile
 ATTRS{idVendor}=="0765", ATTRS{idProduct}=="6003", ENV{COLORD_SENSOR_KIND}="color-munki-smile", ENV{COLORD_SENSOR_CAPS}="lcd-ccfl lcd-white-led"
 
+# ColorMunki i1 Studio
+ATTRS{idVendor}=="0768", ATTRS{idProduct}=="6008", ENV{COLORD_SENSOR_KIND}="color-munki-photo" ENV{COLORD_SENSOR_CAPS}="lcd crt projector printer spot ambient"
+
 # DTP20
 ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d020", ENV{COLORD_SENSOR_KIND}="dtp20" ENV{COLORD_SENSOR_CAPS}="printer spot"
 
diff --git a/usb/Argyll b/usb/Argyll
index b7eebc2..b7eebc2 100644..100755
--- a/usb/Argyll
+++ b/usb/Argyll
diff --git a/usb/Argyll.kext/Info.plist b/usb/Argyll.kext/Info.plist
index 754e6d5..754e6d5 100644..100755
--- a/usb/Argyll.kext/Info.plist
+++ b/usb/Argyll.kext/Info.plist
diff --git a/usb/Argyll.usermap b/usb/Argyll.usermap
index 8890153..8890153 100644..100755
--- a/usb/Argyll.usermap
+++ b/usb/Argyll.usermap
diff --git a/usb/ArgyllCMS.cat b/usb/ArgyllCMS.cat
index cd06c92..d905b40 100644..100755
--- a/usb/ArgyllCMS.cat
+++ b/usb/ArgyllCMS.cat
diff --git a/usb/ArgyllCMS.inf b/usb/ArgyllCMS.inf
index 4de9f51..e4d702f 100644..100755
--- a/usb/ArgyllCMS.inf
+++ b/usb/ArgyllCMS.inf
@@ -123,6 +123,7 @@ ServiceBinary  = %12%\libusb0.sys
 "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

@@ -162,6 +163,7 @@ ServiceBinary  = %12%\libusb0.sys
 "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

@@ -201,6 +203,7 @@ ServiceBinary  = %12%\libusb0.sys
 "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

diff --git a/usb/ArgyllCMS.inf.d b/usb/ArgyllCMS.inf.d
index c130cee..9cb0292 100644..100755
--- a/usb/ArgyllCMS.inf.d
+++ b/usb/ArgyllCMS.inf.d
@@ -11,6 +11,7 @@
 "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

diff --git a/usb/ArgyllCMS.inf.t b/usb/ArgyllCMS.inf.t
index 635d9ef..635d9ef 100644..100755
--- a/usb/ArgyllCMS.inf.t
+++ b/usb/ArgyllCMS.inf.t
diff --git a/usb/ArgyllCMS_x64.cat b/usb/ArgyllCMS_x64.cat
index 16b3ffa..f734475 100644..100755
--- a/usb/ArgyllCMS_x64.cat
+++ b/usb/ArgyllCMS_x64.cat
diff --git a/usb/Jamfile b/usb/Jamfile
index 8df0fba..8df0fba 100644..100755
--- a/usb/Jamfile
+++ b/usb/Jamfile
diff --git a/usb/afiles b/usb/afiles
index 4dbc3c1..4dbc3c1 100644..100755
--- a/usb/afiles
+++ b/usb/afiles
diff --git a/usb/binfiles.lx b/usb/binfiles.lx
index 7dd8767..7dd8767 100644..100755
--- a/usb/binfiles.lx
+++ b/usb/binfiles.lx
diff --git a/usb/binfiles.msw b/usb/binfiles.msw
index f498d92..f498d92 100644..100755
--- a/usb/binfiles.msw
+++ b/usb/binfiles.msw
diff --git a/usb/binfiles.osx b/usb/binfiles.osx
index 60ed4ec..60ed4ec 100644..100755
--- a/usb/binfiles.osx
+++ b/usb/binfiles.osx
diff --git a/usb/driver/AUTHORS.txt b/usb/driver/AUTHORS.txt
index 375ec6c..375ec6c 100644..100755
--- a/usb/driver/AUTHORS.txt
+++ b/usb/driver/AUTHORS.txt
diff --git a/usb/driver/COPYING_GPL.txt b/usb/driver/COPYING_GPL.txt
index 94a9ed0..94a9ed0 100644..100755
--- a/usb/driver/COPYING_GPL.txt
+++ b/usb/driver/COPYING_GPL.txt
diff --git a/usb/driver/LICENSE.txt b/usb/driver/LICENSE.txt
index d8dd99d..d8dd99d 100644..100755
--- a/usb/driver/LICENSE.txt
+++ b/usb/driver/LICENSE.txt
diff --git a/usb/driver/Makefile b/usb/driver/Makefile
index 18937ab..18937ab 100644..100755
--- a/usb/driver/Makefile
+++ b/usb/driver/Makefile
diff --git a/usb/driver/README.txt b/usb/driver/README.txt
index 0dc3ac0..0dc3ac0 100644..100755
--- a/usb/driver/README.txt
+++ b/usb/driver/README.txt
diff --git a/usb/driver/abort_endpoint.c b/usb/driver/abort_endpoint.c
index 3ec46e9..3ec46e9 100644..100755
--- a/usb/driver/abort_endpoint.c
+++ b/usb/driver/abort_endpoint.c
diff --git a/usb/driver/claim_interface.c b/usb/driver/claim_interface.c
index 9ec0fe5..9ec0fe5 100644..100755
--- a/usb/driver/claim_interface.c
+++ b/usb/driver/claim_interface.c
diff --git a/usb/driver/clear_feature.c b/usb/driver/clear_feature.c
index c3b5c24..c3b5c24 100644..100755
--- a/usb/driver/clear_feature.c
+++ b/usb/driver/clear_feature.c
diff --git a/usb/driver/dispatch.c b/usb/driver/dispatch.c
index 8eccb21..8eccb21 100644..100755
--- a/usb/driver/dispatch.c
+++ b/usb/driver/dispatch.c
diff --git a/usb/driver/driver_api.h b/usb/driver/driver_api.h
index 5339a81..5339a81 100644..100755
--- a/usb/driver/driver_api.h
+++ b/usb/driver/driver_api.h
diff --git a/usb/driver/driver_debug.c b/usb/driver/driver_debug.c
index 49f1878..49f1878 100644..100755
--- a/usb/driver/driver_debug.c
+++ b/usb/driver/driver_debug.c
diff --git a/usb/driver/driver_debug.h b/usb/driver/driver_debug.h
index a4f396f..a4f396f 100644..100755
--- a/usb/driver/driver_debug.h
+++ b/usb/driver/driver_debug.h
diff --git a/usb/driver/driver_registry.c b/usb/driver/driver_registry.c
index 3b0c67d..3b0c67d 100644..100755
--- a/usb/driver/driver_registry.c
+++ b/usb/driver/driver_registry.c
diff --git a/usb/driver/get_configuration.c b/usb/driver/get_configuration.c
index fa9b522..fa9b522 100644..100755
--- a/usb/driver/get_configuration.c
+++ b/usb/driver/get_configuration.c
diff --git a/usb/driver/get_descriptor.c b/usb/driver/get_descriptor.c
index 2b5172e..2b5172e 100644..100755
--- a/usb/driver/get_descriptor.c
+++ b/usb/driver/get_descriptor.c
diff --git a/usb/driver/get_interface.c b/usb/driver/get_interface.c
index b218281..b218281 100644..100755
--- a/usb/driver/get_interface.c
+++ b/usb/driver/get_interface.c
diff --git a/usb/driver/get_status.c b/usb/driver/get_status.c
index 2e77f91..2e77f91 100644..100755
--- a/usb/driver/get_status.c
+++ b/usb/driver/get_status.c
diff --git a/usb/driver/ioctl.c b/usb/driver/ioctl.c
index f059175..f059175 100644..100755
--- a/usb/driver/ioctl.c
+++ b/usb/driver/ioctl.c
diff --git a/usb/driver/libusb-win32-README-1.2.6.0.txt b/usb/driver/libusb-win32-README-1.2.6.0.txt
index 99445f7..99445f7 100644..100755
--- a/usb/driver/libusb-win32-README-1.2.6.0.txt
+++ b/usb/driver/libusb-win32-README-1.2.6.0.txt
diff --git a/usb/driver/libusb_driver.c b/usb/driver/libusb_driver.c
index 61ebf77..61ebf77 100644..100755
--- a/usb/driver/libusb_driver.c
+++ b/usb/driver/libusb_driver.c
diff --git a/usb/driver/libusb_driver.h b/usb/driver/libusb_driver.h
index e0a5d3c..e0a5d3c 100644..100755
--- a/usb/driver/libusb_driver.h
+++ b/usb/driver/libusb_driver.h
diff --git a/usb/driver/libusb_driver_rc.rc b/usb/driver/libusb_driver_rc.rc
index b0affc8..b0affc8 100644..100755
--- a/usb/driver/libusb_driver_rc.rc
+++ b/usb/driver/libusb_driver_rc.rc
diff --git a/usb/driver/lusb_defdi_guids.h b/usb/driver/lusb_defdi_guids.h
index 99833b0..99833b0 100644..100755
--- a/usb/driver/lusb_defdi_guids.h
+++ b/usb/driver/lusb_defdi_guids.h
diff --git a/usb/driver/pnp.c b/usb/driver/pnp.c
index b103650..b103650 100644..100755
--- a/usb/driver/pnp.c
+++ b/usb/driver/pnp.c
diff --git a/usb/driver/power.c b/usb/driver/power.c
index d29dd9b..d29dd9b 100644..100755
--- a/usb/driver/power.c
+++ b/usb/driver/power.c
diff --git a/usb/driver/release_interface.c b/usb/driver/release_interface.c
index bcd483c..bcd483c 100644..100755
--- a/usb/driver/release_interface.c
+++ b/usb/driver/release_interface.c
diff --git a/usb/driver/reset_device.c b/usb/driver/reset_device.c
index a0fd97b..a0fd97b 100644..100755
--- a/usb/driver/reset_device.c
+++ b/usb/driver/reset_device.c
diff --git a/usb/driver/reset_endpoint.c b/usb/driver/reset_endpoint.c
index 3396b93..3396b93 100644..100755
--- a/usb/driver/reset_endpoint.c
+++ b/usb/driver/reset_endpoint.c
diff --git a/usb/driver/set_configuration.c b/usb/driver/set_configuration.c
index 9f2fac1..9f2fac1 100644..100755
--- a/usb/driver/set_configuration.c
+++ b/usb/driver/set_configuration.c
diff --git a/usb/driver/set_descriptor.c b/usb/driver/set_descriptor.c
index 46bbad7..46bbad7 100644..100755
--- a/usb/driver/set_descriptor.c
+++ b/usb/driver/set_descriptor.c
diff --git a/usb/driver/set_feature.c b/usb/driver/set_feature.c
index 12e7745..12e7745 100644..100755
--- a/usb/driver/set_feature.c
+++ b/usb/driver/set_feature.c
diff --git a/usb/driver/set_interface.c b/usb/driver/set_interface.c
index 840600e..840600e 100644..100755
--- a/usb/driver/set_interface.c
+++ b/usb/driver/set_interface.c
diff --git a/usb/driver/transfer.c b/usb/driver/transfer.c
index 0a02aa1..0a02aa1 100644..100755
--- a/usb/driver/transfer.c
+++ b/usb/driver/transfer.c
diff --git a/usb/driver/usbd.def b/usb/driver/usbd.def
index 5c283bb..5c283bb 100644..100755
--- a/usb/driver/usbd.def
+++ b/usb/driver/usbd.def
diff --git a/usb/driver/usbdlib_gcc.h b/usb/driver/usbdlib_gcc.h
index 5dec851..5dec851 100644..100755
--- a/usb/driver/usbdlib_gcc.h
+++ b/usb/driver/usbdlib_gcc.h
diff --git a/usb/driver/vendor_request.c b/usb/driver/vendor_request.c
index f3a898b..f3a898b 100644..100755
--- a/usb/driver/vendor_request.c
+++ b/usb/driver/vendor_request.c
diff --git a/usb/install_kext.sh b/usb/install_kext.sh
index 22c181a..22c181a 100644..100755
--- a/usb/install_kext.sh
+++ b/usb/install_kext.sh