Merge branch 'feature/upstream' into develop

12 files changed, 17 insertions, 17 deletions

diff --git a/testsuite/tools/data/ascii.ref b/testsuite/tools/data/ascii.ref
index 4d66732..20c2bf2 100644
--- a/testsuite/tools/data/ascii.ref
+++ b/testsuite/tools/data/ascii.ref
@@ -5709,7 +5709,7 @@ backend `genesys'
     status basic
     url *none*
     comment `clone of the HP 2400C'
-   model `ScanJet 3670C'
+   model `ScanJet 3670'
     interface `USB'
     usb-vendor-id `0x03f0'
     usb-product-id `0x1405'
@@ -5722,7 +5722,7 @@ backend `genesys'
     usb-product-id `0x1405'
     status complete
     url *none*
-    comment `1200x1200 dpi max, same as HP 3670C'
+    comment `1200x1200 dpi max, same as HP 3670'
    model `ScanJet 4850C'
     interface `USB'
     usb-vendor-id `0x03f0'
diff --git a/testsuite/tools/data/db.ref b/testsuite/tools/data/db.ref
index d51729a..3828667 100644
--- a/testsuite/tools/data/db.ref
+++ b/testsuite/tools/data/db.ref
@@ -66,7 +66,7 @@
 0x03f0	0x1205	root:scanner	0664
 # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
 0x03f0	0x1305	root:scanner	0664
-# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
+# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
 0x03f0	0x1405	root:scanner	0664
 # Hewlett-Packard ScanJet 5590
 0x03f0	0x1705	root:scanner	0664
diff --git a/testsuite/tools/data/hal-new.ref b/testsuite/tools/data/hal-new.ref
index c9b7f80..fc48a71 100644
--- a/testsuite/tools/data/hal-new.ref
+++ b/testsuite/tools/data/hal-new.ref
@@ -175,7 +175,7 @@
           <append key="info.capabilities" type="strlist">scanner</append>
           <merge key="scanner.access_method" type="string">proprietary</merge>
         </match>
-        <!-- Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C -->
+        <!-- Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C -->
         <match key="usb.product_id" int="0x1405">
           <append key="info.capabilities" type="strlist">scanner</append>
           <merge key="scanner.access_method" type="string">proprietary</merge>
diff --git a/testsuite/tools/data/hal.ref b/testsuite/tools/data/hal.ref
index 18490f2..68ef92a 100644
--- a/testsuite/tools/data/hal.ref
+++ b/testsuite/tools/data/hal.ref
@@ -175,7 +175,7 @@
           <append key="info.capabilities" type="strlist">scanner</append>
           <merge key="scanner.access_method" type="string">proprietary</merge>
         </match>
-        <!-- Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C -->
+        <!-- Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C -->
         <match key="usb.product_id" int="0x1405">
           <append key="info.capabilities" type="strlist">scanner</append>
           <merge key="scanner.access_method" type="string">proprietary</merge>
diff --git a/testsuite/tools/data/html-backends-split.ref b/testsuite/tools/data/html-backends-split.ref
index 3455e20..bd8d154 100644
--- a/testsuite/tools/data/html-backends-split.ref
+++ b/testsuite/tools/data/html-backends-split.ref
@@ -5991,7 +5991,7 @@ Kyocera
 <td>clone of the HP 2400C</td>
 </tr>
 <tr>
-<td align=center>ScanJet 3670C</td>
+<td align=center>ScanJet 3670</td>
 <td align=center>USB</td>
 <td align=center>0x03f0/0x1405</td>
 <td align=center><font color="#007000">Complete</font></td>
@@ -6002,7 +6002,7 @@ Kyocera
 <td align=center>USB</td>
 <td align=center>0x03f0/0x1405</td>
 <td align=center><font color="#007000">Complete</font></td>
-<td>1200x1200 dpi max, same as HP 3670C</td>
+<td>1200x1200 dpi max, same as HP 3670</td>
 </tr>
 <tr>
 <td align=center>ScanJet 4850C</td>
diff --git a/testsuite/tools/data/html-mfgs.ref b/testsuite/tools/data/html-mfgs.ref
index f82b30c..1b34bb4 100644
--- a/testsuite/tools/data/html-mfgs.ref
+++ b/testsuite/tools/data/html-mfgs.ref
@@ -12078,7 +12078,7 @@ hpljm1005<br>(0)
 </td>
 <td align=center><a href="man/sane-hp3500.5.html">sane-hp3500</a></td>
 </tr>
-<tr><td align=center>ScanJet 3670C</td>
+<tr><td align=center>ScanJet 3670</td>
 <td align=center>USB</td>
 <td align=center>0x03f0/0x1405</td>
 <td align=center><font color="#007000">Complete</font></td>
@@ -12093,7 +12093,7 @@ hpljm1005<br>(0)
 <td align=center>USB</td>
 <td align=center>0x03f0/0x1405</td>
 <td align=center><font color="#007000">Complete</font></td>
-<td>1200x1200 dpi max, same as HP 3670C</td>
+<td>1200x1200 dpi max, same as HP 3670</td>
 <td align=center>
 <a href="http://www.meier-geinitz.de/sane/genesys-backend/">genesys</a>
 <br>(1.0-63)
diff --git a/testsuite/tools/data/hwdb.ref b/testsuite/tools/data/hwdb.ref
index 7d029e0..9adc73f 100644
--- a/testsuite/tools/data/hwdb.ref
+++ b/testsuite/tools/data/hwdb.ref
@@ -97,7 +97,7 @@ usb:v03F0p1205*
 usb:v03F0p1305*
  libsane_matched=yes
 
-# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
+# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
 usb:v03F0p1405*
  libsane_matched=yes
 
diff --git a/testsuite/tools/data/testfile.desc b/testsuite/tools/data/testfile.desc
index e59aed3..bae4099 100644
--- a/testsuite/tools/data/testfile.desc
+++ b/testsuite/tools/data/testfile.desc
@@ -4894,7 +4894,7 @@
 :status :basic
 :comment "clone of the HP 2400C"
 
-:model "ScanJet 3670C"
+:model "ScanJet 3670"
 :interface "USB"
 :usbid "0x03f0" "0x1405"
 :status :complete
@@ -4904,7 +4904,7 @@
 :interface "USB"
 :usbid "0x03f0" "0x1405"
 :status :complete
-:comment "1200x1200 dpi max, same as HP 3670C"
+:comment "1200x1200 dpi max, same as HP 3670"
 
 :model "ScanJet 4850C"
 :interface "USB"
diff --git a/testsuite/tools/data/udev+acl.ref b/testsuite/tools/data/udev+acl.ref
index 4721034..bcedd50 100644
--- a/testsuite/tools/data/udev+acl.ref
+++ b/testsuite/tools/data/udev+acl.ref
@@ -81,7 +81,7 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1105", ENV{libsane_matched}="yes"
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", ENV{libsane_matched}="yes"
 # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1305", ENV{libsane_matched}="yes"
-# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
+# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1405", ENV{libsane_matched}="yes"
 # Hewlett-Packard ScanJet 5590
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", ENV{libsane_matched}="yes"
diff --git a/testsuite/tools/data/udev.ref b/testsuite/tools/data/udev.ref
index 9a221fc..bd448af 100644
--- a/testsuite/tools/data/udev.ref
+++ b/testsuite/tools/data/udev.ref
@@ -81,7 +81,7 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1105", MODE="0664", GROUP="scanner",
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
 # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1305", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
-# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
+# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1405", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
 # Hewlett-Packard ScanJet 5590
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
diff --git a/testsuite/tools/data/usermap.ref b/testsuite/tools/data/usermap.ref
index e02d73a..b1d5a9f 100644
--- a/testsuite/tools/data/usermap.ref
+++ b/testsuite/tools/data/usermap.ref
@@ -64,7 +64,7 @@ libusbscanner 0x0003 0x03f0 0x1105 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0
 libusbscanner 0x0003 0x03f0 0x1205 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
 # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
 libusbscanner 0x0003 0x03f0 0x1305 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C
+# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
 libusbscanner 0x0003 0x03f0 0x1405 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
 # Hewlett-Packard ScanJet 5590
 libusbscanner 0x0003 0x03f0 0x1705 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
diff --git a/testsuite/tools/data/xml.ref b/testsuite/tools/data/xml.ref
index 0618093..3c5b861 100644
--- a/testsuite/tools/data/xml.ref
+++ b/testsuite/tools/data/xml.ref
@@ -6609,7 +6609,7 @@
     <url>*none*</url>
     <comment>clone of the HP 2400C</comment>
    </model>
-   <model name="ScanJet 3670C">
+   <model name="ScanJet 3670">
     <interface>USB</interface>
     <usbvendorid>0x03f0</usbvendorid>
     <usbproductid>0x1405</usbproductid>
@@ -6623,7 +6623,7 @@
     <usbproductid>0x1405</usbproductid>
     <status>complete</status>
     <url>*none*</url>
-    <comment>1200x1200 dpi max, same as HP 3670C</comment>
+    <comment>1200x1200 dpi max, same as HP 3670</comment>
    </model>
    <model name="ScanJet 4850C">
     <interface>USB</interface>